Merge branch '1.16.5' of gitlab.com:jeseibel/minecraft-lod-mod into 1.16.5

Add support for OpenGL 1.5 and 3.0
Merge branch 'CodeF53-1.16.5-patch-77785' into '1.16.5'
2021-10-23 12:04:26 -05:00 · 2021-10-23 12:04:16 -05:00 · 2021-10-23 13:29:09 +00:00 · 2021-10-23 05:11:10 +00:00 · 2021-10-23 05:01:37 +00:00 · 2021-10-22 20:46:26 -05:00
71 changed files with 7874 additions and 5850 deletions
@@ -0,0 +1,68 @@
+# Distant Horizons
+
+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.
+
+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://www.youtube.com/watch?v=H2tnvEVbO1c" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.4](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp)</a>
+
+
+Forge version: 1.16.5-36.1.0
+
+Notes:\
+This version has been confirmed to work in Eclipse and Retail Minecraft.\
+(Retail running forge version 1.16.5-36.1.0)
+
+
+## source code installation
+
+See the Forge Documentation online for more detailed instructions:\
+http://mcforge.readthedocs.io/en/latest/gettingstarted/
+
+1. Create a system variable called "JAVA_MC_HOME" with the location of the JDK 1.8.0_251 (This is needed for gradle to work correctly)
+2. replace JAVA_HOME with JAVA_MC_HOME in gradle.bat
+3. open a command line in the project folder
+
+**If using Ecplise:**
+1. run the command: `./gradlew geneclipseruns`
+2. run the command: `./gradlew eclipse`
+3. Make sure eclipse has the JDK 1.8.0_251 installed. (This is needed so that eclipse can run minecraft)
+4. Import the project into eclipse
+
+**If using IntelliJ:**
+1. open IDEA and import the build.gradle
+2. run the command: `./gradlew genIntellijRuns`
+3. refresh the Gradle project in IDEA if required
+
+
+## Compiling
+
+1. open a command line in the project folder
+2. run the command: `./gradlew build`
+3. the compiled jar file will be in the folder `build\libs`
+
+
+## Other commands
+
+`./gradlew --refresh-dependencies` to refresh local dependencies.
+
+`./gradlew clean` to reset everything (this does not affect your code) and then start the process again.
+
+
+## Note to self
+
+The Minecraft source code is NOT added to your workspace in an editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes only.
+
+Source code uses Mojang mappings.
+
+The source code can be 'created' with the `./eclipse` command and can be found in the following path:\
+`minecraft-lod-mod\build\fg_cache\mcp\ VERSION \joined\ RANDOM_STRING \patch\output.jar`
+
+
+## Open Source Acknowledgements
+
+XZ for Java (data compression)\
+https://tukaani.org/xz/java.html
@@ -1,70 +0,0 @@
-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.
-
-Or in other words: this mod let's you see farther without turning your game into a slide show.
-If you want to see a quick demo, check out the video I made here:
-https://youtu.be/CCT-3s02tYA
-
-
-Forge version: 1.16.5-36.1.0
-
-Notes:
-This version has been confirmed to work in Eclipse and Retail Minecraft.
-(Retail running forge version 1.16.5-36.1.0)
-
-
-========================
-source code installation
-========================
-
-See the Forge Documentation online for more detailed instructions:
-http://mcforge.readthedocs.io/en/latest/gettingstarted/
-
-Step 1: Create a system variable called "JAVA_MC_HOME" with the location of the JDK 1.8.0_251 (This is needed for gradle to work correctly)
-
-Step 2: replace JAVA_HOME with JAVA_MC_HOME in gradle.bat
-
-Step 3: open a command line in the project folder
-
-Step 4: run the command: "./gradlew geneclipseruns"
-
-Step 5: run the command: "./gradlew eclipse"
-
-Step 6: Make sure the eclipse has the JDK 1.8.0_251 installed. (This is needed so that eclipse can run minecraft)
-
-Step 7: Import the project into eclipse
-
-
-
-=========
-compiling
-=========
-
-Step 1: open a command line in the project folder
-
-Step 2: run the command: "./gradlew build"
-
-Step 3: the compiled jar file will be in the folder "build\libs"
-
-
-
-==============
-Other commands
-==============
-
-"./gradlew --refresh-dependencies" to refresh local dependencies. 
-"./gradlew clean" to reset everything (this does not affect your code) and then start the process again.
-
-
-
-============
-Note to self
-============
-
-The Minecraft source code is NOT added to your workspace in a editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes only.
-
-Source code uses mcp mappings not Mojangs.
-
-The source code can be 'created' with the ./eclipse command and can be found in the following path:
-minecraft-lod-mod\build\fg_cache\mcp\ VERSION \joined\ RANDOM_STRING \patch\output.jar
@@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="21">
+    <profile kind="CodeFormatterProfile" name="Eclipse (James' Edit)" version="21">
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="99"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="next_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="1200"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+    </profile>
+</profiles>
@@ -0,0 +1,50 @@
+<code_scheme name="Eclipse (James' Edit)" version="173">
+  <option name="RIGHT_MARGIN" value="1200" />
+  <JavaCodeStyleSettings>
+    <option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
+    <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
+    <option name="JD_ADD_BLANK_AFTER_DESCRIPTION" value="false" />
+    <option name="JD_P_AT_EMPTY_LINES" value="false" />
+    <option name="JD_KEEP_INVALID_TAGS" value="false" />
+    <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false" />
+    <option name="JD_KEEP_EMPTY_EXCEPTION" value="false" />
+    <option name="JD_KEEP_EMPTY_RETURN" value="false" />
+  </JavaCodeStyleSettings>
+  <codeStyleSettings language="JAVA">
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+    <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="10" />
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="10" />
+    <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="10" />
+    <option name="BLANK_LINES_BEFORE_PACKAGE" value="1" />
+    <option name="BRACE_STYLE" value="2" />
+    <option name="CLASS_BRACE_STYLE" value="2" />
+    <option name="METHOD_BRACE_STYLE" value="2" />
+    <option name="ELSE_ON_NEW_LINE" value="true" />
+    <option name="WHILE_ON_NEW_LINE" value="true" />
+    <option name="CATCH_ON_NEW_LINE" value="true" />
+    <option name="FINALLY_ON_NEW_LINE" value="true" />
+    <option name="INDENT_CASE_FROM_SWITCH" value="false" />
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+    <option name="ALIGN_MULTILINE_RESOURCES" value="false" />
+    <option name="SPACE_WITHIN_ARRAY_INITIALIZER_BRACES" value="true" />
+    <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" />
+    <option name="CALL_PARAMETERS_WRAP" value="1" />
+    <option name="METHOD_PARAMETERS_WRAP" value="1" />
+    <option name="RESOURCE_LIST_WRAP" value="5" />
+    <option name="EXTENDS_LIST_WRAP" value="1" />
+    <option name="THROWS_LIST_WRAP" value="1" />
+    <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+    <option name="THROWS_KEYWORD_WRAP" value="1" />
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+    <option name="TERNARY_OPERATION_WRAP" value="5" />
+    <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+    <option name="METHOD_ANNOTATION_WRAP" value="0" />
+    <option name="CLASS_ANNOTATION_WRAP" value="0" />
+    <option name="FIELD_ANNOTATION_WRAP" value="0" />
+    <indentOptions>
+      <option name="USE_TAB_CHARACTER" value="true" />
+      <option name="KEEP_INDENTS_ON_EMPTY_LINES" value="true" />
+    </indentOptions>
+  </codeStyleSettings>
+</code_scheme>
@@ -11,6 +11,7 @@ buildscript {
    dependencies {
        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
 		classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT'
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.2'
    }
 }
 apply plugin: 'net.minecraftforge.gradle'
@@ -18,10 +19,11 @@ apply plugin: 'org.spongepowered.mixin'
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
+apply plugin: 'com.github.johnrengelman.shadow'

-version = 'a1.5.0-pre'
+version = 'a1.5.1'
 group = 'com.seibel.lod'
-archivesBaseName = 'lod_1.16.5'
+archivesBaseName = 'Distant-Horizons_1.16.5'


 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
@@ -126,32 +128,23 @@ repositories {
 	maven { url 'https://jitpack.io' }
 }

+configurations {
+    shadowMe
+    compileOnly.extendsFrom(embed)
+}
+
 dependencies {
    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
    minecraft 'net.minecraftforge:forge:1.16.5-36.1.0'
-	
-	// these aren't needed right now
-	//implementation ('com.github.KaptainWutax:TerrainUtils:1.0.0'){
-    //    transitive = false
-    //}
-	//implementation ('com.github.KaptainWutax:BiomeUtils:1.0.0'){
-    //    transitive = false
-    //}
-    //implementation ('com.github.KaptainWutax:SeedUtils:-SNAPSHOT'){
-    //    transitive = false
-    //}
-    //implementation ('com.github.KaptainWutax:MCUtils:1.0.0'){
-    //    transitive = false
-    //}
-    //implementation ('com.github.KaptainWutax:NoiseUtils:1.0.0'){
-    //    transitive = false
-    //}
-    //implementation ('com.github.KaptainWutax:MathUtils:-SNAPSHOT'){
-    //    transitive = false
-    //}
-    
+
+
+    compile 'org.tukaani:xz:1.9'
+    shadowMe 'org.tukaani:xz:1.9'
+    compile 'org.apache.commons:commons-compress:1.21'
+    shadowMe 'org.apache.commons:commons-compress:1.21'
+
    // these were added to hopefully allow for cloning
    // configuredFeatures to allow for safe
    // multi threaded feature generation. Sadly I couldn't find
@@ -185,6 +178,25 @@ dependencies {

 }

+shadowJar {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+    configurations = [project.configurations.getByName("shadowMe")]
+    relocate 'org.tukaani', 'shaded.tukaani'
+    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
+    classifier = ''
+}
+
+reobf {
+    shadowJar {
+        dependsOn tasks.createMcpToSrg
+        mappings = tasks.createMcpToSrg.outputs.files.singleFile
+    }
+}
+
+artifacts {
+    archives tasks.shadowJar
+}
+
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
    manifest {
@@ -198,10 +210,9 @@ jar {
        ])
    }
 }
-
 // Example configuration to allow publishing using the maven-publish task
 // This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar') 
+jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
 //publish.dependsOn('reobfJar')

@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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;

 import com.seibel.lod.config.LodConfig;
@@ -39,7 +41,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 * @author James Seibel
 * @version 7-3-2021
 */
-@Mod(ModInfo.MODID)
+@Mod(ModInfo.ID)
 public class LodMain
 {
 	public static LodMain instance;
@@ -53,28 +55,28 @@ public class LodMain
 	}
 	
 	
-    public LodMain()
-    {
-        // Register the methods
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
-        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-
-        // Register ourselves for server and other game events we are interested in
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    private void onClientStart(final FMLClientSetupEvent event)
-    {
-    	client_proxy = new ClientProxy();
+	public LodMain()
+	{
+		// Register the methods
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
+		
+		// Register ourselves for server and other game events we are interested in
+		MinecraftForge.EVENT_BUS.register(this);
+	}
+	
+	private void onClientStart(final FMLClientSetupEvent event)
+	{
+		client_proxy = new ClientProxy();
 		MinecraftForge.EVENT_BUS.register(client_proxy);
-    }
-    
-    
-    
-    @SubscribeEvent
-    public void onServerStarting(FMLServerStartingEvent event)
-    {
-        // this is called when the server starts
-    }
-    
+	}
+	
+	
+	
+	@SubscribeEvent
+	public void onServerStarting(FMLServerStartingEvent event)
+	{
+		// this is called when the server starts
+	}
+	
 }
@@ -1,55 +0,0 @@
-package com.seibel.lod;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.seibel.lod.builders.lodTemplates.Box;
-import com.seibel.lod.util.DataPointUtil;
-
-import net.minecraft.util.Direction;
-
-public class Main
-{
-	public static void main(String[] args)
-	{
-		/*
-		try
-		{
-			@SuppressWarnings("serial")
-			Map<Direction, long[]> adjData = new HashMap<Direction, long[]>()
-			{{
-				put(Direction.EAST, new long[]{DataPointUtil.createDataPoint(60, 30, 0, 0, 0, 0), DataPointUtil.createDataPoint(25, 10, 0, 0, 0, 0)});
-				put(Direction.WEST,  new long[]{DataPointUtil.createDataPoint(60, 10, 0, 0, 0, 0)});
-				put(Direction.NORTH,  new long[]{DataPointUtil.createDataPoint(40, 20, 0, 0, 0, 0)});
-				put(Direction.SOUTH,  new long[]{DataPointUtil.createDataPoint(40, 20, 0, 0, 0, 0)});
-			}};
-
-			Box box = new Box();
-			int height = 60;
-			int depth = 20;
-
-			box.set(10, height - depth, 10);
-			box.move(0, depth, 0);
-			box.setAdjData(adjData);
-
-			for(Direction direction : Box.DIRECTIONS)
-			{
-				int adjIndex = 0;
-				while (box.shouldContinue(direction, adjIndex))
-				{
-					System.out.println(direction.toString());
-					for (int i = 0; i < 4; i++)
-					{
-						System.out.println(box.getX(direction, i) + " " + box.getY(direction, i, adjIndex) + " " + box.getZ(direction, i));
-					}
-					adjIndex++;
-				}
-			}
-
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		*/
-	}
-}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,18 +16,20 @@
 *    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;

 /**
 * This file is similar to mcmod.info
- * 
 * @author James Seibel
- * @version 08-29-2021
+ * @version 10-23-2021
 */
 public final class ModInfo
-{	
-	public static final String MODID = "lod";
-	public static final String MODNAME = "LOD";
-	public static final String MODAPI = "LodAPI";
-	public static final String VERSION = "a1.5.0-pre";
+{
+	public static final String ID = "lod";
+	public static final String NAME = "DistantHorizons";
+	/** Human readable version of MOD_NAME */
+	public static final String READABLE_NAME = "Distant Horizons";
+	public static final String API = "LodAPI";
+	public static final String VERSION = "a1.5.1";
 }
@@ -1,601 +0,0 @@
-/*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  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.builders;
-
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL15;
-import org.lwjgl.opengl.GL15C;
-
-import com.seibel.lod.builders.lodTemplates.Box;
-import com.seibel.lod.config.LodConfig;
-import com.seibel.lod.enums.VerticalQuality;
-import com.seibel.lod.objects.LodDimension;
-import com.seibel.lod.objects.LodRegion;
-import com.seibel.lod.objects.PosToRenderContainer;
-import com.seibel.lod.objects.RegionPos;
-import com.seibel.lod.proxy.ClientProxy;
-import com.seibel.lod.proxy.GlProxy;
-import com.seibel.lod.proxy.GlProxy.GlProxyContext;
-import com.seibel.lod.render.LodRenderer;
-import com.seibel.lod.util.DataPointUtil;
-import com.seibel.lod.util.DetailDistanceUtil;
-import com.seibel.lod.util.LevelPosUtil;
-import com.seibel.lod.util.LodThreadFactory;
-import com.seibel.lod.util.LodUtil;
-
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.vertex.VertexBuffer;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-
-/**
- * This object is used to create NearFarBuffer objects.
- *
- * @author James Seibel
- * @version 9-22-2021
- */
-public class LodBufferBuilder
-{
-	/**
-	 * This holds the thread used to generate new LODs off the main thread.
-	 */
-	public static ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(LodBufferBuilder.class.getSimpleName() + " - main"));
-	/**
-	 * This holds the threads used to generate buffers.
-	 */
-	public static ExecutorService bufferBuilderThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfBufferBuilderThreads.get(), new LodThreadFactory(LodBufferBuilder.class.getSimpleName() + " - builder"));
-	
-	/**
-	 * The buffers that are used to create LODs using far fog
-	 */
-	public volatile BufferBuilder[][] buildableBuffers;
-	
-	/**
-	 * Used when building new VBOs
-	 */
-	public volatile VertexBuffer[][] buildableVbos;
-	
-	/**
-	 * VBOs that are sent over to the LodNodeRenderer
-	 */
-	public volatile VertexBuffer[][] drawableVbos;
-	
-	/**
-	 * if this is true the LOD buffers are currently being
-	 * regenerated.
-	 */
-	public boolean generatingBuffers = false;
-	
-	/**
-	 * if this is true new LOD buffers have been generated
-	 * and are waiting to be swapped with the drawable buffers
-	 */
-	private boolean switchVbos = false;
-	
-	/**
-	 * Size of the buffer builders in bytes last time we created them
-	 */
-	public int previousBufferSize = 0;
-	
-	/**
-	 * Width of the dimension in regions last time we created the buffers
-	 */
-	public int previousRegionWidth = 0;
-	
-	/**
-	 * this is used to prevent multiple threads creating, destroying, or using the buffers at the same time
-	 */
-	private ReentrantLock bufferLock = new ReentrantLock();
-	
-	//	private static final int NUMBER_OF_DIRECTION = 4;
-	//in order -x, +x, -z, +z
-	//	private static final int[][] ADJ_VECTOR = new int[][]{{1, 0}, {-1, 0}, {0, 1}, {0, -1}};
-	
-	private volatile Box[][] boxCache;
-	private volatile PosToRenderContainer[][] setsToRender;
-	private volatile RegionPos center;
-	
-	/**
-	 * This is the ChunkPos the player was at the last time the buffers were built.
-	 * IE the center of the buffers last time they were built
-	 */
-	private volatile ChunkPos drawableCenterChunkPos = new ChunkPos(0, 0);
-	private volatile ChunkPos buildableCenterChunkPos = new ChunkPos(0, 0);
-	private volatile boolean firstSetup = true;
-	public LodBufferBuilder()
-	{
-		
-	}
-	
-	/**
-	 * Create a thread to asynchronously generate LOD buffers
-	 * centered around the given camera X and Z.
-	 * <br>
-	 * This method will write to the drawable near and far buffers.
-	 * <br>
-	 * After the buildable buffers have been generated they must be
-	 * swapped with the drawable buffers in the LodRenderer to be drawn.
-	 */
-	public void generateLodBuffersAsync(LodRenderer renderer, LodDimension lodDim,
-			BlockPos playerBlockPos, boolean fullRegen)
-	{
-		
-		// only allow one generation process to happen at a time
-		if (generatingBuffers)
-			return;
-		
-		if (buildableBuffers == null)
-			// setupBuffers hasn't been called yet
-			return;
-		
-		generatingBuffers = true;
-		
-		// round the player's block position down to the nearest chunk BlockPos
-		ChunkPos playerChunkPos = new ChunkPos(playerBlockPos);
-		BlockPos playerBlockPosRounded = playerChunkPos.getWorldPosition();
-		
-		Thread thread = new Thread(() ->
-		{
-			bufferLock.lock();
-			
-			try
-			{
-				long treeStart = System.currentTimeMillis();
-				long treeEnd = System.currentTimeMillis();
-				
-				long startTime = System.currentTimeMillis();
-				
-				ArrayList<Callable<Boolean>> nodeToRenderThreads = new ArrayList<>(lodDim.getWidth() * lodDim.getWidth());
-				
-				//setupBuffers(lodDim);
-				startBuffers(fullRegen, lodDim);
-				
-				// =====================//
-				//    RENDERING PART    //
-				// =====================//
-				
-				RegionPos playerRegionPos = new RegionPos(playerChunkPos);
-				if (center == null)
-					center = playerRegionPos;
-				
-				if (setsToRender == null)
-					setsToRender = new PosToRenderContainer[lodDim.getWidth()][lodDim.getWidth()];
-				
-				if (setsToRender.length != lodDim.getWidth())
-					setsToRender = new PosToRenderContainer[lodDim.getWidth()][lodDim.getWidth()];
-				
-				if (boxCache == null)
-					boxCache = new Box[lodDim.getWidth()][lodDim.getWidth()];
-				
-				if (boxCache.length != lodDim.getWidth())
-					boxCache = new Box[lodDim.getWidth()][lodDim.getWidth()];
-				
-				// this will be the center of the VBOs once they have been built
-				buildableCenterChunkPos = playerChunkPos;
-				
-				for (int xRegion = 0; xRegion < lodDim.getWidth(); xRegion++)
-				{
-					for (int zRegion = 0; zRegion < lodDim.getWidth(); zRegion++)
-					{
-						if (lodDim.isRegionToRegen(xRegion, zRegion) || fullRegen)
-						{
-							RegionPos regionPos = new RegionPos(
-									xRegion + lodDim.getCenterX() - Math.floorDiv(lodDim.getWidth(), 2),
-									zRegion + lodDim.getCenterZ() - Math.floorDiv(lodDim.getWidth(), 2));
-							
-							// local position in the vbo and bufferBuilder arrays
-							BufferBuilder currentBuffer = buildableBuffers[xRegion][zRegion];
-							LodRegion region = lodDim.getRegion(regionPos.x, regionPos.z);
-							
-							if (region == null)
-								continue;
-							
-							// make sure the buffers weren't
-							// changed while we were running this method
-							if (currentBuffer == null || !currentBuffer.building())
-								return;
-							
-							byte minDetail = region.getMinDetailLevel();
-							
-							
-							final int xR = xRegion;
-							final int zR = zRegion;
-							Callable<Boolean> dataToRenderThread = () ->
-							{
-								Map<Direction, long[]> adjData = new HashMap<>();
-								
-								// determine how many LODs we can stack vertically
-								int maxVerticalData = 1;
-								if (LodConfig.CLIENT.worldGenerator.lodQualityMode.get() == VerticalQuality.MULTI_LOD)
-								{
-									maxVerticalData = 256;
-								}
-								
-								// create adjData's arrays
-								for (Direction direction : Box.ADJ_DIRECTIONS)
-								{
-									adjData.put(direction, new long[maxVerticalData]);
-								}
-								
-								//previous setToRender cache
-								if (setsToRender[xR][zR] == null)
-								{
-									setsToRender[xR][zR] = new PosToRenderContainer(minDetail, regionPos.x, regionPos.z);
-								}
-								
-								if (boxCache[xR][zR] == null)
-								{
-									boxCache[xR][zR] = new Box();
-								}
-								PosToRenderContainer posToRender = setsToRender[xR][zR];
-								posToRender.clear(minDetail, regionPos.x, regionPos.z);
-								
-								lodDim.getDataToRender(
-										posToRender,
-										regionPos,
-										playerBlockPosRounded.getX(),
-										playerBlockPosRounded.getZ());
-								
-								byte detailLevel;
-								int posX;
-								int posZ;
-								int xAdj;
-								int zAdj;
-								int chunkXdist;
-								int chunkZdist;
-								
-								// keep a local version so we don't have to worry about indexOutOfBounds Exceptions
-								// if it changes in the LodRenderer while we are working here
-								boolean[][] vanillaRenderedChunks = renderer.vanillaRenderedChunks;
-								short gameChunkRenderDistance = (short) (vanillaRenderedChunks.length / 2 - 1);
-								
-								for (int index = 0; index < posToRender.getNumberOfPos(); index++)
-								{
-									detailLevel = posToRender.getNthDetailLevel(index);
-									posX = posToRender.getNthPosX(index);
-									posZ = posToRender.getNthPosZ(index);
-									
-									// skip any chunks that Minecraft is going to render
-									chunkXdist = LevelPosUtil.getChunkPos(detailLevel, posX) - playerChunkPos.x;
-									chunkZdist = LevelPosUtil.getChunkPos(detailLevel, posZ) - playerChunkPos.z;
-									
-									if (gameChunkRenderDistance >= Math.abs(chunkXdist)
-											&& gameChunkRenderDistance >= Math.abs(chunkZdist)
-											&& detailLevel <= LodUtil.CHUNK_DETAIL_LEVEL
-											&& vanillaRenderedChunks[chunkXdist + gameChunkRenderDistance + 1][chunkZdist + gameChunkRenderDistance + 1])
-									{
-										continue;
-									}
-									
-									// skip any chunks that Minecraft is going to render
-									for (Direction direction : Box.ADJ_DIRECTIONS)
-									{
-										xAdj = posX + direction.getNormal().getX();
-										zAdj = posZ + direction.getNormal().getZ();
-										chunkXdist = LevelPosUtil.getChunkPos(detailLevel, xAdj) - playerChunkPos.x;
-										chunkZdist = LevelPosUtil.getChunkPos(detailLevel, zAdj) - playerChunkPos.z;
-										boolean performFaceCulling = true;
-										if (performFaceCulling
-												&& posToRender.contains(detailLevel, xAdj, zAdj)
-												&& (gameChunkRenderDistance < Math.abs(chunkXdist)
-														|| gameChunkRenderDistance < Math.abs(chunkZdist)
-														|| !vanillaRenderedChunks[chunkXdist + gameChunkRenderDistance + 1][chunkZdist + gameChunkRenderDistance + 1]))
-										{
-											if (!adjData.containsKey(direction) || adjData.get(direction) == null)
-												adjData.put(direction, new long[maxVerticalData]);
-											for (int verticalIndex = 0; verticalIndex < lodDim.getMaxVerticalData(detailLevel, xAdj, zAdj); verticalIndex++)
-											{
-												long data = lodDim.getData(detailLevel, xAdj, zAdj, verticalIndex);
-												adjData.get(direction)[verticalIndex] = data;
-											}
-										} else
-										{
-											adjData.put(direction, null);
-										}
-									}
-									
-									long data;
-									for (int verticalIndex = 0; verticalIndex < lodDim.getMaxVerticalData(detailLevel, posX, posZ); verticalIndex++)
-									{
-										data = lodDim.getData(detailLevel, posX, posZ, verticalIndex);
-										if (DataPointUtil.isItVoid(data) || !DataPointUtil.doesItExist(data))
-											break;
-										LodConfig.CLIENT.graphics.lodTemplate.get().template.addLodToBuffer(currentBuffer, playerBlockPosRounded, data, adjData,
-												detailLevel, posX, posZ, boxCache[xR][zR], renderer.previousDebugMode, renderer.lightMap);
-									}
-									
-									
-								} // for pos to in list to render
-								// the thread executed successfully
-								return true;
-							};
-							nodeToRenderThreads.add(dataToRenderThread);
-						}
-					} // region z
-				} // region z
-				long renderStart = System.currentTimeMillis();
-				// wait for all threads to finish
-				List<Future<Boolean>> futuresBuffer = bufferBuilderThreads.invokeAll(nodeToRenderThreads);
-				for (Future<Boolean> future : futuresBuffer)
-				{
-					// the future will be false if its thread failed
-					if (!future.get())
-					{
-						ClientProxy.LOGGER.warn("LodBufferBuilder ran into trouble and had to start over.");
-						closeBuffers(fullRegen, lodDim);
-						return;
-					}
-				}
-				long renderEnd = System.currentTimeMillis();
-				
-				long endTime = System.currentTimeMillis();
-				@SuppressWarnings("unused")
-				long buildTime = endTime - startTime;
-				@SuppressWarnings("unused")
-				long treeTime = treeEnd - treeStart;
-				@SuppressWarnings("unused")
-				long renderingTime = renderEnd - renderStart;
-				
-				//				ClientProxy.LOGGER.info("Buffer Build time: " + buildTime + " ms" + '\n' +
-				//						                        "Tree cutting time: " + treeTime + " ms" + '\n' +
-				//						                        "Rendering time: " + renderingTime + " ms");
-				
-				// mark that the buildable buffers as ready to swap
-				switchVbos = true;
-			} catch (Exception e)
-			{
-				ClientProxy.LOGGER.warn("\"LodNodeBufferBuilder.generateLodBuffersAsync\" ran into trouble: ");
-				e.printStackTrace();
-			} finally
-			{
-				// regardless of if we successfully created the buffers
-				// we are done generating.
-				generatingBuffers = false;
-				
-				// clean up any potentially open resources
-				if (buildableBuffers != null)
-					closeBuffers(fullRegen, lodDim);
-				
-				// upload the new buffers
-				uploadBuffers(fullRegen, lodDim);
-				bufferLock.unlock();
-			}
-			
-		});
-		
-		mainGenThread.execute(thread);
-	}
-	
-	//===============================//
-	// BufferBuilder related methods //
-	//===============================//
-	
-	/**
-	 * Called from the LodRenderer to create the
-	 * BufferBuilders. <br><br>
-	 * <p>
-	 * May have to wait for the bufferLock to open.
-	 */
-	public void setupBuffers(LodDimension lodDimension)
-	{
-		bufferLock.lock();
-		int numbRegionsWide = lodDimension.getWidth();
-		int bufferMaxCapacity;
-		
-		//if(previousRegionWidth != numbRegionsWide || firstSetup)
-		//{
-		firstSetup = false;
-		previousRegionWidth = numbRegionsWide;
-		buildableBuffers = new BufferBuilder[numbRegionsWide][numbRegionsWide];
-		
-		buildableVbos = new VertexBuffer[numbRegionsWide][numbRegionsWide];
-		drawableVbos = new VertexBuffer[numbRegionsWide][numbRegionsWide];
-		//}
-		for (int x = 0; x < numbRegionsWide; x++)
-		{
-			for (int z = 0; z < numbRegionsWide; z++)
-			{
-				//if(lodDimension.isBufferToSetup(x,z))
-				//{
-				bufferMaxCapacity = lodDimension.getMemoryRequired(x, z, LodConfig.CLIENT.graphics.lodTemplate.get());
-				buildableBuffers[x][z] = new BufferBuilder(bufferMaxCapacity);
-				
-				buildableVbos[x][z] = new VertexBuffer(LodRenderer.LOD_VERTEX_FORMAT);
-				drawableVbos[x][z] = new VertexBuffer(LodRenderer.LOD_VERTEX_FORMAT);
-				//}
-			}
-		}
-		
-		bufferLock.unlock();
-	}
-	
-	/**
-	 * sets the buffers and Vbos to null, forcing them to be recreated. <br><br>
-	 * <p>
-	 * May have to wait for the bufferLock to open.
-	 */
-	public void destroyBuffers()
-	{
-		bufferLock.lock();
-		
-		buildableBuffers = null;
-		buildableVbos = null;
-		drawableVbos = null;
-		
-		bufferLock.unlock();
-	}
-	
-	/**
-	 * Calls begin on each of the buildable BufferBuilders.
-	 */
-	private void startBuffers(boolean fullRegen, LodDimension lodDim)
-	{
-		for (int x = 0; x < buildableBuffers.length; x++)
-		{
-			for (int z = 0; z < buildableBuffers.length; z++)
-			{
-				if (fullRegen || lodDim.isRegionToRegen(x, z))
-				{
-					buildableBuffers[x][z].begin(GL11.GL_QUADS, LodRenderer.LOD_VERTEX_FORMAT);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Calls end on each of the buildable BufferBuilders.
-	 */
-	private void closeBuffers(boolean fullRegen, LodDimension lodDim)
-	{
-		for (int x = 0; x < buildableBuffers.length; x++)
-			for (int z = 0; z < buildableBuffers.length; z++)
-				if (buildableBuffers[x][z] != null && buildableBuffers[x][z].building() && (fullRegen || lodDim.isRegionToRegen(x, z)))
-					buildableBuffers[x][z].end();
-	}
-	
-	/**
-	 * Upload all buildableBuffers to the GPU.
-	 */
-	private void uploadBuffers(boolean fullRegen, LodDimension lodDim)
-	{
-		GlProxy glProxy = GlProxy.getInstance();
-		
-		try
-		{
-			// make sure we are uploading to a different OpenGL context,
-			// to prevent interference (IE stuttering) with the Minecraft context.
-			glProxy.setGlContext(GlProxyContext.LOD_BUILDER);
-			
-			for (int x = 0; x < buildableVbos.length; x++)
-			{
-				for (int z = 0; z < buildableVbos.length; z++)
-				{
-					if (fullRegen || lodDim.isRegionToRegen(x, z))
-					{
-						ByteBuffer builderBuffer = buildableBuffers[x][z].popNextBuffer().getSecond();
-						vboUpload(buildableVbos[x][z], builderBuffer);
-						lodDim.setRegenByArrayIndex(x, z, false);
-					}
-				}
-			}
-		}
-		catch (IllegalStateException e)
-		{
-			ClientProxy.LOGGER.error(LodBufferBuilder.class.getSimpleName() + " - UploadBuffers failed: " + e.getMessage());
-			e.printStackTrace();
-		}
-		finally
-		{
-			// make sure no buffer is bound
-			if (glProxy.getGlContext() == GlProxyContext.LOD_BUILDER)
-			{
-				GL15C.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
-			}
-			
-			// make sure the context is disabled
-			glProxy.setGlContext(GlProxyContext.NONE);
-		}
-	}
-	
-	/**
-	 * Uploads the uploadBuffer into the VBO in GPU memory.
-	 */
-	private void vboUpload(VertexBuffer vbo, ByteBuffer uploadBuffer)
-	{
-		// this shouldn't happen, but just to be safe
-		if (vbo.id != -1 && GlProxy.getInstance().getGlContext() == GlProxyContext.LOD_BUILDER)
-		{
-			// this is how many points will be rendered
-			vbo.vertexCount = (uploadBuffer.remaining() / vbo.format.getVertexSize());
-			
-			GL15C.glBindBuffer(GL15.GL_ARRAY_BUFFER, vbo.id);
-			
-			// subData only works if the memory is allocated beforehand.
-			GL15C.glBufferData(GL15.GL_ARRAY_BUFFER, uploadBuffer.remaining(), GL15C.GL_DYNAMIC_DRAW);
-			
-			// interestingly bufferSubData renders faster than glMapBuffer
-			// even though OpenGLInsights-AsynchronousBufferTransfers says glMapBuffer
-			// is faster for transferring data. They must put the data in different memory
-			// or something.
-			GL15C.glBufferSubData(GL15.GL_ARRAY_BUFFER, 0, uploadBuffer);
-			
-			GL15C.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
-		}
-	}
-	
-	/**
-	 * Get the newly created VBOs
-	 */
-	public VertexBuffersAndOffset getVertexBuffers()
-	{
-		// don't wait for the lock to open
-		// since this is called on the main render thread
-		if (bufferLock.tryLock())
-		{
-			VertexBuffer[][] tmpVbo = drawableVbos;
-			drawableVbos = buildableVbos;
-			buildableVbos = tmpVbo;
-			
-			drawableCenterChunkPos = buildableCenterChunkPos;
-			
-			// the vbos have been swapped
-			switchVbos = false;
-			bufferLock.unlock();
-		}
-		
-		return new VertexBuffersAndOffset(drawableVbos, drawableCenterChunkPos);
-	}
-	
-	/**
-	 * A simple container to pass multiple objects back in the getVertexBuffers method.
-	 */
-	public class VertexBuffersAndOffset
-	{
-		public VertexBuffer[][] vbos;
-		public ChunkPos drawableCenterChunkPos;
-		
-		public VertexBuffersAndOffset(VertexBuffer[][] newVbos, ChunkPos newDrawableCenterChunkPos)
-		{
-			vbos = newVbos;
-			drawableCenterChunkPos = newDrawableCenterChunkPos;
-		}
-	}
-	
-	/**
-	 * If this is true the buildable near and far
-	 * buffers have been generated and are ready to be
-	 * sent to the LodRenderer.
-	 */
-	public boolean newBuffersAvaliable()
-	{
-		return switchVbos;
-	}
-	
-}
@@ -1,921 +0,0 @@
-/*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  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.builders;
-
-import java.awt.Color;
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import com.seibel.lod.config.LodConfig;
-import com.seibel.lod.enums.DistanceGenerationMode;
-import com.seibel.lod.enums.HorizontalResolution;
-import com.seibel.lod.enums.VerticalQuality;
-import com.seibel.lod.objects.LodDimension;
-import com.seibel.lod.objects.LodRegion;
-import com.seibel.lod.objects.LodWorld;
-import com.seibel.lod.util.ColorUtil;
-import com.seibel.lod.util.DataPointUtil;
-import com.seibel.lod.util.DetailDistanceUtil;
-import com.seibel.lod.util.LevelPosUtil;
-import com.seibel.lod.util.LodThreadFactory;
-import com.seibel.lod.util.LodUtil;
-import com.seibel.lod.util.ThreadMapUtil;
-import com.seibel.lod.wrappers.MinecraftWrapper;
-
-import net.minecraft.block.*;
-import net.minecraft.block.material.MaterialColor;
-import net.minecraft.client.renderer.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.ChunkPos;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.world.DimensionType;
-import net.minecraft.world.IWorld;
-import net.minecraft.world.LightType;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome;
-import net.minecraft.world.chunk.ChunkSection;
-import net.minecraft.world.chunk.IChunk;
-import net.minecraft.world.gen.Heightmap;
-import net.minecraftforge.client.extensions.IForgeBakedModel;
-import net.minecraftforge.client.model.data.ModelDataMap;
-
-/**
- * This object is in charge of creating Lod related objects. (specifically: Lod
- * World, Dimension, and Region objects)
- *
- * @author Leonardo Amato
- * @author James Seibel
- * @version 9-18-2021
- */
-public class LodBuilder
-{
-	private static MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
-
-	private ExecutorService lodGenThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName()));
-
-	public static final Direction[] directions = new Direction[]{Direction.UP, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, Direction.DOWN};
-	public static final int CHUNK_DATA_WIDTH = LodUtil.CHUNK_WIDTH;
-	public static final int CHUNK_SECTION_HEIGHT = CHUNK_DATA_WIDTH;
-	public static final Heightmap.Type DEFAULT_HEIGHTMAP = Heightmap.Type.WORLD_SURFACE_WG;
-	public static final ConcurrentMap<Block, Integer> colorMap = new ConcurrentHashMap<>();
-	public static final ConcurrentMap<Block, Boolean> toTint = new ConcurrentHashMap<>();
-	public static final ConcurrentMap<Block, VoxelShape> shapeMap = new ConcurrentHashMap<>();
-
-	public static final ModelDataMap dataMap = new ModelDataMap.Builder().build();
-
-	/**
-	 * If no blocks are found in the area in determineBottomPointForArea return this
-	 */
-	public static final short DEFAULT_DEPTH = 0;
-	/**
-	 * If no blocks are found in the area in determineHeightPointForArea return this
-	 */
-	public static final short DEFAULT_HEIGHT = 0;
-
-	/**
-	 * How wide LodDimensions should be in regions
-	 */
-	public int defaultDimensionWidthInRegions = 5;
-
-	public LodBuilder()
-	{
-
-	}
-
-	public void generateLodNodeAsync(IChunk chunk, LodWorld lodWorld, IWorld world)
-	{
-		generateLodNodeAsync(chunk, lodWorld, world, DistanceGenerationMode.SERVER);
-	}
-
-
-	public void generateLodNodeAsync(IChunk chunk, LodWorld lodWorld, IWorld world, DistanceGenerationMode generationMode)
-	{
-		if (lodWorld == null || !lodWorld.getIsWorldLoaded())
-			return;
-
-		// don't try to create an LOD object
-		// if for some reason we aren't
-		// given a valid chunk object
-		if (chunk == null)
-			return;
-
-		Thread thread = new Thread(() ->
-		{
-			try
-			{
-				// we need a loaded client world in order to
-				// get the textures for blocks
-				if (mc.getClientWorld() == null)
-					return;
-
-				DimensionType dim = world.dimensionType();
-
-				LodDimension lodDim;
-
-				int playerPosX;
-				int playerPosZ;
-				if (mc.getPlayer() == null)
-				{
-					playerPosX = chunk.getPos().getMinBlockX();
-					playerPosZ = chunk.getPos().getMinBlockZ();
-				} else
-				{
-					playerPosX = (int) mc.getPlayer().getX();
-					playerPosZ = (int) mc.getPlayer().getZ();
-				}
-				if (lodWorld.getLodDimension(dim) == null)
-				{
-					lodDim = new LodDimension(dim, lodWorld, defaultDimensionWidthInRegions);
-					ThreadMapUtil.clearMaps();
-					lodWorld.addLodDimension(lodDim);
-					lodDim.treeGenerator(playerPosX, playerPosZ);
-				} else
-				{
-					lodDim = lodWorld.getLodDimension(dim);
-				}
-				generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(generationMode));
-			} catch (IllegalArgumentException | NullPointerException e)
-			{
-				e.printStackTrace();
-				// if the world changes while LODs are being generated
-				// they will throw errors as they try to access things that no longer
-				// exist.
-			}
-		});
-		lodGenThreadPool.execute(thread);
-	}
-
-	/**
-	 * Creates a LodChunk for a chunk in the given world.
-	 *
-	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
-	 */
-	public void generateLodNodeFromChunk(LodDimension lodDim, IChunk chunk) throws IllegalArgumentException
-	{
-		generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig());
-	}
-
-	/**
-	 * Creates a LodChunk for a chunk in the given world.
-	 *
-	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
-	 */
-	public void generateLodNodeFromChunk(LodDimension lodDim, IChunk chunk, LodBuilderConfig config)
-			throws IllegalArgumentException
-	{
-		if (chunk == null)
-			throw new IllegalArgumentException("generateLodFromChunk given a null chunk");
-
-		int startX;
-		int startZ;
-		int endX;
-		int endZ;
-		try
-		{
-			HorizontalResolution detail;
-			LodRegion region = lodDim.getRegion(chunk.getPos().getRegionX(), chunk.getPos().getRegionZ());
-			if (region == null)
-				return;
-			byte minDetailLevel = region.getMinDetailLevel();
-			detail = DetailDistanceUtil.getLodGenDetail(minDetailLevel);
-
-			VerticalQuality verticalQuality = LodConfig.CLIENT.worldGenerator.lodQualityMode.get();
-			byte detailLevel = detail.detailLevel;
-			int posX;
-			int posZ;
-			for (int i = 0; i < detail.dataPointLengthCount * detail.dataPointLengthCount; i++)
-			{
-				startX = detail.startX[i];
-				startZ = detail.startZ[i];
-				endX = detail.endX[i];
-				endZ = detail.endZ[i];
-
-				posX = LevelPosUtil.convert((byte) 0, chunk.getPos().x * 16 + startX, detail.detailLevel);
-				posZ = LevelPosUtil.convert((byte) 0, chunk.getPos().z * 16 + startZ, detail.detailLevel);
-				long[] data;
-				switch (verticalQuality)
-				{
-					default:
-					case HEIGHTMAP:
-						long singleData;
-						long[] dataToMergeSingle = createSingleDataToMerge(detail, chunk, config, startX, startZ, endX, endZ);
-						singleData = DataPointUtil.mergeSingleData(dataToMergeSingle);
-						lodDim.addData(detailLevel,
-								posX,
-								posZ,
-								0,
-								singleData,
-								false);
-						break;
-					case MULTI_LOD:
-						long[] dataToMergeVertical = createVerticalDataToMerge(detail, chunk, config, startX, startZ, endX, endZ);
-						data = DataPointUtil.mergeMultiData(dataToMergeVertical, DataPointUtil.worldHeight, DetailDistanceUtil.getMaxVerticalData(detailLevel));
-
-
-						//lodDim.clear(detailLevel, posX, posZ);
-						if (data != null && data.length != 0)
-						{
-							for (int verticalIndex = 0; verticalIndex < lodDim.getMaxVerticalData(detailLevel, posX, posZ); verticalIndex++)
-							{
-
-								if (!DataPointUtil.doesItExist(data[verticalIndex]))
-									break;
-								lodDim.addData(detailLevel,
-										posX,
-										posZ,
-										verticalIndex,
-										data[verticalIndex],
-										false);
-							}
-						}
-						break;
-				}
-			}
-			lodDim.updateData(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, chunk.getPos().z);
-		} catch (Exception e)
-		{
-			e.printStackTrace();
-			throw e;
-		}
-
-	}
-
-	private long[] createVerticalDataToMerge(HorizontalResolution detail, IChunk chunk, LodBuilderConfig config, int startX, int startZ, int endX, int endZ)
-	{
-		int size = 1 << detail.detailLevel;
-
-		long[] dataToMerge = ThreadMapUtil.getBuilderVerticalArray()[detail.detailLevel];
-
-		if (dataToMerge == null || dataToMerge.length != size * size * DataPointUtil.worldHeight + 1)
-			dataToMerge = new long[size * size * DataPointUtil.worldHeight + 1];
-
-		for (int i = 0; i < dataToMerge.length; i++)
-			dataToMerge[i] = DataPointUtil.EMPTY_DATA;
-
-		int verticalData = DataPointUtil.worldHeight;
-
-		ChunkPos chunkPos = chunk.getPos();
-		int height;
-		int depth;
-		int color;
-		int light;
-		int lightSky;
-		int lightBlock;
-		int generation = config.distanceGenerationMode.complexity;
-
-		int xRel;
-		int zRel;
-		int xAbs;
-		int yAbs;
-		int zAbs;
-		boolean hasCeiling = mc.getClientWorld().dimensionType().hasCeiling();
-		boolean hasSkyLight = mc.getClientWorld().dimensionType().hasSkyLight();
-
-		BlockPos.Mutable blockPos = new BlockPos.Mutable(0, 0, 0);
-		int index;
-
-		for (index = 0; index < size * size; index++)
-		{
-			xRel = Math.floorMod(index, size) + startX;
-			zRel = Math.floorDiv(index, size) + startZ;
-			xAbs = chunkPos.getMinBlockX() + xRel;
-			zAbs = chunkPos.getMinBlockZ() + zRel;
-
-			//Calculate the height of the lod
-			yAbs = DataPointUtil.worldHeight + 2;
-			int count = 0;
-			boolean topBlock = true;
-			while (yAbs > 0)
-			{
-				height = determineHeightPointFrom(chunk, config, xRel, zRel, yAbs, blockPos);
-				//If the lod is at default, then we set this as void data
-				if (height == DEFAULT_HEIGHT)
-				{
-					if (topBlock)
-						dataToMerge[index * verticalData] = DataPointUtil.createVoidDataPoint(generation);
-					break;
-				}
-
-				yAbs = height - 1;
-				// We search light on above air block
-				depth = determineBottomPointFrom(chunk, config, xRel, zRel, yAbs, blockPos);
-				if (hasCeiling && topBlock)
-				{
-					yAbs = depth;
-					blockPos.set(xAbs, yAbs, zAbs);
-					light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, topBlock);
-					color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
-					blockPos.set(xAbs, yAbs - 1, zAbs);
-				} else
-				{
-					blockPos.set(xAbs, yAbs, zAbs);
-					light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, topBlock);
-					color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
-					blockPos.set(xAbs, yAbs + 1, zAbs);
-				}
-				lightBlock = light & 0b1111;
-				lightSky = (light >> 4) & 0b1111;
-
-
-				dataToMerge[index * verticalData + count] = DataPointUtil.createDataPoint(height, depth, color, lightSky, lightBlock, generation);
-				topBlock = false;
-				yAbs = depth - 1;
-				count++;
-			}
-		}
-		return dataToMerge;
-	}
-
-	/**
-	 * Find the lowest valid point from the bottom.
-	 */
-	private short determineBottomPointFrom(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, int yAbs, BlockPos.Mutable blockPos)
-	{
-		short depth = DEFAULT_DEPTH;
-		if (config.useHeightmap)
-		{
-			depth = 0;
-		} else
-		{
-			boolean voidData = true;
-			ChunkSection[] chunkSections = chunk.getSections();
-			for (int sectionIndex = chunkSections.length - 1; sectionIndex >= 0; sectionIndex--)
-			{
-				for (int yRel = CHUNK_DATA_WIDTH - 1; yRel >= 0; yRel--)
-				{
-					if (sectionIndex * CHUNK_DATA_WIDTH + yRel > yAbs)
-						continue;
-					blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
-					if (!isLayerValidLodPoint(chunk, blockPos))
-					{
-						depth = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel + 1);
-						voidData = false;
-						break;
-					}
-				}
-				if (!voidData)
-				{
-					break;
-				}
-			}
-		}
-		return depth;
-	}
-
-	/**
-	 * Find the highest valid point from the Top
-	 */
-	private short determineHeightPointFrom(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, int yAbs, BlockPos.Mutable blockPos)
-	{
-		short height = DEFAULT_HEIGHT;
-		if (config.useHeightmap)
-		{
-			height = (short) chunk.getOrCreateHeightmapUnprimed(LodUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
-		} else
-		{
-			boolean voidData = true;
-			ChunkSection[] chunkSections = chunk.getSections();
-			for (int sectionIndex = chunkSections.length - 1; sectionIndex >= 0; sectionIndex--)
-			{
-				for (int yRel = CHUNK_DATA_WIDTH - 1; yRel >= 0; yRel--)
-				{
-					if (sectionIndex * CHUNK_DATA_WIDTH + yRel > yAbs)
-						continue;
-					blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
-					if (isLayerValidLodPoint(chunk, blockPos))
-					{
-						height = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel + 1);
-						voidData = false;
-						break;
-					}
-				}
-				if (!voidData)
-					break;
-			}
-		}
-		return height;
-	}
-
-	private long[] createSingleDataToMerge(HorizontalResolution detail, IChunk chunk, LodBuilderConfig config, int startX, int startZ, int endX, int endZ)
-	{
-		long[] dataToMerge = ThreadMapUtil.getBuilderArray()[detail.detailLevel];
-		ChunkPos chunkPos = chunk.getPos();
-
-		int size = 1 << detail.detailLevel;
-		int height = 0;
-		int depth = 0;
-		int color = 0;
-		int light = 0;
-		int generation = config.distanceGenerationMode.complexity;
-
-		int xRel;
-		int zRel;
-		int xAbs;
-		int yAbs;
-		int zAbs;
-		int lightBlock;
-		int lightSky;
-
-		boolean hasCeiling = mc.getClientWorld().dimensionType().hasCeiling();
-		boolean hasSkyLight = mc.getClientWorld().dimensionType().hasSkyLight();
-
-		BlockPos.Mutable blockPos = new BlockPos.Mutable(0, 0, 0);
-		int index = 0;
-		if (dataToMerge == null)
-		{
-			dataToMerge = new long[size * size];
-		}
-		for (index = 0; index < size * size; index++)
-		{
-			xRel = Math.floorMod(index, size) + startX;
-			zRel = Math.floorDiv(index, size) + startZ;
-			xAbs = chunkPos.getMinBlockX() + xRel;
-			zAbs = chunkPos.getMinBlockZ() + zRel;
-
-			//Calculate the height of the lod
-			height = determineHeightPoint(chunk, config, xRel, zRel, blockPos);
-
-			//If the lod is at default, then we set this as void data
-			if (height == DEFAULT_HEIGHT)
-			{
-				dataToMerge[index] = DataPointUtil.createVoidDataPoint(generation);
-				continue;
-			}
-
-			yAbs = height - 1;
-			// We search light on above air block
-
-			color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
-			depth = determineBottomPoint(chunk, config, xRel, zRel, blockPos);
-
-			blockPos.set(xAbs, yAbs + 1, zAbs);
-			light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, true);
-			lightBlock = light & 0b1111;
-			//lightSky = (light >> 4) & 0b1111;
-			lightSky = 15; //default max light
-			dataToMerge[index] = DataPointUtil.createDataPoint(height, depth, color, lightSky, lightBlock, generation);
-		}
-		return dataToMerge;
-	}
-	// =====================//
-	// constructor helpers //
-	// =====================//
-
-	/**
-	 * Find the lowest valid point from the bottom.
-	 */
-	private short determineBottomPoint(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, BlockPos.Mutable blockPos)
-	{
-		ChunkSection[] chunkSections = chunk.getSections();
-		short depth = DEFAULT_DEPTH;
-		if (config.useHeightmap)
-		{
-			depth = 0;
-		} else
-		{
-			boolean found = false;
-			for (int sectionIndex = 0; sectionIndex < chunkSections.length; sectionIndex++)
-			{
-				for (int yRel = 0; yRel < CHUNK_DATA_WIDTH; yRel++)
-				{
-					blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
-					if (isLayerValidLodPoint(chunk, blockPos))
-					{
-						depth = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel);
-						found = true;
-						break;
-					}
-				}
-				if (found)
-				{
-					break;
-				}
-			}
-		}
-		return depth;
-	}
-
-
-	/**
-	 * Find the highest valid point from the Top
-	 */
-	private short determineHeightPoint(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, BlockPos.Mutable blockPos)
-	{
-		short height = DEFAULT_HEIGHT;
-		if (config.useHeightmap)
-		{
-			height = (short) chunk.getOrCreateHeightmapUnprimed(LodUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
-		} else
-		{
-			boolean voidData = true;
-			ChunkSection[] chunkSections = chunk.getSections();
-			for (int sectionIndex = chunkSections.length - 1; sectionIndex >= 0; sectionIndex--)
-			{
-				for (int yRel = CHUNK_DATA_WIDTH - 1; yRel >= 0; yRel--)
-				{
-					blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
-					if (isLayerValidLodPoint(chunk, blockPos))
-					{
-						height = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel + 1);
-						voidData = false;
-						break;
-					}
-				}
-				if (!voidData)
-				{
-					break;
-				}
-			}
-		}
-		return height;
-	}
-
-	/**
-	 * Generate the color for the given chunk using biome water color, foliage
-	 * color, and grass color.
-	 */
-	private int generateLodColor(IChunk chunk, LodBuilderConfig config, int xRel, int yAbs, int zRel, BlockPos.Mutable blockPos)
-	{
-		ChunkSection[] chunkSections = chunk.getSections();
-		int colorInt = 0;
-		if (config.useBiomeColors)
-		{
-			// I have no idea why I need to bit shift to the right, but
-			// if I don't the biomes don't show up correctly.
-			Biome biome = chunk.getBiomes().getNoiseBiome(xRel >> 2, yAbs >> 2, zRel >> 2);
-			colorInt = getColorForBiome(xRel, zRel, biome);
-		} else
-		{
-			int sectionIndex = Math.floorDiv(yAbs, CHUNK_SECTION_HEIGHT);
-			int yRel = Math.floorMod(yAbs, CHUNK_SECTION_HEIGHT);
-			if (chunkSections[sectionIndex] != null)
-			{
-				// the bit shift is equivalent to dividing by 4
-
-				blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
-				//colorInt = getColorTextureForBlock(blockState, blockPos);
-				colorInt = getColorForBlock(chunk, blockPos);
-			}
-			if (colorInt == 0 && yAbs > 0)
-			{
-				//invisible case
-				colorInt = generateLodColor(chunk, config, xRel, yAbs - 1, zRel, blockPos);
-			}
-		}
-		return colorInt;
-	}
-
-	private int getLightValue(IChunk chunk, BlockPos.Mutable blockPos, boolean hasCeiling, boolean hasSkyLight, boolean topBlock)
-	{
-		int skyLight;
-		int blockLight = 0;
-		if (mc.getClientWorld() == null)
-			return 0;
-
-		IWorld world = mc.getClientWorld();
-
-		//int blockBrightness = world.getBrightness(LightType.BLOCK, blockPos);
-		int blockBrightness = chunk.getLightEmission(blockPos);
-
-		if (hasCeiling && topBlock)
-			blockPos.set(blockPos.getX(), blockPos.getY() - 1, blockPos.getZ());
-		else
-			blockPos.set(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ());
-
-
-		if (!hasSkyLight && hasCeiling)
-		{
-			skyLight = 0;
-		}
-		else if(topBlock)
-		{
-			skyLight = 15; //default max light
-		} else
-		{
-			if (chunk.isLightCorrect() && false)
-			{
-				skyLight = world.getBrightness(LightType.SKY, blockPos);
-			} else
-			{
-				if (blockPos.getY() >= mc.getClientWorld().getSeaLevel()-5)
-				{
-					skyLight = 10;
-				} else
-				{
-					skyLight = 0;
-				}
-			}
-		}
-		blockLight = world.getBrightness(LightType.BLOCK, blockPos);
-		blockLight = LodUtil.clamp(0, blockLight + blockBrightness, 15);
-
-		return blockLight + (skyLight << 4);
-	}
-
-
-	private int getColorTextureForBlock(BlockState blockState, BlockPos blockPos, boolean topTextureRequired)
-	{
-		Block block = blockState.getBlock();
-		if (colorMap.containsKey(block) && toTint.containsKey(block))
-			return colorMap.get(block);
-
-
-		World world = mc.getClientWorld();
-		TextureAtlasSprite texture;
-		List<BakedQuad> quad = null;
-		for (Direction direction : directions)
-		{
-			quad = mc.getModelManager().getBlockModelShaper().getBlockModel(blockState).getQuads(blockState, direction, new Random(0), dataMap);
-			if (!quad.isEmpty())
-			{
-				break;
-			}
-		}
-		if (!quad.isEmpty())
-		{
-			toTint.put(block, quad.get(0).isTinted());
-		} else
-			toTint.put(blockState.getBlock(), false);
-
-		if (topTextureRequired && !quad.isEmpty())
-		{
-			texture = quad.get(0).getSprite();
-		} else
-		{
-			texture = mc.getModelManager().getBlockModelShaper().getTexture(blockState, world, blockPos);
-		}
-
-
-		int count = 0;
-		int alpha = 0;
-		int red = 0;
-		int green = 0;
-		int blue = 0;
-		int numberOfGreyPixel = 0;
-		int color;
-		int colorMultiplier;
-		for (int k = 0; k < texture.getFrameCount(); k++)
-		{
-			for (int i = 0; i < texture.getHeight(); i++)
-			{
-				for (int j = 0; j < texture.getWidth(); j++)
-				{
-					if (texture.isTransparent(k, i, j))
-						continue;
-					color = texture.getPixelRGBA(k, i, j);
-					if (Math.max(Math.max(ColorUtil.getBlue(color), ColorUtil.getGreen(color)), ColorUtil.getRed(color)) < 4 + Math.min(Math.min(ColorUtil.getBlue(color), ColorUtil.getGreen(color)), ColorUtil.getRed(color)))
-					{
-						numberOfGreyPixel++;
-					}
-					if (block instanceof FlowerBlock && (!(ColorUtil.getGreen(color) > (ColorUtil.getBlue(color) + 30)) || !(ColorUtil.getGreen(color) > (ColorUtil.getRed(color) + 30))))
-						colorMultiplier = 5;
-					else
-						colorMultiplier = 1;
-					count = colorMultiplier + count;
-					alpha += ColorUtil.getAlpha(color) * colorMultiplier;
-					;
-					red += ColorUtil.getBlue(color) * colorMultiplier;
-					green += ColorUtil.getGreen(color) * colorMultiplier;
-					blue += ColorUtil.getRed(color) * colorMultiplier;
-				}
-			}
-		}
-		if (count == 0)
-		{
-			color = 0;
-		} else
-		{
-			alpha /= count;
-			red /= count;
-			green /= count;
-			blue /= count;
-			color = ColorUtil.rgbToInt(alpha, red, green, blue);
-		}
-		if (blockState.getBlock().equals(Blocks.TALL_GRASS))
-			System.out.println(ColorUtil.toString(color) + " " + numberOfGreyPixel + " " + count);
-		if (block instanceof TallGrassBlock || (couldHaveGrassTint(block) || couldHaveLeavesTint(block) || couldHaveWaterTint(block)) && (float) (numberOfGreyPixel / count) > 0.75f)
-		{
-			toTint.replace(block, true);
-		}
-		colorMap.put(block, color);
-
-		return color;
-	}
-
-	private boolean couldHaveGrassTint(Block block)
-	{
-		return block instanceof GrassBlock
-				       || block instanceof BushBlock
-				       || block instanceof IGrowable
-				       || block instanceof AbstractPlantBlock
-				       || block instanceof AbstractTopPlantBlock
-				       || block instanceof TallGrassBlock;
-	}
-
-	private boolean couldHaveLeavesTint(Block block)
-	{
-		return block instanceof LeavesBlock
-				       || block == Blocks.VINE
-				       || block == Blocks.SUGAR_CANE;
-	}
-
-	private boolean couldHaveWaterTint(Block block)
-	{
-		return block == Blocks.WATER;
-	}
-
-	/**
-	 * Returns a color int for the given block.
-	 */
-	private int getColorForBlock(IChunk chunk, BlockPos blockPos)
-	{
-		int xRel = blockPos.getX() - chunk.getPos().getMinBlockX();
-		int zRel = blockPos.getZ() - chunk.getPos().getMinBlockZ();
-		int x = blockPos.getX();
-		int y = blockPos.getY();
-		int z = blockPos.getZ();
-		Biome biome = chunk.getBiomes().getNoiseBiome(xRel >> 2, y >> 2, zRel >> 2);
-		int blockColor;
-
-		BlockState blockState = chunk.getBlockState(blockPos);
-		int colorInt = 0;
-
-
-		// block special cases
-		// TODO: this needs to be replaced by a config file of some sort
-		if (blockState == Blocks.AIR.defaultBlockState()
-				    || blockState == Blocks.CAVE_AIR.defaultBlockState()
-				    || blockState == Blocks.BARRIER.defaultBlockState())
-		{
-			Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
-			tmp = tmp.darker();
-			colorInt = LodUtil.colorToInt(tmp);
-		}
-
-		blockColor = getColorTextureForBlock(blockState, blockPos, true);
-		if (toTint.get(blockState.getBlock()).booleanValue())
-		{
-			// leaves
-			if (couldHaveLeavesTint(blockState.getBlock()))
-			{
-				colorInt = ColorUtil.multiplyRGBcolors(biome.getFoliageColor(), blockColor);
-			}
-			// grass and green plants
-			else if (couldHaveGrassTint(blockState.getBlock()))
-			{
-				colorInt = ColorUtil.multiplyRGBcolors(biome.getGrassColor(x, z), blockColor);
-			}
-			// water
-			else if (couldHaveWaterTint(blockState.getBlock()))
-			{
-				colorInt = ColorUtil.multiplyRGBcolors(biome.getWaterColor(), blockColor);
-			}
-		} else
-		{
-			colorInt = blockColor;
-		}
-		return colorInt;
-	}
-
-	/**
-	 * Returns a color int for the given biome.
-	 */
-	private int getColorForBiome(int x, int z, Biome biome)
-	{
-		int colorInt;
-
-		switch (biome.getBiomeCategory())
-		{
-
-			case NETHER:
-				colorInt = LodUtil.NETHERRACK_COLOR_INT;
-				break;
-
-			case THEEND:
-				colorInt = Blocks.END_STONE.defaultBlockState().materialColor.col;
-				break;
-
-			case BEACH:
-			case DESERT:
-				colorInt = Blocks.SAND.defaultBlockState().materialColor.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:
-				Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
-				tmp = tmp.darker();
-				colorInt = LodUtil.colorToInt(tmp);
-				break;
-
-		}
-
-		return colorInt;
-	}
-
-	/**
-	 * Is the layer between the given X, Z, and dataIndex values a valid LOD point?
-	 */
-	private boolean isLayerValidLodPoint(IChunk chunk, BlockPos.Mutable blockPos)
-	{
-
-		BlockState blockState = chunk.getBlockState(blockPos);
-		boolean onlyUseFullBlock = false;
-		boolean avoidSmallBlock = false;
-		if (blockState != null)
-		{
-			//blockState.isCollisionShapeFullBlock(chunk, blockPos);
-
-			if (avoidSmallBlock || onlyUseFullBlock)
-			{
-				if (!blockState.getFluidState().isEmpty())
-				{
-					return true;
-				}
-
-				VoxelShape voxelShape;
-				if (shapeMap.containsKey(blockState.getBlock()))
-				{
-					voxelShape = shapeMap.get(blockState.getBlock());
-
-				} else
-				{
-					voxelShape = blockState.getShape(chunk, blockPos);
-					shapeMap.put(blockState.getBlock(), voxelShape);
-				}
-				if (!voxelShape.isEmpty())
-				{
-					AxisAlignedBB bbox = voxelShape.bounds();
-					int xWidth = (int) (bbox.maxX - bbox.minX);
-					int yWidth = (int) (bbox.maxY - bbox.minY);
-					int zWidth = (int) (bbox.maxZ - bbox.minZ);
-					if (xWidth < 1 && zWidth < 1 && yWidth < 1 && onlyUseFullBlock)
-					{
-						return false;
-					}
-					if (xWidth < 0.7 && zWidth < 0.7 && yWidth < 1 && avoidSmallBlock)
-					{
-						return false;
-					}
-				} else
-				{
-					return false;
-				}
-			}
-
-			return blockState.getBlock() != Blocks.AIR
-					       && blockState.getBlock() != Blocks.CAVE_AIR
-					       && blockState.getBlock() != Blocks.BARRIER;
-		}
-		return false;
-	}
-}
@@ -0,0 +1,992 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.builders.bufferBuilding;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.locks.ReentrantLock;
+
+import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.GL15;
+import org.lwjgl.opengl.GL30;
+import org.lwjgl.opengl.GL45;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.lod.builders.bufferBuilding.lodTemplates.Box;
+import com.seibel.lod.config.LodConfig;
+import com.seibel.lod.enums.GlProxyContext;
+import com.seibel.lod.enums.GpuUploadMethod;
+import com.seibel.lod.enums.VanillaOverdraw;
+import com.seibel.lod.objects.LodDimension;
+import com.seibel.lod.objects.LodRegion;
+import com.seibel.lod.objects.PosToRenderContainer;
+import com.seibel.lod.objects.RegionPos;
+import com.seibel.lod.proxy.ClientProxy;
+import com.seibel.lod.proxy.GlProxy;
+import com.seibel.lod.render.LodRenderer;
+import com.seibel.lod.util.DataPointUtil;
+import com.seibel.lod.util.DetailDistanceUtil;
+import com.seibel.lod.util.LevelPosUtil;
+import com.seibel.lod.util.LodThreadFactory;
+import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.util.ThreadMapUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;
+
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.vertex.VertexBuffer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.LightType;
+
+/**
+ * This object is used to create NearFarBuffer objects.
+ * @author James Seibel
+ * @version 10-23-2021
+ */
+public class LodBufferBuilder
+{
+	private static final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	
+	/** The thread used to generate new LODs off the main thread. */
+	public static final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(LodBufferBuilder.class.getSimpleName() + " - main"));
+	/** The threads used to generate buffers. */
+	public static final ExecutorService bufferBuilderThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.advancedModOptions.threading.numberOfBufferBuilderThreads.get(), new ThreadFactoryBuilder().setNameFormat("Buffer-Builder-%d").build());
+	
+	/**
+	 * When uploading to a buffer that is too small,
+	 * recreate it this many times bigger than the upload payload
+	 */
+	public static final double BUFFER_EXPANSION_MULTIPLIER = 1.5;
+	
+	/**
+	 * When buffers are first created they are allocated to this size (in Bytes).
+	 * This size will be too small, more than likely. The buffers will be expanded
+	 * when need be to fit the larger sizes.
+	 */
+	public static final int DEFAULT_MEMORY_ALLOCATION = 1024;
+	
+	public static int skyLightPlayer = 15;
+	
+	/**
+	 * How many buffers there are for the given region. <Br>
+	 * This is done because some regions may require more memory than
+	 * can be directly allocated, so we split the regions into smaller sections. <Br>
+	 * This keeps track of those sections.
+	 */
+	public volatile int[][] numberOfBuffersPerRegion;
+	
+	/** Stores the vertices when building the VBOs */
+	public volatile BufferBuilder[][][] buildableBuffers;
+	
+	/** The OpenGL IDs of the storage buffers used by the buildableVbos */
+	public int[][][] buildableStorageBufferIds;
+	/** The OpenGL IDs of the storage buffers used by the drawableVbos */
+	public int[][][] drawableStorageBufferIds;
+	
+	/** Used when building new VBOs */
+	public volatile VertexBuffer[][][] buildableVbos;
+	/** VBOs that are sent over to the LodNodeRenderer */
+	public volatile VertexBuffer[][][] drawableVbos;
+	
+	/**
+	 * if this is true the LOD buffers are currently being
+	 * regenerated.
+	 */
+	public boolean generatingBuffers = false;
+	
+	/**
+	 * if this is true new LOD buffers have been generated
+	 * and are waiting to be swapped with the drawable buffers
+	 */
+	private boolean switchVbos = false;
+	
+	/** Size of the buffer builders in bytes last time we created them */
+	public int previousBufferSize = 0;
+	
+	/** Width of the dimension in regions last time we created the buffers */
+	public int previousRegionWidth = 0;
+	
+	/** this is used to prevent multiple threads creating, destroying, or using the buffers at the same time */
+	private final ReentrantLock bufferLock = new ReentrantLock();
+	
+	private volatile Box[][] boxCache;
+	private volatile PosToRenderContainer[][] setsToRender;
+	private volatile RegionPos center;
+	
+	/**
+	 * This is the ChunkPos the player was at the last time the buffers were built.
+	 * IE the center of the buffers last time they were built
+	 */
+	private volatile ChunkPos drawableCenterChunkPos = new ChunkPos(0, 0);
+	private volatile ChunkPos buildableCenterChunkPos = new ChunkPos(0, 0);
+	
+	
+	
+	
+	
+	
+	public LodBufferBuilder()
+	{
+		
+	}
+	
+	/**
+	 * Create a thread to asynchronously generate LOD buffers
+	 * centered around the given camera X and Z.
+	 * <br>
+	 * This method will write to the drawable near and far buffers.
+	 * <br>
+	 * After the buildable buffers have been generated they must be
+	 * swapped with the drawable buffers in the LodRenderer to be drawn.
+	 */
+	public void generateLodBuffersAsync(LodRenderer renderer, LodDimension lodDim,
+			BlockPos playerBlockPos, boolean fullRegen)
+	{
+		
+		// only allow one generation process to happen at a time
+		if (generatingBuffers)
+			return;
+		
+		if (buildableBuffers == null)
+			// setupBuffers hasn't been called yet
+			return;
+		
+		generatingBuffers = true;
+		
+		
+		Thread thread = new Thread(() ->
+										   generateLodBuffersThread(renderer, lodDim, playerBlockPos, fullRegen));
+		
+		mainGenThread.execute(thread);
+	}
+	
+	// this was pulled out as a separate method so that it could be
+	// more easily edited by hot swapping. Because, As far as James is aware
+	// you can't hot swap lambda expressions.
+	private void generateLodBuffersThread(LodRenderer renderer, LodDimension lodDim,
+			BlockPos playerBlockPos, boolean fullRegen)
+	{
+		bufferLock.lock();
+		
+		try
+		{
+			// round the player's block position down to the nearest chunk BlockPos
+			ChunkPos playerChunkPos = new ChunkPos(playerBlockPos);
+			BlockPos playerBlockPosRounded = playerChunkPos.getWorldPosition();
+			
+			
+			long startTime = System.currentTimeMillis();
+			
+			ArrayList<Callable<Boolean>> nodeToRenderThreads = new ArrayList<>(lodDim.getWidth() * lodDim.getWidth());
+			
+			startBuffers(fullRegen, lodDim);
+			
+			
+			RegionPos playerRegionPos = new RegionPos(playerChunkPos);
+			if (center == null)
+				center = playerRegionPos;
+			
+			if (setsToRender == null)
+				setsToRender = new PosToRenderContainer[lodDim.getWidth()][lodDim.getWidth()];
+			
+			if (setsToRender.length != lodDim.getWidth())
+				setsToRender = new PosToRenderContainer[lodDim.getWidth()][lodDim.getWidth()];
+			
+			if (boxCache == null)
+				boxCache = new Box[lodDim.getWidth()][lodDim.getWidth()];
+			
+			if (boxCache.length != lodDim.getWidth())
+				boxCache = new Box[lodDim.getWidth()][lodDim.getWidth()];
+			
+			// this will be the center of the VBOs once they have been built
+			buildableCenterChunkPos = playerChunkPos;
+			
+			
+			//================================//
+			// create the nodeToRenderThreads //
+			//================================//
+			
+			ClientWorld world = mc.getClientWorld();
+			skyLightPlayer = world.getBrightness(LightType.SKY, playerBlockPos);
+			
+			for (int xRegion = 0; xRegion < lodDim.getWidth(); xRegion++)
+			{
+				for (int zRegion = 0; zRegion < lodDim.getWidth(); zRegion++)
+				{
+					if (lodDim.doesRegionNeedBufferRegen(xRegion, zRegion) || fullRegen)
+					{
+						RegionPos regionPos = new RegionPos(
+								xRegion + lodDim.getCenterRegionPosX() - Math.floorDiv(lodDim.getWidth(), 2),
+								zRegion + lodDim.getCenterRegionPosZ() - Math.floorDiv(lodDim.getWidth(), 2));
+						
+						// local position in the vbo and bufferBuilder arrays
+						BufferBuilder[] currentBuffers = buildableBuffers[xRegion][zRegion];
+						LodRegion region = lodDim.getRegion(regionPos.x, regionPos.z);
+						
+						if (region == null)
+							continue;
+						
+						// make sure the buffers weren't
+						// changed while we were running this method
+						if (currentBuffers == null || !currentBuffers[0].building())
+							return;
+						
+						byte minDetail = region.getMinDetailLevel();
+						
+						
+						final int xR = xRegion;
+						final int zR = zRegion;
+						
+						//we create the Callable to use for the buffer builder creation
+						Callable<Boolean> dataToRenderThread = () ->
+						{
+							//Variable initialization
+							byte detailLevel;
+							int posX;
+							int posZ;
+							int xAdj;
+							int zAdj;
+							int bufferIndex;
+							boolean posNotInPlayerChunk;
+							boolean adjPosInPlayerChunk;
+							Box box = ThreadMapUtil.getBox();
+							boolean[] adjShadeDisabled = ThreadMapUtil.getAdjShadeDisabledArray();
+							
+							// determine how many LODs we can stack vertically
+							int maxVerticalData = DetailDistanceUtil.getMaxVerticalData((byte) 0);
+							
+							//we get or create the map that will contain the adj data
+							Map<Direction, long[]> adjData = ThreadMapUtil.getAdjDataArray(maxVerticalData);
+							
+							//previous setToRender cache
+							if (setsToRender[xR][zR] == null)
+								setsToRender[xR][zR] = new PosToRenderContainer(minDetail, regionPos.x, regionPos.z);
+							
+							
+							//We ask the lod dimension which block we have to render given the player position
+							PosToRenderContainer posToRender = setsToRender[xR][zR];
+							posToRender.clear(minDetail, regionPos.x, regionPos.z);
+							
+							lodDim.getPosToRender(
+									posToRender,
+									regionPos,
+									playerBlockPosRounded.getX(),
+									playerBlockPosRounded.getZ());
+							
+							
+							
+							// keep a local version, so we don't have to worry about indexOutOfBounds Exceptions
+							// if it changes in the LodRenderer while we are working here
+							boolean[][] vanillaRenderedChunks = renderer.vanillaRenderedChunks;
+							short gameChunkRenderDistance = (short) (vanillaRenderedChunks.length / 2 - 1);
+							
+							
+							
+							for (int index = 0; index < posToRender.getNumberOfPos(); index++)
+							{
+								bufferIndex = Math.floorMod(index, currentBuffers.length);
+								detailLevel = posToRender.getNthDetailLevel(index);
+								posX = posToRender.getNthPosX(index);
+								posZ = posToRender.getNthPosZ(index);
+								
+								int chunkXdist = LevelPosUtil.getChunkPos(detailLevel, posX) - playerChunkPos.x;
+								int chunkZdist = LevelPosUtil.getChunkPos(detailLevel, posZ) - playerChunkPos.z;
+								
+								//We don't want to render this fake block if
+								//The block is inside the render distance with, is not bigger than a chunk and is positioned in a chunk set as vanilla rendered
+								//
+								//The block is in the player chunk or in a chunk adjacent to the player
+								if(isThisPositionGoingToBeRendered(detailLevel, posX, posZ, playerChunkPos, vanillaRenderedChunks, gameChunkRenderDistance))
+								{
+									continue;
+								}
+								
+								//we check if the block to render is not in player chunk
+								posNotInPlayerChunk = !(chunkXdist == 0 && chunkZdist == 0);
+										
+																					// We extract the adj data in the four cardinal direction
+								
+								// we first reset the adjShadeDisabled. This is used to disable the shade on the border when we have transparent block like water or glass
+								// to avoid having a "darker border" underground
+								Arrays.fill(adjShadeDisabled, false);
+								
+								//We check every adj block in each direction
+								for (Direction direction : Box.ADJ_DIRECTIONS)
+								{
+									
+									xAdj = posX + Box.DIRECTION_NORMAL_MAP.get(direction).getX();
+									zAdj = posZ + Box.DIRECTION_NORMAL_MAP.get(direction).getZ();
+									long data;
+									chunkXdist = LevelPosUtil.getChunkPos(detailLevel, xAdj) - playerChunkPos.x;
+									chunkZdist = LevelPosUtil.getChunkPos(detailLevel, zAdj) - playerChunkPos.z;
+									adjPosInPlayerChunk = (chunkXdist == 0 && chunkZdist == 0);
+									
+									//If the adj block is rendered in the same region and with same detail
+									// and is positioned in a place that is not going to be rendered by vanilla game
+									// then we can set this position as adj
+									// We avoid cases where the adjPosition is in player chunk while the position is not
+									// to always have a wall underwater
+									if(posToRender.contains(detailLevel, xAdj, zAdj)
+										&& !isThisPositionGoingToBeRendered(detailLevel, xAdj, zAdj, playerChunkPos, vanillaRenderedChunks, gameChunkRenderDistance)
+										&& !(posNotInPlayerChunk && adjPosInPlayerChunk))
+									{
+										for (int verticalIndex = 0; verticalIndex < lodDim.getMaxVerticalData(detailLevel, xAdj, zAdj); verticalIndex++)
+										{
+											data = lodDim.getData(detailLevel, xAdj, zAdj, verticalIndex);
+											adjShadeDisabled[Box.DIRECTION_INDEX.get(direction)] = false;
+											adjData.get(direction)[verticalIndex] = data;
+										}
+									}
+									else
+									{
+										//Other wise we check if this position is
+										data = lodDim.getSingleData(detailLevel, xAdj, zAdj);
+										
+										adjData.get(direction)[0] = DataPointUtil.EMPTY_DATA;
+										
+										if ((isThisPositionGoingToBeRendered(detailLevel, xAdj, zAdj, playerChunkPos, vanillaRenderedChunks, gameChunkRenderDistance) || (posNotInPlayerChunk && adjPosInPlayerChunk))
+													&& !DataPointUtil.isVoid(data))
+										{
+											adjShadeDisabled[Box.DIRECTION_INDEX.get(direction)] = DataPointUtil.getAlpha(data) < 255;
+										}
+									}
+								}
+								
+								
+								// We render every vertical lod present in this position
+								// We only stop when we find a block that is void or non existing block
+								long data;
+								for (int verticalIndex = 0; verticalIndex < lodDim.getMaxVerticalData(detailLevel, posX, posZ); verticalIndex++)
+								{
+									
+									//we get the above block as adj UP
+									if (verticalIndex > 0)
+									{
+										adjData.get(Direction.UP)[0] = lodDim.getData(detailLevel, posX, posZ, verticalIndex - 1);
+									}
+									else
+									{
+										adjData.get(Direction.UP)[0] = DataPointUtil.EMPTY_DATA;
+									}
+									
+									
+									//we get the below block as adj DOWN
+									if (verticalIndex < lodDim.getMaxVerticalData(detailLevel, posX, posZ) - 1)
+									{
+										adjData.get(Direction.DOWN)[0] = lodDim.getData(detailLevel, posX, posZ, verticalIndex + 1);
+									}
+									else
+									{
+										adjData.get(Direction.DOWN)[0] = DataPointUtil.EMPTY_DATA;
+									}
+									
+									//We extract the data to render
+									data = lodDim.getData(detailLevel, posX, posZ, verticalIndex);
+									
+									//If the data is not renderable (Void or non existing) we stop since there is no data left in this position
+									if (DataPointUtil.isVoid(data) || !DataPointUtil.doesItExist(data))
+										break;
+									
+									//We send the call to create the vertices
+									LodConfig.CLIENT.graphics.advancedGraphicsOption.lodTemplate.get().template.addLodToBuffer(currentBuffers[bufferIndex], playerBlockPosRounded, data, adjData,
+											detailLevel, posX, posZ, box, renderer.previousDebugMode, renderer.lightMap, adjShadeDisabled);
+								}
+								
+								
+							} // for pos to in list to render
+							// the thread executed successfully
+							return true;
+						};
+						
+						
+						nodeToRenderThreads.add(dataToRenderThread);
+						
+						
+					}
+				} // region z
+			} // region z
+			
+			
+			long executeStart = System.currentTimeMillis();
+			// wait for all threads to finish
+			List<Future<Boolean>> futuresBuffer = bufferBuilderThreads.invokeAll(nodeToRenderThreads);
+			for (Future<Boolean> future : futuresBuffer)
+			{
+				// the future will be false if its thread failed
+				if (!future.get())
+				{
+					ClientProxy.LOGGER.warn("LodBufferBuilder ran into trouble and had to start over.");
+					break;
+				}
+			}
+			long executeEnd = System.currentTimeMillis();
+			
+			
+			long endTime = System.currentTimeMillis();
+			@SuppressWarnings("unused")
+			long buildTime = endTime - startTime;
+			@SuppressWarnings("unused")
+			long executeTime = executeEnd - executeStart;
+
+//			ClientProxy.LOGGER.info("Thread Build time: " + buildTime + " ms" + '\n' +
+//					                        "thread execute time: " + executeTime + " ms");
+			
+			// mark that the buildable buffers as ready to swap
+			switchVbos = true;
+		}
+		catch (Exception e)
+		{
+			ClientProxy.LOGGER.warn("\"LodNodeBufferBuilder.generateLodBuffersAsync\" ran into trouble: ");
+			e.printStackTrace();
+		}
+		finally
+		{
+			// clean up any potentially open resources
+			if (buildableBuffers != null)
+				closeBuffers(fullRegen, lodDim);
+			
+			try
+			{
+				// upload the new buffers
+				uploadBuffers(fullRegen, lodDim);
+			}
+			catch (Exception e)
+			{
+				ClientProxy.LOGGER.warn("\"LodNodeBufferBuilder.generateLodBuffersAsync\" was unable to upload the buffers to the GPU: " + e.getMessage());
+				e.printStackTrace();
+			}
+			
+			// regardless of whether we were able to successfully create
+			// the buffers, we are done generating.
+			generatingBuffers = false;
+			bufferLock.unlock();
+		}
+	}
+	
+	private boolean isThisPositionGoingToBeRendered(byte detailLevel, int posX, int posZ, ChunkPos playerChunkPos, boolean[][] vanillaRenderedChunks, int gameChunkRenderDistance){
+		
+		
+		// skip any chunks that Minecraft is going to render
+		int chunkXdist = LevelPosUtil.getChunkPos(detailLevel, posX) - playerChunkPos.x;
+		int chunkZdist = LevelPosUtil.getChunkPos(detailLevel, posZ) - playerChunkPos.z;
+		
+		// check if the chunk is on the border
+		boolean isItBorderPos;
+		if (LodConfig.CLIENT.graphics.advancedGraphicsOption.vanillaOverdraw.get() == VanillaOverdraw.BORDER)
+			isItBorderPos = LodUtil.isBorderChunk(vanillaRenderedChunks, chunkXdist + gameChunkRenderDistance + 1, chunkZdist + gameChunkRenderDistance + 1);
+		else
+			isItBorderPos = false;
+		
+		
+		//boolean smallRenderDistance = gameChunkRenderDistance <= LodUtil.MINIMUM_RENDER_DISTANCE_FOR_PARTIAL_OVERDRAW;
+		
+		// get the positions that will be rendered
+		
+		boolean vanillaRenderedPosition = gameChunkRenderDistance >= Math.abs(chunkXdist)
+												  && gameChunkRenderDistance >= Math.abs(chunkZdist)
+												  && detailLevel <= LodUtil.CHUNK_DETAIL_LEVEL
+												  && vanillaRenderedChunks[chunkXdist + gameChunkRenderDistance + 1][chunkZdist + gameChunkRenderDistance + 1];
+		
+		
+		return (vanillaRenderedPosition && (!(isItBorderPos)));
+	}
+	
+	
+	
+	
+	
+	
+	//===============================//
+	// BufferBuilder related methods //
+	//===============================//
+	
+	/**
+	 * Called from the LodRenderer to create the
+	 * BufferBuilders. <br><br>
+	 * <p>
+	 * May have to wait for the bufferLock to open.
+	 */
+	public void setupBuffers(LodDimension lodDimension)
+	{
+		GlProxy glProxy = GlProxy.getInstance();
+		
+		bufferLock.lock();
+		int numbRegionsWide = lodDimension.getWidth();
+		long regionMemoryRequired;
+		int numberOfBuffers;
+		
+		previousRegionWidth = numbRegionsWide;
+		numberOfBuffersPerRegion = new int[numbRegionsWide][numbRegionsWide];
+		buildableBuffers = new BufferBuilder[numbRegionsWide][numbRegionsWide][];
+		
+		buildableVbos = new VertexBuffer[numbRegionsWide][numbRegionsWide][];
+		drawableVbos = new VertexBuffer[numbRegionsWide][numbRegionsWide][];
+		
+		if (glProxy.bufferStorageSupported)
+		{
+			buildableStorageBufferIds = new int[numbRegionsWide][numbRegionsWide][];
+			drawableStorageBufferIds = new int[numbRegionsWide][numbRegionsWide][];
+		}
+		
+		for (int x = 0; x < numbRegionsWide; x++)
+		{
+			for (int z = 0; z < numbRegionsWide; z++)
+			{
+				regionMemoryRequired = DEFAULT_MEMORY_ALLOCATION;
+				
+				// if the memory required is greater than the max buffer 
+				// capacity, divide the memory across multiple buffers
+				if (regionMemoryRequired > LodUtil.MAX_ALLOCATABLE_DIRECT_MEMORY)
+				{
+					numberOfBuffers = (int) Math.ceil(regionMemoryRequired / LodUtil.MAX_ALLOCATABLE_DIRECT_MEMORY) + 1;
+					
+					// TODO shouldn't this be determined with regionMemoryRequired?
+					// always allocating the max memory is a bit expensive isn't it?
+					regionMemoryRequired = LodUtil.MAX_ALLOCATABLE_DIRECT_MEMORY;
+					numberOfBuffersPerRegion[x][z] = numberOfBuffers;
+					buildableBuffers[x][z] = new BufferBuilder[numberOfBuffers];
+					buildableVbos[x][z] = new VertexBuffer[numberOfBuffers];
+					drawableVbos[x][z] = new VertexBuffer[numberOfBuffers];
+					
+					if (glProxy.bufferStorageSupported)
+					{
+						buildableStorageBufferIds[x][z] = new int[numberOfBuffers];
+						drawableStorageBufferIds[x][z] = new int[numberOfBuffers];
+					}
+				}
+				else
+				{
+					// we only need one buffer for this region
+					numberOfBuffersPerRegion[x][z] = 1;
+					buildableBuffers[x][z] = new BufferBuilder[1];
+					buildableVbos[x][z] = new VertexBuffer[1];
+					drawableVbos[x][z] = new VertexBuffer[1];
+					
+					if (glProxy.bufferStorageSupported)
+					{
+						buildableStorageBufferIds[x][z] = new int[1];
+						drawableStorageBufferIds[x][z] = new int[1];
+					}
+				}
+				
+				
+				for (int i = 0; i < numberOfBuffersPerRegion[x][z]; i++)
+				{
+					buildableBuffers[x][z][i] = new BufferBuilder((int) regionMemoryRequired);
+					
+					buildableVbos[x][z][i] = new VertexBuffer(LodUtil.LOD_VERTEX_FORMAT);
+					drawableVbos[x][z][i] = new VertexBuffer(LodUtil.LOD_VERTEX_FORMAT);
+					
+					
+					// create the initial mapped buffers (system memory)
+					GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, buildableVbos[x][z][i].id);
+					GL15.glBufferData(GL15.GL_ARRAY_BUFFER, regionMemoryRequired, GL15.GL_DYNAMIC_DRAW);
+					GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+					
+					GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, drawableVbos[x][z][i].id);
+					GL15.glBufferData(GL15.GL_ARRAY_BUFFER, regionMemoryRequired, GL15.GL_DYNAMIC_DRAW);
+					GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+					
+					
+					if (glProxy.bufferStorageSupported)
+					{
+						// create the buffer storage (GPU memory)
+						buildableStorageBufferIds[x][z][i] = GL15.glGenBuffers();
+						GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, buildableStorageBufferIds[x][z][i]);
+						GL45.glBufferStorage(GL15.GL_ARRAY_BUFFER, regionMemoryRequired, 0); // the 0 flag means to create the storage in the GPUs memory
+						GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+						
+						drawableStorageBufferIds[x][z][i] = GL15.glGenBuffers();
+						GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, drawableStorageBufferIds[x][z][i]);
+						GL45.glBufferStorage(GL15.GL_ARRAY_BUFFER, regionMemoryRequired, 0);
+						GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);	
+					}
+				}
+			}
+		}
+		
+		bufferLock.unlock();
+	}
+	
+	
+	
+	/**
+	 * Sets the buffers and Vbos to null, forcing them to be recreated <br>
+	 * and destroys any bound OpenGL objects. <br><br>
+	 * <p>
+	 * May have to wait for the bufferLock to open.
+	 */
+	public void destroyBuffers()
+	{
+		bufferLock.lock();
+		
+		
+		// destroy the buffer storages if they aren't already
+		if (buildableStorageBufferIds != null)
+		{
+			for (int x = 0; x < buildableStorageBufferIds.length; x++)
+			{
+				for (int z = 0; z < buildableStorageBufferIds.length; z++)
+				{
+					for (int i = 0; i < buildableStorageBufferIds[x][z].length; i++)
+					{
+						int buildableId = buildableStorageBufferIds[x][z][i];
+						int drawableId = drawableStorageBufferIds[x][z][i];
+						
+						// Send this over to the render thread, if this is being
+						// called we aren't worried about stuttering anyway.
+						// This way we don't have to worry about what context this
+						// was called from (if any).
+						RenderSystem.recordRenderCall(() ->
+						{
+							GL15.glDeleteBuffers(buildableId);
+							GL15.glDeleteBuffers(drawableId);
+						});
+					}
+				}
+			}
+		}
+		
+		buildableStorageBufferIds = null;
+		drawableStorageBufferIds = null;
+		
+		
+		
+		
+		// destroy the VBOs if they aren't already
+		if (buildableVbos != null)
+		{
+			for (int i = 0; i < buildableVbos.length; i++)
+			{
+				for (int j = 0; j < buildableVbos.length; j++)
+				{
+					for (int k = 0; k < buildableVbos[i][j].length; k++)
+					{
+						int buildableId;
+						int drawableId;
+						
+						// variables passed into a lambda expression
+						// need to be effectively final, so we have
+						// to use an else statement here
+						if (buildableVbos[i][j][k] != null)
+							buildableId = buildableVbos[i][j][k].id;
+						else
+							buildableId = 0;
+						
+						if (drawableVbos[i][j][k] != null)
+							drawableId = drawableVbos[i][j][k].id;
+						else
+							drawableId = 0;
+						
+						
+						RenderSystem.recordRenderCall(() ->
+						{
+							if (buildableId != 0)
+								GL15.glDeleteBuffers(buildableId);
+							if (drawableId != 0)
+								GL15.glDeleteBuffers(drawableId);
+						});
+					}
+				}
+			}
+		}
+		
+		buildableVbos = null;
+		drawableVbos = null;
+		
+		
+		// these don't contain any OpenGL objects, so
+		// they don't require any special clean-up
+		buildableBuffers = null;
+		
+		bufferLock.unlock();
+	}
+	
+	/** Calls begin on each of the buildable BufferBuilders. */
+	private void startBuffers(boolean fullRegen, LodDimension lodDim)
+	{
+		for (int x = 0; x < buildableBuffers.length; x++)
+		{
+			for (int z = 0; z < buildableBuffers.length; z++)
+			{
+				if (fullRegen || lodDim.doesRegionNeedBufferRegen(x, z))
+				{
+					for (int i = 0; i < buildableBuffers[x][z].length; i++)
+					{
+						// for some reason BufferBuilder.vertexCounts
+						// isn't reset unless this is called, which can cause
+						// a false indexOutOfBoundsException
+						buildableBuffers[x][z][i].discard();
+						
+						buildableBuffers[x][z][i].begin(GL11.GL_QUADS, LodUtil.LOD_VERTEX_FORMAT);
+					}
+				}
+			}
+		}
+	}
+	
+	/** Calls end on each of the buildable BufferBuilders. */
+	private void closeBuffers(boolean fullRegen, LodDimension lodDim)
+	{
+		for (int x = 0; x < buildableBuffers.length; x++)
+			for (int z = 0; z < buildableBuffers.length; z++)
+				for (int i = 0; i < buildableBuffers[x][z].length; i++)
+					if (buildableBuffers[x][z][i] != null && buildableBuffers[x][z][i].building() && (fullRegen || lodDim.doesRegionNeedBufferRegen(x, z)))
+						buildableBuffers[x][z][i].end();
+	}
+	
+	
+	/** Upload all buildableBuffers to the GPU. */
+	private void uploadBuffers(boolean fullRegen, LodDimension lodDim)
+	{
+		GlProxy glProxy = GlProxy.getInstance();
+		
+		try
+		{
+			// make sure we are uploading to the builder context,
+			// this helps prevent interference (IE stuttering) with the Minecraft context.
+			glProxy.setGlContext(GlProxyContext.LOD_BUILDER);
+			
+			// determine the upload method
+			GpuUploadMethod uploadMethod = LodConfig.CLIENT.graphics.advancedGraphicsOption.gpuUploadMethod.get();
+			if (!glProxy.bufferStorageSupported && uploadMethod == GpuUploadMethod.BUFFER_STORAGE)
+			{
+				// if buffer storage isn't supported
+				// default to SUB_DATA
+				LodConfig.CLIENT.graphics.advancedGraphicsOption.gpuUploadMethod.set(GpuUploadMethod.SUB_DATA);
+				uploadMethod = GpuUploadMethod.SUB_DATA;
+			}
+			
+			// actually upload the buffers
+			for (int x = 0; x < buildableVbos.length; x++)
+			{
+				for (int z = 0; z < buildableVbos.length; z++)
+				{
+					if (fullRegen || lodDim.doesRegionNeedBufferRegen(x, z))
+					{
+						for (int i = 0; i < buildableBuffers[x][z].length; i++)
+						{
+							ByteBuffer uploadBuffer = buildableBuffers[x][z][i].popNextBuffer().getSecond();
+							vboUpload(buildableVbos[x][z][i], buildableStorageBufferIds[x][z][i], uploadBuffer, true, uploadMethod);
+							lodDim.setRegenRegionBufferByArrayIndex(x, z, false);
+						}
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			// this doesn't appear to be necessary anymore, but just in case.
+			ClientProxy.LOGGER.error(LodBufferBuilder.class.getSimpleName() + " - UploadBuffers failed: " + e.getMessage());
+			e.printStackTrace();
+		}
+		finally
+		{
+			GL11.glFinish();
+			
+			// close the context so it can be re-used later.
+			// I'm guessing we can't just leave it because the executor service
+			// does something that invalidates the OpenGL context.
+			glProxy.setGlContext(GlProxyContext.NONE);
+		}
+	}
+	
+	/** Uploads the uploadBuffer so the GPU can use it. 
+	 * @param uploadMethod */
+	private void vboUpload(VertexBuffer vbo, int storageBufferId, ByteBuffer uploadBuffer,
+			boolean allowBufferExpansion, GpuUploadMethod uploadMethod)
+	{
+		// this shouldn't happen, but just to be safe
+		if (vbo.id != -1 && GlProxy.getInstance().getGlContext() == GlProxyContext.LOD_BUILDER)
+		{
+			// this is how many points will be rendered
+			vbo.vertexCount = (uploadBuffer.capacity() / vbo.format.getVertexSize());
+			
+			
+			GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, vbo.id);
+			try
+			{
+				// if possible use the faster buffer storage route
+				if (uploadMethod == GpuUploadMethod.BUFFER_STORAGE)
+				{
+					// get a pointer to the buffer in system memory
+					ByteBuffer vboBuffer = GL30.glMapBufferRange(GL15.GL_ARRAY_BUFFER, 0, uploadBuffer.capacity(), GL30.GL_MAP_WRITE_BIT | GL30.GL_MAP_UNSYNCHRONIZED_BIT);
+					if (vboBuffer == null)
+					{
+						int previousCapacity = uploadBuffer.capacity();
+						
+						// only expand the buffers if the uploadBuffer actually
+						// has something in it and expansion is allowed
+						if (previousCapacity != 0 && allowBufferExpansion)
+						{
+							// the buffer(s) aren't big enough, expand them.
+							// This does cause lag/stuttering, so it should be avoided!
+							
+							// expand the buffer in system memory
+							GL15.glBufferData(GL15.GL_ARRAY_BUFFER, (int) (uploadBuffer.capacity() * BUFFER_EXPANSION_MULTIPLIER), GL15.GL_DYNAMIC_DRAW);
+							GL15.glBufferSubData(GL15.GL_ARRAY_BUFFER, 0, uploadBuffer);
+							
+							// un-bind the system memory buffer 
+							GL15.glUnmapBuffer(GL15.GL_ARRAY_BUFFER);
+							GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+							
+							// expand the buffer storage
+							GL15.glDeleteBuffers(storageBufferId);
+							GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, storageBufferId);
+							GL45.glBufferStorage(GL15.GL_ARRAY_BUFFER, (int) (uploadBuffer.capacity() * BUFFER_EXPANSION_MULTIPLIER), 0);
+							GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+							
+							
+							// recursively try to upload into the newly created buffer storage
+							// but don't recurse again if that fails
+							// (we don't want an infinitely expanding buffer!)
+							vboUpload(vbo, storageBufferId, uploadBuffer, false, uploadMethod);
+						}
+					}
+					else
+					{
+						// upload the buffer into system memory...
+						vboBuffer.put(uploadBuffer);
+						GL15.glUnmapBuffer(GL15.GL_ARRAY_BUFFER);
+						
+						// ...then upload into GPU memory
+						// (uploading into GPU memory directly can only be done 
+						// through the glCopyBufferSubData/glCopyNamed... methods)
+						GL45.glCopyNamedBufferSubData(vbo.id, storageBufferId, 0, 0, uploadBuffer.capacity());
+					}
+				}
+				else if (uploadMethod == GpuUploadMethod.BUFFER_MAPPING)
+				{
+					// no stuttering but high GPU usage
+					// stores everything in system memory instead of GPU memory
+					// making rendering much slower.
+					// Unless the user is running integrated graphics,
+					// in that case this will actually work better than SUB_DATA.
+					
+					
+					ByteBuffer vboBuffer = null;
+					
+					// map buffer range is better since it can be explicitly unsynchronized 
+					if (GlProxy.getInstance().mapBufferRangeSupported)
+						vboBuffer = GL30.glMapBufferRange(GL30.GL_ARRAY_BUFFER, 0, uploadBuffer.capacity(), GL30.GL_MAP_WRITE_BIT | GL30.GL_MAP_UNSYNCHRONIZED_BIT);
+					else
+						vboBuffer = GL15.glMapBuffer(GL30.GL_ARRAY_BUFFER, uploadBuffer.capacity());
+					
+					
+					if (vboBuffer == null)
+					{
+						GL15.glBufferData(GL45.GL_ARRAY_BUFFER, (int) (uploadBuffer.capacity() * BUFFER_EXPANSION_MULTIPLIER), GL15.GL_DYNAMIC_DRAW);
+						GL15.glBufferSubData(GL15.GL_ARRAY_BUFFER, 0, uploadBuffer);
+					}
+					else
+					{
+						vboBuffer.put(uploadBuffer);
+					}
+				}
+				else
+				{
+					// hybrid subData/bufferData //
+					// less stutter, low GPU usage
+					
+					//long size = GL31.glGetBufferParameteri64(GL15.GL_ARRAY_BUFFER, GL15.GL_BUFFER_SIZE); // hopefully just a int should be long enough
+					long size = GL15.glGetBufferParameteri(GL15.GL_ARRAY_BUFFER, GL15.GL_BUFFER_SIZE);
+					if (size < uploadBuffer.capacity() * BUFFER_EXPANSION_MULTIPLIER)
+					{
+						GL15.glBufferData(GL15.GL_ARRAY_BUFFER, (int) (uploadBuffer.capacity() * BUFFER_EXPANSION_MULTIPLIER), GL15.GL_DYNAMIC_DRAW);
+					}
+					GL15.glBufferSubData(GL15.GL_ARRAY_BUFFER, 0, uploadBuffer);
+				}
+			}
+			catch (Exception e)
+			{
+				ClientProxy.LOGGER.error("vboUpload failed: " + e.getClass().getSimpleName());
+				e.printStackTrace();
+			}
+			finally
+			{
+				if (uploadMethod == GpuUploadMethod.BUFFER_MAPPING)
+					GL15.glUnmapBuffer(GL15.GL_ARRAY_BUFFER);
+				
+				GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
+			}
+			
+		}//if vbo exists and in correct GL context
+	}//vboUpload
+	
+	/** Get the newly created VBOs */
+	public VertexBuffersAndOffset getVertexBuffers()
+	{
+		// don't wait for the lock to open,
+		// since this is called on the main render thread
+		if (bufferLock.tryLock())
+		{
+			VertexBuffer[][][] tmpVbo = drawableVbos;
+			drawableVbos = buildableVbos;
+			buildableVbos = tmpVbo;
+			
+			int[][][] tmpStorage = drawableStorageBufferIds;
+			drawableStorageBufferIds = buildableStorageBufferIds;
+			buildableStorageBufferIds = tmpStorage;
+			
+			drawableCenterChunkPos = buildableCenterChunkPos;
+			
+			// the vbos have been swapped
+			switchVbos = false;
+			bufferLock.unlock();
+		}
+		
+		return new VertexBuffersAndOffset(drawableVbos, drawableStorageBufferIds, drawableCenterChunkPos);
+	}
+	
+	/** A simple container to pass multiple objects back in the getVertexBuffers method. */
+	public static class VertexBuffersAndOffset
+	{
+		public final VertexBuffer[][][] vbos;
+		public final int[][][] storageBufferIds;
+		public final ChunkPos drawableCenterChunkPos;
+		
+		public VertexBuffersAndOffset(VertexBuffer[][][] newVbos, int[][][] newStorageBufferIds, ChunkPos newDrawableCenterChunkPos)
+		{
+			vbos = newVbos;
+			storageBufferIds = newStorageBufferIds;
+			drawableCenterChunkPos = newDrawableCenterChunkPos;
+		}
+	}
+	
+	/**
+	 * If this is true the buildable near and far
+	 * buffers have been generated and are ready to be
+	 * sent to the LodRenderer.
+	 */
+	public boolean newBuffersAvailable()
+	{
+		return switchVbos;
+	}
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,7 +16,8 @@
 *    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.builders.lodTemplates;
+
+package com.seibel.lod.builders.bufferBuilding.lodTemplates;

 import java.util.Map;

@@ -30,31 +32,23 @@ import net.minecraft.util.math.BlockPos;
 /**
 * This is the abstract class used to create different
 * BufferBuilders.
- *
 * @author James Seibel
- * @version 8-8-2021
+ * @version 10-10-2021
 */
 public abstract class AbstractLodTemplate
 {
-
-
+	
+	/** Uploads the given LOD to the buffer. */
 	public abstract void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map<Direction, long[]> adjData,
-	                                    byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap);
-
-	/**
-	 * add the given position and color to the buffer
-	 */
+			byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled);
+	
+	/** add the given position and color to the buffer */
 	protected void addPosAndColor(BufferBuilder buffer,
-	                              double x, double y, double z,
-	                              int color)
+			double x, double y, double z,
+			int color)
 	{
-
-		buffer.vertex(x, y, z).color(ColorUtil.getRed(color), ColorUtil.getGreen(color), ColorUtil.getBlue(color), ColorUtil.getAlpha(color)).endVertex();
+		// TODO re-add transparency by replacing the 255 with "ColorUtil.getAlpha(color)"
+		buffer.vertex(x, y, z).color(ColorUtil.getRed(color), ColorUtil.getGreen(color), ColorUtil.getBlue(color), 255).endVertex();
 	}
-
-	/**
-	 * Returns in bytes how much buffer memory is required
-	 * for one LOD object
-	 */
-	public abstract int getBufferMemoryForSingleNode(int maxVerticalData);
+	
 }
@@ -0,0 +1,593 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.builders.bufferBuilding.lodTemplates;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.seibel.lod.config.LodConfig;
+import com.seibel.lod.enums.DebugMode;
+import com.seibel.lod.util.ColorUtil;
+import com.seibel.lod.util.DataPointUtil;
+import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;
+
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3i;
+
+/**
+ * Similar to Minecraft's AxisAlignedBoundingBox.
+ * @author Leonardo Amato
+ * @version 10-2-2021
+ */
+public class Box
+{
+	
+	public static final int ADJACENT_HEIGHT_INDEX = 0;
+	public static final int ADJACENT_DEPTH_INDEX = 1;
+	
+	public static final int X = 0;
+	public static final int Y = 1;
+	public static final int Z = 2;
+	
+	public static final int MIN = 0;
+	public static final int MAX = 1;
+	
+	public static final int VOID_FACE = 0;
+	
+	/** The six cardinal directions */
+	public static final Direction[] DIRECTIONS = new Direction[] {
+			Direction.UP,
+			Direction.DOWN,
+			Direction.WEST,
+			Direction.EAST,
+			Direction.NORTH,
+			Direction.SOUTH };
+	
+	/** North, South, East, West */
+	public static final Direction[] ADJ_DIRECTIONS = new Direction[] {
+			Direction.EAST,
+			Direction.WEST,
+			Direction.SOUTH,
+			Direction.NORTH };
+	
+	/** All the faces and vertices of a cube. This is used to extract the vertex from the column */
+	public static final Map<Direction, int[][]> DIRECTION_VERTEX_MAP = new HashMap<Direction, int[][]>()
+	{{
+		put(Direction.UP, new int[][] {
+				{ 0, 1, 0 },
+				{ 0, 1, 1 },
+				{ 1, 1, 1 },
+				{ 1, 1, 0 } });
+		put(Direction.DOWN, new int[][] {
+				{ 1, 0, 0 },
+				{ 1, 0, 1 },
+				{ 0, 0, 1 },
+				{ 0, 0, 0 } });
+		put(Direction.EAST, new int[][] {
+				{ 1, 1, 0 },
+				{ 1, 1, 1 },
+				{ 1, 0, 1 },
+				{ 1, 0, 0 } });
+		put(Direction.WEST, new int[][] {
+				{ 0, 0, 0 },
+				{ 0, 0, 1 },
+				{ 0, 1, 1 },
+				{ 0, 1, 0 } });
+		put(Direction.SOUTH, new int[][] {
+				{ 1, 0, 1 },
+				{ 1, 1, 1 },
+				{ 0, 1, 1 },
+				{ 0, 0, 1 } });
+		put(Direction.NORTH, new int[][] {
+				{ 0, 0, 0 },
+				{ 0, 1, 0 },
+				{ 1, 1, 0 },
+				{ 1, 0, 0 } });
+	}};
+	
+	
+	/**
+	 * This indicates which position is invariable in the DIRECTION_VERTEX_MAP.
+	 * Is used to extract the vertex
+	 */
+	public static final Map<Direction, int[]> FACE_DIRECTION = new HashMap<Direction, int[]>()
+	{{
+		put(Direction.UP, new int[] { Y, MAX });
+		put(Direction.DOWN, new int[] { Y, MIN });
+		put(Direction.EAST, new int[] { X, MAX });
+		put(Direction.WEST, new int[] { X, MIN });
+		put(Direction.SOUTH, new int[] { Z, MAX });
+		put(Direction.NORTH, new int[] { Z, MIN });
+	}};
+	
+	
+	/**
+	 * This is a map from Direction to the relative normal vector
+	 * we are using this since I'm not sure if the getNormal create new object at every call
+	 */
+	public static final Map<Direction, Vector3i> DIRECTION_NORMAL_MAP = new HashMap<Direction, Vector3i>()
+	{{
+		put(Direction.UP, Direction.UP.getNormal());
+		put(Direction.DOWN, Direction.DOWN.getNormal());
+		put(Direction.EAST, Direction.EAST.getNormal());
+		put(Direction.WEST, Direction.WEST.getNormal());
+		put(Direction.SOUTH, Direction.SOUTH.getNormal());
+		put(Direction.NORTH, Direction.NORTH.getNormal());
+	}};
+	
+	/** We use this index for all array that are going to */
+	public static final Map<Direction, Integer> DIRECTION_INDEX = new HashMap<Direction, Integer>()
+	{{
+		put(Direction.UP, 0);
+		put(Direction.DOWN, 1);
+		put(Direction.EAST, 2);
+		put(Direction.WEST, 3);
+		put(Direction.SOUTH, 4);
+		put(Direction.NORTH, 5);
+	}};
+	
+	public static final Map<Direction, Integer> ADJ_DIRECTION_INDEX = new HashMap<Direction, Integer>()
+	{{
+		put(Direction.EAST, 0);
+		put(Direction.WEST, 1);
+		put(Direction.SOUTH, 2);
+		put(Direction.NORTH, 3);
+	}};
+	/** holds the box's x, y, z offset */
+	public final int[] boxOffset;
+	/** holds the box's x, y, z width */
+	public final int[] boxWidth;
+	
+	/** Holds each direction's color */
+	public final int[] colorMap;
+	/** The original color (before shading) of this box */
+	public int color;
+	/**
+	 *
+	 */
+	public final Map<Direction, int[]> adjHeight;
+	public final Map<Direction, int[]> adjDepth;
+	public final Map<Direction, byte[]> skyLights;
+	public byte blockLight;
+	
+	/** Holds if the given direction should be culled or not */
+	public final boolean[] culling;
+	
+	
+	/** creates an empty box */
+	public Box()
+	{
+		boxOffset = new int[3];
+		boxWidth = new int[3];
+		
+		colorMap = new int[6];
+		skyLights = new HashMap<Direction, byte[]>()
+		{{
+			put(Direction.UP, new byte[1]);
+			put(Direction.DOWN, new byte[1]);
+			put(Direction.EAST, new byte[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.WEST, new byte[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.SOUTH, new byte[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.NORTH, new byte[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+		}};
+		adjHeight = new HashMap<Direction, int[]>()
+		{{
+			put(Direction.EAST, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.WEST, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.SOUTH, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.NORTH, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+		}};
+		adjDepth = new HashMap<Direction, int[]>()
+		{{
+			put(Direction.EAST, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.WEST, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.SOUTH, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+			put(Direction.NORTH, new int[LodUtil.MAX_NUMBER_OF_VERTICAL_LODS]);
+		}};
+		
+		culling = new boolean[6];
+	}
+	
+	/** Set the light of the columns */
+	public void setLights(int skyLight, int blockLight)
+	{
+		this.blockLight = (byte) blockLight;
+		skyLights.get(Direction.UP)[0] = (byte) skyLight;
+	}
+	
+	/**
+	 * Set the color of the columns
+	 * @param color color to add
+	 * @param adjShadeDisabled this array indicates which face does not need shading
+	 */
+	public void setColor(int color, boolean[] adjShadeDisabled)
+	{
+		this.color = color;
+		for (Direction direction : DIRECTIONS)
+		{
+			if (!adjShadeDisabled[DIRECTION_INDEX.get(direction)])
+				colorMap[DIRECTION_INDEX.get(direction)] = ColorUtil.applyShade(color, MinecraftWrapper.INSTANCE.getClientWorld().getShade(direction, true));
+			else
+				colorMap[DIRECTION_INDEX.get(direction)] = color;
+		}
+	}
+	
+	/**
+	 * @param direction of the face of which we want to get the color
+	 * @return color of the face
+	 */
+	public int getColor(Direction direction)
+	{
+		if (LodConfig.CLIENT.advancedModOptions.debugging.debugMode.get() != DebugMode.SHOW_DETAIL)
+			return colorMap[DIRECTION_INDEX.get(direction)];
+		else
+			return ColorUtil.applyShade(color, MinecraftWrapper.INSTANCE.getClientWorld().getShade(direction, true));
+	}
+	
+	/**
+	 */
+	public byte getSkyLight(Direction direction, int verticalIndex)
+	{
+		if(direction == Direction.UP || direction == Direction.DOWN)
+			return skyLights.get(direction)[0];
+		else
+			return skyLights.get(direction)[verticalIndex];
+	}
+	
+	/**
+	 */
+	public int getBlockLight()
+	{
+		return blockLight;
+	}
+	/** clears this box, resetting everything to default values */
+	public void reset()
+	{
+		Arrays.fill(boxWidth, 0);
+		Arrays.fill(boxOffset, 0);
+		Arrays.fill(colorMap, 0);
+		blockLight = 0;
+		for (Direction direction : ADJ_DIRECTIONS)
+		{
+			for (int i = 0; i < adjHeight.get(direction).length; i++)
+			{
+				adjHeight.get(direction)[i] = VOID_FACE;
+				adjDepth.get(direction)[i] = VOID_FACE;
+				skyLights.get(direction)[i] = 0;
+			}
+		}
+	}
+	
+	/** determine which faces should be culled */
+	public void setUpCulling(int cullingDistance, BlockPos playerPos)
+	{
+		for (Direction direction : DIRECTIONS)
+		{
+			if (direction == Direction.DOWN || direction == Direction.WEST || direction == Direction.NORTH)
+				culling[DIRECTION_INDEX.get(direction)] = playerPos.get(direction.getAxis()) > getFacePos(direction) + cullingDistance;
+			
+			else if (direction == Direction.UP || direction == Direction.EAST || direction == Direction.SOUTH)
+				culling[DIRECTION_INDEX.get(direction)] = playerPos.get(direction.getAxis()) < getFacePos(direction) - cullingDistance;
+			
+			culling[DIRECTION_INDEX.get(direction)] = false;
+		}
+	}
+	
+	/**
+	 * @param direction direction that we want to check if it's culled
+	 * @return true if and only if the face of the direction is culled
+	 */
+	public boolean isCulled(Direction direction)
+	{
+		return culling[DIRECTION_INDEX.get(direction)];
+	}
+	
+	
+	/**
+	 * This method create all the shared face culling based on the adjacent data
+	 * @param adjData data adjacent to the column we are going to render
+	 */
+	public void setAdjData(Map<Direction, long[]> adjData)
+	{
+		int height;
+		int depth;
+		int minY = getMinY();
+		int maxY = getMaxY();
+		long singleAdjDataPoint;
+		
+		/* TODO implement attached vertical face culling
+		//Up direction case
+		if(DataPointUtil.doesItExist(adjData.get(Direction.UP)))
+		{
+			height = DataPointUtil.getHeight(singleAdjDataPoint);
+			depth = DataPointUtil.getDepth(singleAdjDataPoint);
+		}*/
+		//Down direction case
+		singleAdjDataPoint = adjData.get(Direction.DOWN)[0];
+		if(DataPointUtil.doesItExist(singleAdjDataPoint))
+			skyLights.get(Direction.DOWN)[0] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+		else
+			skyLights.get(Direction.DOWN)[0] = skyLights.get(Direction.UP)[0];
+		//other sided
+		//TODO clean some similar cases
+		for (Direction direction : ADJ_DIRECTIONS)
+		{
+			if (isCulled(direction))
+				continue;
+			
+			long[] dataPoint = adjData.get(direction);
+			if (dataPoint == null || DataPointUtil.isVoid(dataPoint[0]))
+			{
+				adjHeight.get(direction)[0] = maxY;
+				adjDepth.get(direction)[0] = minY;
+				adjHeight.get(direction)[1] = VOID_FACE;
+				adjDepth.get(direction)[1] = VOID_FACE;
+				skyLights.get(direction)[0] = 15; //in void set full sky light
+				continue;
+			}
+			
+			int i;
+			int faceToDraw = 0;
+			boolean firstFace = true;
+			boolean toFinish = false;
+			int toFinishIndex = 0;
+			boolean allAbove = true;
+			for (i = 0; i < dataPoint.length; i++)
+			{
+				singleAdjDataPoint = dataPoint[i];
+				
+				if (DataPointUtil.isVoid(singleAdjDataPoint) || !DataPointUtil.doesItExist(singleAdjDataPoint))
+					break;
+				
+				height = DataPointUtil.getHeight(singleAdjDataPoint);
+				depth = DataPointUtil.getDepth(singleAdjDataPoint);
+				
+				if (depth <= maxY)
+				{
+					allAbove = false;
+					if (height < minY)
+					{
+						// the adj data is lower than the current data
+						
+						if (firstFace)
+						{
+							adjHeight.get(direction)[0] = getMaxY();
+							adjDepth.get(direction)[0] = getMinY();
+							skyLights.get(direction)[0] = skyLights.get(Direction.UP)[0];
+						}
+						else
+						{
+							adjDepth.get(direction)[faceToDraw] = getMinY();
+							skyLights.get(direction)[faceToDraw] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+						}
+						faceToDraw++;
+						toFinish = false;
+						
+						// break since all the other data will be lower
+						break;
+					}
+					else if (depth <= minY && height >= maxY)
+					{
+						// the adj data is inside the current data
+						// don't draw the face
+						adjHeight.get(direction)[0] = VOID_FACE;
+						adjDepth.get(direction)[0] = VOID_FACE;
+						break;
+					}
+					else if (depth <= minY)//&& height < maxY
+					{
+						// the adj data intersects the lower part of the current data
+						// if this is the only face, use the maxY and break,
+						// if there was another face we finish the last one and break
+						if (firstFace)
+						{
+							adjHeight.get(direction)[0] = getMaxY();
+							adjDepth.get(direction)[0] = height;
+							skyLights.get(direction)[0] = skyLights.get(Direction.UP)[0];
+						}
+						else
+						{
+							adjDepth.get(direction)[faceToDraw] = height;
+							skyLights.get(direction)[faceToDraw] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+						}
+						toFinish = false;
+						faceToDraw++;
+						break;
+					}
+					else if (height >= maxY)//depth > minY &&
+					{
+						// the adj data intersects the higher part of the current data
+						// we start the creation of a new face
+						adjHeight.get(direction)[faceToDraw] = depth;
+						//skyLights.get(direction)[faceToDraw] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+						firstFace = false;
+						toFinish = true;
+						toFinishIndex = i + 1;
+					}
+					else
+					{
+						// if (depth > minY && height < maxY)
+						
+						// the adj data is contained in the current data
+						if (firstFace)
+						{
+							adjHeight.get(direction)[0] = getMaxY();
+						}
+						
+						adjDepth.get(direction)[faceToDraw] = height;
+						skyLights.get(direction)[faceToDraw] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+						faceToDraw++;
+						adjHeight.get(direction)[faceToDraw] = depth;
+						firstFace = false;
+						toFinish = true;
+						toFinishIndex = i + 1;
+					}
+				}
+			}
+			
+			if (allAbove)
+			{
+				adjHeight.get(direction)[0] = getMaxY();
+				adjDepth.get(direction)[0] = getMinY();
+				skyLights.get(direction)[0] = skyLights.get(Direction.UP)[0];
+				faceToDraw++;
+			}
+			else if (toFinish)
+			{
+				adjDepth.get(direction)[faceToDraw] = minY;
+				if(toFinishIndex < dataPoint.length)
+				{
+					singleAdjDataPoint = dataPoint[toFinishIndex];
+					if (DataPointUtil.doesItExist(singleAdjDataPoint))
+						skyLights.get(direction)[faceToDraw] = (byte) DataPointUtil.getLightSkyAlt(singleAdjDataPoint);
+					else
+						skyLights.get(direction)[faceToDraw] = skyLights.get(Direction.UP)[0];
+				}
+				faceToDraw++;
+			}
+			
+			adjHeight.get(direction)[faceToDraw] = VOID_FACE;
+			adjDepth.get(direction)[faceToDraw] = VOID_FACE;
+		}
+	}
+	
+	/** We use this method to set the various width of the column */
+	public void setWidth(int xWidth, int yWidth, int zWidth)
+	{
+		boxWidth[X] = xWidth;
+		boxWidth[Y] = yWidth;
+		boxWidth[Z] = zWidth;
+	}
+	
+	/** We use this method to set the various offset of the column */
+	public void setOffset(int xOffset, int yOffset, int zOffset)
+	{
+		boxOffset[X] = xOffset;
+		boxOffset[Y] = yOffset;
+		boxOffset[Z] = zOffset;
+	}
+	
+	/**
+	 * This method return the position of a face in the axis of the face
+	 * This is useful for the face culling
+	 * @param direction that we want to check
+	 * @return position in the axis of the face
+	 */
+	public int getFacePos(Direction direction)
+	{
+		return boxOffset[FACE_DIRECTION.get(direction)[0]] + boxWidth[FACE_DIRECTION.get(direction)[0]] * FACE_DIRECTION.get(direction)[1];
+	}
+	
+	/**
+	 * returns true if the given direction should be rendered.
+	 */
+	public boolean shouldRenderFace(Direction direction, int adjIndex)
+	{
+		if (direction == Direction.UP || direction == Direction.DOWN)
+			return adjIndex == 0;
+		return !(adjHeight.get(direction)[adjIndex] == VOID_FACE && adjDepth.get(direction)[adjIndex] == VOID_FACE);
+	}
+	
+	
+	/**
+	 * @param direction direction of the face we want to render
+	 * @param vertexIndex index of the vertex of the face (0-1-2-3)
+	 * @return position x of the relative vertex
+	 */
+	public int getX(Direction direction, int vertexIndex)
+	{
+		return boxOffset[X] + boxWidth[X] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][X];
+	}
+	
+	/**
+	 * @param direction direction of the face we want to render
+	 * @param vertexIndex index of the vertex of the face (0-1-2-3)
+	 * @return position y of the relative vertex
+	 */
+	public int getY(Direction direction, int vertexIndex)
+	{
+		return boxOffset[Y] + boxWidth[Y] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y];
+	}
+	
+	/**
+	 * @param direction direction of the face we want to render
+	 * @param vertexIndex index of the vertex of the face (0-1-2-3)
+	 * @param adjIndex, index of the n-th culled face of this direction
+	 * @return position x of the relative vertex
+	 */
+	public int getY(Direction direction, int vertexIndex, int adjIndex)
+	{
+		if (direction == Direction.DOWN || direction == Direction.UP)
+			return boxOffset[Y] + boxWidth[Y] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y];
+		else
+		{
+			// this could probably be cleaned up more,
+			// but it still works
+			if (1 - DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y] == ADJACENT_HEIGHT_INDEX)
+				return adjHeight.get(direction)[adjIndex];
+			else
+				return adjDepth.get(direction)[adjIndex];
+		}
+	}
+	
+	/**
+	 * @param direction direction of the face we want to render
+	 * @param vertexIndex index of the vertex of the face (0-1-2-3)
+	 * @return position z of the relative vertex
+	 */
+	public int getZ(Direction direction, int vertexIndex)
+	{
+		return boxOffset[Z] + boxWidth[Z] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Z];
+	}
+	
+	public int getMinX()
+	{
+		return boxOffset[X];
+	}
+	
+	public int getMaxX()
+	{
+		return boxOffset[X] + boxWidth[X];
+	}
+	
+	public int getMinY()
+	{
+		return boxOffset[Y];
+	}
+	
+	public int getMaxY()
+	{
+		return boxOffset[Y] + boxWidth[Y];
+	}
+	
+	public int getMinZ()
+	{
+		return boxOffset[Z];
+	}
+	
+	public int getMaxZ()
+	{
+		return boxOffset[Z] + boxWidth[Z];
+	}
+	
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,13 +16,16 @@
 *    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.builders.lodTemplates;
+
+package com.seibel.lod.builders.bufferBuilding.lodTemplates;

 import java.util.Map;

 import com.seibel.lod.enums.DebugMode;
+import com.seibel.lod.util.ColorUtil;
 import com.seibel.lod.util.DataPointUtil;
 import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;

 import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.client.renderer.texture.NativeImage;
@@ -30,100 +34,110 @@ import net.minecraft.util.math.BlockPos;

 /**
 * Builds LODs as rectangular prisms.
- *
 * @author James Seibel
- * @version 8-10-2021
+ * @version 10-10-2021
 */
 public class CubicLodTemplate extends AbstractLodTemplate
 {
 	
 	public CubicLodTemplate()
 	{
-		
+	
 	}
 	
 	@Override
 	public void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map<Direction, long[]> adjData,
-			byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap)
+			byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled)
 	{
-		int width = 1 << detailLevel;
+		if (box == null)
+			return;
 		
-		int color = DataPointUtil.getLightColor(data, lightMap);
+		// equivalent to 2^detailLevel
+		int blockWidth = 1 << detailLevel;
+		
+		int color;
 		if (debugging != DebugMode.OFF)
-		{
 			color = LodUtil.DEBUG_DETAIL_LEVEL_COLORS[detailLevel].getRGB();
-		}
+		else
+			color = DataPointUtil.getColor(data);
+		
 		
 		generateBoundingBox(
 				box,
 				DataPointUtil.getHeight(data),
 				DataPointUtil.getDepth(data),
-				width,
-				posX * width,
-				0,
-				posZ * width,
+				blockWidth,
+				posX * blockWidth, 0, posZ * blockWidth, // x, y, z offset
 				bufferCenterBlockPos,
 				adjData,
-				color);
-		
-		if (box != null)
-		{
-			addBoundingBoxToBuffer(buffer, box);
-		}
+				color,
+				DataPointUtil.getLightSkyAlt(data),
+				DataPointUtil.getLightBlock(data),
+				adjShadeDisabled);
 		
+		addBoundingBoxToBuffer(buffer, box);
 	}
 	
-	private void generateBoundingBox(Box box, int height, int depth, int width, double xOffset, double yOffset, double zOffset, BlockPos bufferCenterBlockPos, Map<Direction, long[]> adjData, int color)
+	private void generateBoundingBox(Box box,
+			int height, int depth, int width,
+			double xOffset, double yOffset, double zOffset,
+			BlockPos bufferCenterBlockPos,
+			Map<Direction, long[]> adjData,
+			int color,
+			int skyLight,
+			int blockLight,
+			boolean[] adjShadeDisabled)
 	{
 		// don't add an LOD if it is empty
 		if (height == -1 && depth == -1)
 			return;
 		
 		if (depth == height)
-		{
 			// if the top and bottom points are at the same height
 			// render this LOD as 1 block thick
 			height++;
-		}
 		
-		// offset the AABB by it's x/z position in the world since
+		// offset the AABB by its x/z position in the world since
 		// it uses doubles to specify its location, unlike the model view matrix
 		// which only uses floats
 		double x = -bufferCenterBlockPos.getX();
 		double z = -bufferCenterBlockPos.getZ();
 		box.reset();
-		box.setColor(color);
-		box.set(width, height - depth, width);
-		box.move((int) (xOffset + x), (int) (depth + yOffset), (int) (zOffset + z));
+		box.setColor(color, adjShadeDisabled);
+		box.setLights(skyLight, blockLight);
+		box.setWidth(width, height - depth, width);
+		box.setOffset((int) (xOffset + x), (int) (depth + yOffset), (int) (zOffset + z));
 		box.setUpCulling(32, bufferCenterBlockPos);
 		box.setAdjData(adjData);
 	}
 	
 	private void addBoundingBoxToBuffer(BufferBuilder buffer, Box box)
 	{
+		int color;
+		int skyLight;
+		int blockLight;
 		for (Direction direction : Box.DIRECTIONS)
 		{
-			int adjIndex = 0;
-			while (box.shouldRenderFace(direction, adjIndex))
+			if(box.isCulled(direction))
+				continue;
+			int verticalFaceIndex = 0;
+			while (box.shouldRenderFace(direction, verticalFaceIndex))
 			{
 				for (int vertexIndex = 0; vertexIndex < 4; vertexIndex++)
 				{
+					color = box.getColor(direction);
+					skyLight = box.getSkyLight(direction, verticalFaceIndex);
+					blockLight = box.getBlockLight();
+					color = ColorUtil.applyLightValue(color, skyLight, blockLight, MinecraftWrapper.INSTANCE.getCurrentLightMap());
 					addPosAndColor(buffer,
 							box.getX(direction, vertexIndex),
-							box.getY(direction, vertexIndex, adjIndex),
+							box.getY(direction, vertexIndex, verticalFaceIndex),
 							box.getZ(direction, vertexIndex),
-							box.getColor(direction));
+							color);
 				}
-				adjIndex++;
+				verticalFaceIndex++;
 			}
 		}
 	}
 	
-	@Override
-	public int getBufferMemoryForSingleNode(int maxVerticalData)
-	{
-		// TODO, someone please comment what these magic numbers mean
-		return 2 * 4 * (3 + 4) + 4 * 4 * Math.max((maxVerticalData+1)/2,1) * (3 + 4);
-	}
-	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,7 +16,8 @@
 *    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.builders.lodTemplates;
+
+package com.seibel.lod.builders.bufferBuilding.lodTemplates;

 import java.util.Map;

@@ -32,7 +34,6 @@ import net.minecraft.util.math.BlockPos;
 * Chunks smoothly transition between
 * each other, unless a neighboring chunk
 * is at a significantly different height.
- *
 * @author James Seibel
 * @version 06-16-2021
 */
@@ -40,14 +41,9 @@ public class DynamicLodTemplate extends AbstractLodTemplate
 {
 	@Override
 	public void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map<Direction, long[]> adjData,
-	                           byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap)
+			byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled)
 	{
 		ClientProxy.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!");
 	}
-
-	@Override
-	public int getBufferMemoryForSingleNode(int maxVerticalData)
-	{
-		return 0;
-	}
+	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,7 +16,8 @@
 *    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.builders.lodTemplates;
+
+package com.seibel.lod.builders.bufferBuilding.lodTemplates;

 import java.util.Map;

@@ -30,7 +32,6 @@ import net.minecraft.util.math.BlockPos;
 /**
 * TODO #21 TriangularLodTemplate
 * Builds each LOD chunk as a singular rectangular prism.
- *
 * @author James Seibel
 * @version 06-16-2021
 */
@@ -38,14 +39,9 @@ public class TriangularLodTemplate extends AbstractLodTemplate
 {
 	@Override
 	public void addLodToBuffer(BufferBuilder buffer, BlockPos bufferCenterBlockPos, long data, Map<Direction, long[]> adjData,
-	                           byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap)
+			byte detailLevel, int posX, int posZ, Box box, DebugMode debugging, NativeImage lightMap, boolean[] adjShadeDisabled)
 	{
 		ClientProxy.LOGGER.error(DynamicLodTemplate.class.getSimpleName() + " is not implemented!");
 	}
-
-	@Override
-	public int getBufferMemoryForSingleNode(int maxVerticalData)
-	{
-		return 0;
-	}
+	
 }
@@ -0,0 +1,944 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.builders.lodBuilding;
+
+import java.awt.Color;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import com.seibel.lod.config.LodConfig;
+import com.seibel.lod.enums.DistanceGenerationMode;
+import com.seibel.lod.enums.HorizontalResolution;
+import com.seibel.lod.enums.VerticalQuality;
+import com.seibel.lod.objects.LodDimension;
+import com.seibel.lod.objects.LodRegion;
+import com.seibel.lod.objects.LodWorld;
+import com.seibel.lod.util.ColorUtil;
+import com.seibel.lod.util.DataPointUtil;
+import com.seibel.lod.util.DetailDistanceUtil;
+import com.seibel.lod.util.LevelPosUtil;
+import com.seibel.lod.util.LodThreadFactory;
+import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.util.ThreadMapUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;
+
+import net.minecraft.block.AbstractPlantBlock;
+import net.minecraft.block.AbstractTopPlantBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.BushBlock;
+import net.minecraft.block.FlowerBlock;
+import net.minecraft.block.GrassBlock;
+import net.minecraft.block.IGrowable;
+import net.minecraft.block.ILiquidContainer;
+import net.minecraft.block.IWaterLoggable;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.SixWayBlock;
+import net.minecraft.block.TallGrassBlock;
+import net.minecraft.block.material.MaterialColor;
+import net.minecraft.client.renderer.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.state.properties.BlockStateProperties;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.DimensionType;
+import net.minecraft.world.IWorld;
+import net.minecraft.world.LightType;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome;
+import net.minecraft.world.biome.BiomeColors;
+import net.minecraft.world.chunk.ChunkSection;
+import net.minecraft.world.chunk.IChunk;
+import net.minecraft.world.server.ServerWorld;
+import net.minecraftforge.client.model.data.ModelDataMap;
+
+/**
+ * This object is in charge of creating Lod related objects.
+ * 
+ * @author Cola
+ * @author Leonardo Amato
+ * @author James Seibel
+ * @version 10-22-2021
+ */
+public class LodBuilder
+{
+	private static final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	
+	private final ExecutorService lodGenThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName()));
+	
+	public static final Direction[] directions = new Direction[] { Direction.UP, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, Direction.DOWN };
+	public static final int CHUNK_DATA_WIDTH = LodUtil.CHUNK_WIDTH;
+	public static final int CHUNK_SECTION_HEIGHT = CHUNK_DATA_WIDTH;
+	public static final ConcurrentMap<Block, Integer> colorMap = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<Block, Integer> tintColor = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<Block, Boolean> toTint = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<Block, VoxelShape> shapeMap = new ConcurrentHashMap<>();
+	
+	public static final ConcurrentMap<Block, Boolean> notFullBlock = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<Block, Boolean> smallBlock = new ConcurrentHashMap<>();
+	
+	
+	public static final ModelDataMap dataMap = new ModelDataMap.Builder().build();
+	
+	/** If no blocks are found in the area in determineBottomPointForArea return this */
+	public static final short DEFAULT_DEPTH = 0;
+	/** If no blocks are found in the area in determineHeightPointForArea return this */
+	public static final short DEFAULT_HEIGHT = 0;
+	/** Minecraft's max light value */
+	public static final short DEFAULT_MAX_LIGHT = 15;
+	
+	
+	/**
+	 * How wide LodDimensions should be in regions <br>
+	 * Is automatically set before the first frame in ClientProxy.
+	 */
+	public int defaultDimensionWidthInRegions = 0;
+	
+	//public static final boolean useExperimentalLighting = true;
+	
+	
+	
+	
+	public LodBuilder()
+	{
+	
+	}
+	
+	public void generateLodNodeAsync(IChunk chunk, LodWorld lodWorld, IWorld world)
+	{
+		generateLodNodeAsync(chunk, lodWorld, world, DistanceGenerationMode.SERVER);
+	}
+	
+	public void generateLodNodeAsync(IChunk chunk, LodWorld lodWorld, IWorld world, DistanceGenerationMode generationMode)
+	{
+		if (lodWorld == null || lodWorld.getIsWorldNotLoaded())
+			return;
+		
+		// don't try to create an LOD object
+		// if for some reason we aren't
+		// given a valid chunk object
+		if (chunk == null)
+			return;
+		
+		Thread thread = new Thread(() ->
+		{
+			try
+			{
+				// we need a loaded client world in order to
+				// get the textures for blocks
+				if (mc.getClientWorld() == null)
+					return;
+				
+				// don't try to generate LODs if the user isn't in the world anymore
+				// (this happens a lot when the user leaves a world/server)
+				if (mc.getSinglePlayerServer() == null && mc.getCurrentServer() == null)
+					return;
+				
+				DimensionType dim = world.dimensionType();
+				
+				// make sure the dimension exists
+				LodDimension lodDim;
+				if (lodWorld.getLodDimension(dim) == null)
+				{
+					lodDim = new LodDimension(dim, lodWorld, defaultDimensionWidthInRegions);
+					lodWorld.addLodDimension(lodDim);
+				}
+				else
+				{
+					lodDim = lodWorld.getLodDimension(dim);
+				}
+				generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(generationMode));
+			}
+			catch (IllegalArgumentException | NullPointerException e)
+			{
+				e.printStackTrace();
+				// if the world changes while LODs are being generated
+				// they will throw errors as they try to access things that no longer
+				// exist.
+			}
+		});
+		lodGenThreadPool.execute(thread);
+	}
+	
+	/**
+	 * Creates a LodNode for a chunk in the given world.
+	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
+	 */
+	public void generateLodNodeFromChunk(LodDimension lodDim, IChunk chunk) throws IllegalArgumentException
+	{
+		generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig());
+	}
+	
+	/**
+	 * Creates a LodNode for a chunk in the given world.
+	 * @throws IllegalArgumentException thrown if either the chunk or world is null.
+	 */
+	public void generateLodNodeFromChunk(LodDimension lodDim, IChunk chunk, LodBuilderConfig config)
+			throws IllegalArgumentException
+	{
+		if (chunk == null)
+			throw new IllegalArgumentException("generateLodFromChunk given a null chunk");
+		
+		int startX;
+		int startZ;
+		int endX;
+		int endZ;
+		
+		
+		LodRegion region = lodDim.getRegion(chunk.getPos().getRegionX(), chunk.getPos().getRegionZ());
+		if (region == null)
+			return;
+		
+		// determine how many LODs to generate horizontally
+		HorizontalResolution detail;
+		byte minDetailLevel = region.getMinDetailLevel();
+		detail = DetailDistanceUtil.getLodGenDetail(minDetailLevel);
+		
+		
+		// determine how many LODs to generate vertically
+		VerticalQuality verticalQuality = LodConfig.CLIENT.graphics.qualityOption.verticalQuality.get();
+		byte detailLevel = detail.detailLevel;
+		
+		
+		// generate the LODs
+		int posX;
+		int posZ;
+		for (int i = 0; i < detail.dataPointLengthCount * detail.dataPointLengthCount; i++)
+		{
+			startX = detail.startX[i];
+			startZ = detail.startZ[i];
+			endX = detail.endX[i];
+			endZ = detail.endZ[i];
+			
+			posX = LevelPosUtil.convert((byte) 0, chunk.getPos().x * 16 + startX, detail.detailLevel);
+			posZ = LevelPosUtil.convert((byte) 0, chunk.getPos().z * 16 + startZ, detail.detailLevel);
+			
+			
+			long[] data;
+			long[] dataToMergeVertical = createVerticalDataToMerge(detail, chunk, config, startX, startZ, endX, endZ);
+			data = DataPointUtil.mergeMultiData(dataToMergeVertical, DataPointUtil.worldHeight, DetailDistanceUtil.getMaxVerticalData(detailLevel));
+			
+			
+			//lodDim.clear(detailLevel, posX, posZ);
+			if (data != null && data.length != 0)
+				lodDim.addVerticalData(detailLevel,	posX, posZ,	data,false);
+		}
+		lodDim.updateData(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, chunk.getPos().z);
+	}
+	
+	/** creates a vertical DataPoint */
+	private long[] createVerticalDataToMerge(HorizontalResolution detail, IChunk chunk, LodBuilderConfig config, int startX, int startZ, int endX, int endZ)
+	{
+		// equivalent to 2^detailLevel
+		int size = 1 << detail.detailLevel;
+		
+		long[] dataToMerge = ThreadMapUtil.getBuilderVerticalArray(detail.detailLevel);
+		
+		int verticalData = DataPointUtil.worldHeight;
+		
+		ChunkPos chunkPos = chunk.getPos();
+		int height;
+		int depth;
+		int color;
+		int light;
+		int lightSky;
+		int lightBlock;
+		int generation = config.distanceGenerationMode.complexity;
+		
+		int xRel;
+		int zRel;
+		int xAbs;
+		int yAbs;
+		int zAbs;
+		boolean hasCeiling = mc.getClientWorld().dimensionType().hasCeiling();
+		boolean hasSkyLight = mc.getClientWorld().dimensionType().hasSkyLight();
+		boolean isDefault;
+		BlockPos.Mutable blockPos = new BlockPos.Mutable(0, 0, 0);
+		int index;
+		
+		for (index = 0; index < size * size; index++)
+		{
+			xRel = Math.floorMod(index, size) + startX;
+			zRel = Math.floorDiv(index, size) + startZ;
+			xAbs = chunkPos.getMinBlockX() + xRel;
+			zAbs = chunkPos.getMinBlockZ() + zRel;
+			
+			//Calculate the height of the lod
+			yAbs = DataPointUtil.worldHeight + 2;
+			int count = 0;
+			boolean topBlock = true;
+			while (yAbs > 0)
+			{
+				height = determineHeightPointFrom(chunk, config, xRel, zRel, yAbs, blockPos);
+				
+				// If the lod is at the default height, it must be void data
+				if (height == DEFAULT_HEIGHT)
+				{
+					if (topBlock)
+						dataToMerge[index * verticalData] = DataPointUtil.createVoidDataPoint(generation);
+					break;
+				}
+				
+				yAbs = height - 1;
+				// We search light on above air block
+				depth = determineBottomPointFrom(chunk, config, xRel, zRel, yAbs, blockPos);
+				if (hasCeiling && topBlock)
+				{
+					yAbs = depth;
+					blockPos.set(xAbs, yAbs, zAbs);
+					light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, topBlock);
+					color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
+					blockPos.set(xAbs, yAbs - 1, zAbs);
+				}
+				else
+				{
+					blockPos.set(xAbs, yAbs, zAbs);
+					light = getLightValue(chunk, blockPos, hasCeiling, hasSkyLight, topBlock);
+					color = generateLodColor(chunk, config, xRel, yAbs, zRel, blockPos);
+					blockPos.set(xAbs, yAbs + 1, zAbs);
+				}
+				lightBlock = light & 0b1111;
+				lightSky = (light >> 4) & 0b1111;
+				isDefault = ((light >> 8)) == 1;
+				
+				dataToMerge[index * verticalData + count] = DataPointUtil.createDataPoint(height, depth, color, lightSky, lightBlock, generation, isDefault);
+				topBlock = false;
+				yAbs = depth - 1;
+				count++;
+			}
+		}
+		return dataToMerge;
+	}
+	
+	/**
+	 * Find the lowest valid point from the bottom.
+	 * Used when creating a vertical LOD.
+	 */
+	private short determineBottomPointFrom(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, int yAbs, BlockPos.Mutable blockPos)
+	{
+		short depth = DEFAULT_DEPTH;
+		/*if (config.useHeightmap)
+		{
+			// when using the generated heightmap there is no data about the lowest point
+			depth = 0; //DEFAULT_DEPTH == 0
+		}
+		else
+		{*/
+		boolean voidData = true;
+		ChunkSection[] chunkSections = chunk.getSections();
+		for (int sectionIndex = chunkSections.length - 1; sectionIndex >= 0; sectionIndex--)
+		{
+			for (int yRel = CHUNK_DATA_WIDTH - 1; yRel >= 0; yRel--)
+			{
+				if (sectionIndex * CHUNK_DATA_WIDTH + yRel > yAbs)
+					continue;
+				
+				blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
+				if (!isLayerValidLodPoint(chunk, blockPos))
+				{
+					depth = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel + 1);
+					voidData = false;
+					break;
+				}
+			}
+			
+			if (!voidData)
+				break;
+		}
+		//}
+		return depth;
+	}
+	
+	/** Find the highest valid point from the Top */
+	private short determineHeightPointFrom(IChunk chunk, LodBuilderConfig config, int xRel, int zRel, int yAbs, BlockPos.Mutable blockPos)
+	{
+		short height = DEFAULT_HEIGHT;
+		if (config.useHeightmap)
+			height = (short) chunk.getOrCreateHeightmapUnprimed(LodUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
+		else
+		{
+			boolean voidData = true;
+			ChunkSection[] chunkSections = chunk.getSections();
+			for (int sectionIndex = chunkSections.length - 1; sectionIndex >= 0; sectionIndex--)
+			{
+				for (int yRel = CHUNK_DATA_WIDTH - 1; yRel >= 0; yRel--)
+				{
+					if (sectionIndex * CHUNK_DATA_WIDTH + yRel > yAbs)
+						continue;
+					blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
+					if (isLayerValidLodPoint(chunk, blockPos))
+					{
+						height = (short) (sectionIndex * CHUNK_DATA_WIDTH + yRel + 1);
+						voidData = false;
+						break;
+					}
+				}
+				if (!voidData)
+					break;
+			}
+		}
+		return height;
+	}
+	
+	
+	
+	// =====================//
+	// constructor helpers //
+	// =====================//
+	
+	/**
+	 * Generate the color for the given chunk using biome water color, foliage
+	 * color, and grass color.
+	 */
+	private int generateLodColor(IChunk chunk, LodBuilderConfig config, int xRel, int yAbs, int zRel, BlockPos.Mutable blockPos)
+	{
+		ChunkSection[] chunkSections = chunk.getSections();
+		int colorInt = 0;
+		if (config.useBiomeColors)
+		{
+			// I have no idea why I need to bit shift to the right, but
+			// if I don't the biomes don't show up correctly.
+			Biome biome = chunk.getBiomes().getNoiseBiome(xRel >> 2, yAbs >> 2, zRel >> 2);
+			colorInt = getColorForBiome(xRel, zRel, biome);
+		}
+		else
+		{
+			int sectionIndex = Math.floorDiv(yAbs, CHUNK_SECTION_HEIGHT);
+			int yRel = Math.floorMod(yAbs, CHUNK_SECTION_HEIGHT);
+			if (chunkSections[sectionIndex] != null)
+			{
+				blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel, chunk.getPos().getMinBlockZ() + zRel);
+				colorInt = getColorForBlock(chunk, blockPos);
+			}
+			
+			// if we are skipping non-full and non-solid blocks that means we ignore
+			// snow, flowers, etc. Get the above block so we can still get the color
+			// of the snow, flower, etc. that may be above this block
+			int aboveColorInt = 0;
+			if (LodConfig.CLIENT.worldGenerator.blockToAvoid.get().nonFull || LodConfig.CLIENT.worldGenerator.blockToAvoid.get().noCollision)
+			{
+				blockPos.set(chunk.getPos().getMinBlockX() + xRel, sectionIndex * CHUNK_DATA_WIDTH + yRel + 1, chunk.getPos().getMinBlockZ() + zRel);
+				aboveColorInt = getColorForBlock(chunk, blockPos);
+			}
+			
+			if (colorInt == 0 && yAbs > 0)
+				// if this block is invisible, check the block below it
+				colorInt = generateLodColor(chunk, config, xRel, yAbs - 1, zRel, blockPos);
+			
+			// override this block's color if there was a block above this
+			// and we were avoiding non-full/non-solid blocks
+			if (aboveColorInt != 0)
+				colorInt = aboveColorInt;
+		}
+		
+		return colorInt;
+	}
+	
+	/** Gets the light value for the given block position */
+	private int getLightValue(IChunk chunk, BlockPos.Mutable blockPos, boolean hasCeiling, boolean hasSkyLight, boolean topBlock)
+	{
+		int skyLight = 0;
+		int blockLight;
+		// 1 means the lighting is a guess
+		int isDefault = 0;
+		
+		
+		ClientWorld clientWorld = mc.getClientWorld();
+		if (clientWorld == null)
+			return 0;
+		ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(clientWorld.dimensionType());
+		
+		
+		int blockBrightness = chunk.getLightEmission(blockPos);
+		// get the air block above or below this block
+		if (hasCeiling && topBlock)
+			blockPos.set(blockPos.getX(), blockPos.getY() - 1, blockPos.getZ());
+		else
+			blockPos.set(blockPos.getX(), blockPos.getY() + 1, blockPos.getZ());
+		
+		
+		
+		if (serverWorld != null)
+		{
+			// server world sky light (always accurate)
+			blockLight = serverWorld.getBrightness(LightType.BLOCK, blockPos);
+			if(topBlock && !hasCeiling && hasSkyLight)
+				skyLight = DEFAULT_MAX_LIGHT;
+			else
+				skyLight = serverWorld.getBrightness(LightType.SKY, blockPos);
+			
+			if (!topBlock && skyLight == 15)
+			{
+				// we are on predicted terrain, and we don't know what the light here is,
+				// lets just take a guess
+				if (blockPos.getY() >= mc.getClientWorld().getSeaLevel() - 5)
+				{
+					skyLight = 12;
+					isDefault = 1;
+				}
+				else
+					skyLight = 0;
+			}
+		}
+		else
+		{
+			// client world sky light (almost never accurate)
+			blockLight = clientWorld.getBrightness(LightType.BLOCK, blockPos);
+			// estimate what the lighting should be
+			if (hasSkyLight || !hasCeiling)
+			{
+				if (topBlock)
+					skyLight = DEFAULT_MAX_LIGHT;
+				else
+				{
+					skyLight = clientWorld.getBrightness(LightType.SKY, blockPos);
+					if (!chunk.isLightCorrect() && (skyLight == 0 || skyLight == 15))
+					{
+						// we don't know what the light here is,
+						// lets just take a guess
+						if (blockPos.getY() >= mc.getClientWorld().getSeaLevel() - 5)
+						{
+							skyLight = 12;
+							isDefault = 1;
+						}
+						else
+							skyLight = 0;
+					}
+				}
+			}
+		}
+		
+		blockLight = LodUtil.clamp(0, Math.max(blockLight, blockBrightness), DEFAULT_MAX_LIGHT);
+		
+		return blockLight + (skyLight << 4) + (isDefault << 8);
+	}
+	
+	
+	/**
+	 * Generate the color of the given block from its texture
+	 * and store it for later use.
+	 */
+	private int getColorTextureForBlock(BlockState blockState, BlockPos blockPos, boolean useTopTexture)
+	{
+		// use the pre-generated color if we can
+		Block block = blockState.getBlock();
+		if (colorMap.containsKey(block) && toTint.containsKey(block))
+			return colorMap.get(block);
+		
+		
+		
+		World world = mc.getClientWorld();
+		TextureAtlasSprite texture;
+		List<BakedQuad> quads = null;
+		int tintIndex = Integer.MIN_VALUE;
+		boolean isTinted = false;
+		int listSize = 0;
+		// get the first quad we can for this block
+		for (Direction direction : directions)
+		{
+			quads = mc.getModelManager().getBlockModelShaper().getBlockModel(blockState).getQuads(blockState, direction, new Random(0), dataMap);
+			listSize = Math.max(listSize, quads.size());
+			for (BakedQuad bakedQuad : quads)
+			{
+				isTinted |= bakedQuad.isTinted();
+				tintIndex = Math.max(tintIndex, bakedQuad.getTintIndex());
+			}
+		}
+		toTint.put(block, isTinted);
+		tintColor.put(block, tintIndex);
+		for (Direction direction : directions)
+		{
+			quads = mc.getModelManager().getBlockModelShaper().getBlockModel(blockState).getQuads(blockState, direction, new Random(0), dataMap);
+			if (!quads.isEmpty())
+				break;
+		}
+		
+		if (useTopTexture && !quads.isEmpty())
+			texture = quads.get(0).getSprite();
+		else
+			texture = mc.getModelManager().getBlockModelShaper().getTexture(blockState, world, blockPos);
+		
+		
+		int count = 0;
+		int alpha = 0;
+		int red = 0;
+		int green = 0;
+		int blue = 0;
+		int numberOfGreyPixel = 0;
+		int color;
+		int colorMultiplier;
+		
+		// generate the block's color
+		for (int frameIndex = 0; frameIndex < texture.getFrameCount(); frameIndex++)
+		{
+			// textures normally use u and v instead of x and y
+			for (int u = 0; u < texture.getHeight(); u++)
+			{
+				for (int v = 0; v < texture.getWidth(); v++)
+				{
+					if (texture.isTransparent(frameIndex, u, v))
+						continue;
+					
+					color = texture.getPixelRGBA(frameIndex, u, v);
+					
+					// determine if this pixel is gray
+					int colorMax = Math.max(Math.max(ColorUtil.getBlue(color), ColorUtil.getGreen(color)), ColorUtil.getRed(color));
+					int colorMin = 4 + Math.min(Math.min(ColorUtil.getBlue(color), ColorUtil.getGreen(color)), ColorUtil.getRed(color));
+					boolean isGray = colorMax < colorMin;
+					if (isGray)
+						numberOfGreyPixel++;
+					
+					
+					// for flowers, weight their non-green color higher
+					if (block instanceof FlowerBlock && (!(ColorUtil.getGreen(color) > (ColorUtil.getBlue(color) + 30)) || !(ColorUtil.getGreen(color) > (ColorUtil.getRed(color) + 30))))
+						colorMultiplier = 5;
+					else
+						colorMultiplier = 1;
+					
+					
+					// add to the running averages
+					count += colorMultiplier;
+					alpha += ColorUtil.getAlpha(color) * colorMultiplier;
+					red += ColorUtil.getBlue(color) * colorMultiplier;
+					green += ColorUtil.getGreen(color) * colorMultiplier;
+					blue += ColorUtil.getRed(color) * colorMultiplier;
+				}
+			}
+		}
+		
+		
+		if (count == 0)
+			// this block is entirely transparent
+			color = 0;
+		else
+		{
+			// determine the average color
+			alpha /= count;
+			red /= count;
+			green /= count;
+			blue /= count;
+			color = ColorUtil.rgbToInt(alpha, red, green, blue);
+		}
+		
+		// determine if this block should use the biome color tint
+		if ((useGrassTint(block) || useLeafTint(block) || useWaterTint(block)) && (float) numberOfGreyPixel / count > 0.75f)
+			toTint.replace(block, true);
+		
+		// add the newly generated block color to the map for later use
+		colorMap.put(block, color);
+		return color;
+	}
+	
+	/** determine if the given block should use the biome's grass color */
+	private boolean useGrassTint(Block block)
+	{
+		return block instanceof GrassBlock
+				|| block instanceof BushBlock
+				|| block instanceof IGrowable
+				|| block instanceof AbstractPlantBlock
+				|| block instanceof AbstractTopPlantBlock
+				|| block instanceof TallGrassBlock;
+	}
+	
+	/** determine if the given block should use the biome's foliage color */
+	private boolean useLeafTint(Block block)
+	{
+		return block instanceof LeavesBlock
+				|| block == Blocks.VINE
+				|| block == Blocks.SUGAR_CANE;
+	}
+	
+	/** determine if the given block should use the biome's water color */
+	private boolean useWaterTint(Block block)
+	{
+		return block == Blocks.WATER;
+	}
+	
+	/** Returns a color int for the given block. */
+	private int getColorForBlock(IChunk chunk, BlockPos blockPos)
+	{
+		
+		
+		int blockColor;
+		int colorInt;
+		
+		int xRel = blockPos.getX() - chunk.getPos().getMinBlockX();
+		int zRel = blockPos.getZ() - chunk.getPos().getMinBlockZ();
+		int x = blockPos.getX();
+		int y = blockPos.getY();
+		int z = blockPos.getZ();
+		
+		//Biome biome = chunk.getBiomes().getNoiseBiome(xRel >> 2, y >> 2, zRel >> 2);
+		BlockState blockState = chunk.getBlockState(blockPos);
+		
+		if(isInWater(blockState))
+			blockState = Blocks.WATER.defaultBlockState();
+		
+		// block special cases
+		// TODO: this needs to be replaced by a config file of some sort
+		if (blockState == Blocks.AIR.defaultBlockState()
+				|| blockState == Blocks.CAVE_AIR.defaultBlockState()
+				|| blockState == Blocks.BARRIER.defaultBlockState())
+		{
+			return 0;
+		}
+		
+		blockColor = getColorTextureForBlock(blockState, blockPos, true);
+		
+		//if the blockColor is 0 we reset it and don't use the faceColor
+		if (blockColor == 0)
+		{
+			tintColor.remove(blockState.getBlock());
+			toTint.remove(blockState.getBlock());
+			colorMap.remove(blockState.getBlock());
+			blockColor = getColorTextureForBlock(blockState, blockPos, false);
+		}
+		
+		//if the blockColor is still 0 we use the default material color
+		if (blockColor == 0)
+		{
+			tintColor.replace(blockState.getBlock(), 0);
+			toTint.replace(blockState.getBlock(), false);
+			colorMap.replace(blockState.getBlock(), blockState.getBlock().defaultMaterialColor().col);
+		}
+		
+		if (toTint.get(blockState.getBlock()))
+		{
+			Biome biome = chunk.getBiomes().getNoiseBiome(xRel >> 2, y >> 2, zRel >> 2);
+			
+			ClientWorld clientWorld = mc.getClientWorld();
+			if (clientWorld == null)
+				return 0;
+			ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(clientWorld.dimensionType());
+			
+			int tintValue;
+			if (useGrassTint(blockState.getBlock()))
+			{
+				// grass and green plants
+				try
+				{
+					tintValue = BiomeColors.getAverageGrassColor(serverWorld, blockPos);
+				}
+				catch(NullPointerException e)
+				{
+					tintValue = biome.getGrassColor(x, z);	
+				}
+			}
+			else if (useWaterTint(blockState.getBlock()))
+			{
+				// water
+				try
+				{
+						tintValue = BiomeColors.getAverageWaterColor(serverWorld, blockPos);
+				}
+				catch(NullPointerException e)
+				{
+					tintValue = biome.getWaterColor();	
+				}
+			}
+			else
+			{
+				// leaves
+				try
+				{
+				tintValue = BiomeColors.getAverageFoliageColor(serverWorld, blockPos);
+				}
+				catch(NullPointerException e)
+				{
+					tintValue = biome.getFoliageColor();	
+				}
+			}
+			colorInt = ColorUtil.multiplyRGBcolors(tintValue | 0xFF000000, blockColor);
+		}
+		else
+			colorInt = blockColor;
+		return colorInt;
+	}
+	
+	/** Returns a color int for the given biome. */
+	private int getColorForBiome(int x, int z, Biome biome)
+	{
+		int colorInt;
+		
+		switch (biome.getBiomeCategory())
+		{
+		
+		case NETHER:
+			colorInt = Blocks.NETHERRACK.defaultBlockState().materialColor.col;
+			break;
+		
+		case THEEND:
+			colorInt = Blocks.END_STONE.defaultBlockState().materialColor.col;
+			break;
+		
+		case BEACH:
+		case DESERT:
+			colorInt = Blocks.SAND.defaultBlockState().materialColor.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:
+			Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+			tmp = tmp.darker();
+			colorInt = LodUtil.colorToInt(tmp);
+			break;
+			
+		}
+		
+		return colorInt;
+	}
+	
+	private boolean isInWater(BlockState blockState)
+	{
+		//This type of block is always in water
+		if((blockState.getBlock() instanceof ILiquidContainer) && !(blockState.getBlock() instanceof IWaterLoggable))
+			return true;
+		
+		//This type of block could be in water
+		if(blockState.getOptionalValue(BlockStateProperties.WATERLOGGED).isPresent() && blockState.getOptionalValue(BlockStateProperties.WATERLOGGED).get())
+			return true;
+		
+		return false;
+	}
+	
+	
+	/** Is the block at the given blockPos a valid LOD point? */
+	private boolean isLayerValidLodPoint(IChunk chunk, BlockPos.Mutable blockPos)
+	{
+		
+		BlockState blockState = chunk.getBlockState(blockPos);
+		
+		if (isInWater(blockState))
+			return true;
+			
+		boolean nonFullAvoidance = LodConfig.CLIENT.worldGenerator.blockToAvoid.get().nonFull;
+		boolean	noCollisionAvoidance = LodConfig.CLIENT.worldGenerator.blockToAvoid.get().noCollision;
+		if (blockState != null)
+		{
+			if (nonFullAvoidance)
+			{
+				if(!blockState.getFluidState().isEmpty() || blockState.getBlock() instanceof SixWayBlock)
+				{
+					notFullBlock.put(blockState.getBlock(), false);
+				}
+				if (!notFullBlock.containsKey(blockState.getBlock()) || notFullBlock.get(blockState.getBlock()) == null)
+				{
+					VoxelShape voxelShape = blockState.getBlock().defaultBlockState().getShape(chunk, blockPos);
+					
+					if (!voxelShape.isEmpty())
+					{
+						AxisAlignedBB bbox = voxelShape.bounds();
+						double xWidth = (bbox.maxX - bbox.minX);
+						double yWidth = (bbox.maxY - bbox.minY);
+						double zWidth = (bbox.maxZ - bbox.minZ);
+						if (xWidth < 1 && zWidth < 1 && yWidth < 1)
+							notFullBlock.put(blockState.getBlock(), true);
+						else
+							notFullBlock.put(blockState.getBlock(), false);
+					}
+					else
+					{
+						notFullBlock.put(blockState.getBlock(), false);
+					}
+				}
+				
+				if (notFullBlock.get(blockState.getBlock()))
+				{
+					return false;
+				}
+			}
+			
+			if (noCollisionAvoidance)
+			{
+				if(!blockState.getFluidState().isEmpty() || blockState.getBlock() instanceof SixWayBlock)
+					smallBlock.put(blockState.getBlock(), false);
+				
+				if (!smallBlock.containsKey(blockState.getBlock()) || smallBlock.get(blockState.getBlock()) == null)
+				{
+					VoxelShape voxelShape = blockState.getCollisionShape(chunk, blockPos);
+					if (!blockState.getFluidState().isEmpty())
+					{
+						smallBlock.put(blockState.getBlock(), false);
+					}
+					else
+					{
+						
+						if (voxelShape.isEmpty())
+						{
+							smallBlock.put(blockState.getBlock(), true);
+						}
+						else
+						{
+							smallBlock.put(blockState.getBlock(), false);
+						}
+					}
+				}
+				
+				if (smallBlock.get(blockState.getBlock()))
+				{
+					return false;
+				}
+			}
+			
+			
+			return blockState.getBlock() != Blocks.AIR
+						   && blockState.getBlock() != Blocks.CAVE_AIR
+						   && blockState.getBlock() != Blocks.BARRIER;
+		}
+		
+		return false;
+	}
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,38 +16,30 @@
 *    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.builders;
+
+package com.seibel.lod.builders.lodBuilding;

 import com.seibel.lod.enums.DistanceGenerationMode;

 /**
 * This is used to easily configure how LodChunks are generated.
 * Generally this will only be used if we want to generate a
- * LodChunk using a incomplete Chunk, otherwise the defaults
+ * LodChunk using an incomplete Chunk, otherwise the defaults
 * work best for a fully generated chunk (IE has correct surface blocks).
- *
 * @author James Seibel
 * @version 8-14-2021
 */
 public class LodBuilderConfig
 {
-	/**
-	 * default false
-	 */
+	/** default: false */
 	public boolean useHeightmap;
-	/**
-	 * default false
-	 */
+	/** default: false */
 	public boolean useBiomeColors;
-	/**
-	 * default true
-	 */
+	/** default: true */
 	public boolean useSolidBlocksInColorGen;
-	/**
-	 * default server
-	 */
+	/** default: server */
 	public DistanceGenerationMode distanceGenerationMode;
-
+	
 	/**
 	 * default settings for a normal chunk <br>
 	 * useHeightmap = false <br>
@@ -61,27 +54,26 @@ public class LodBuilderConfig
 		useSolidBlocksInColorGen = true;
 		distanceGenerationMode = DistanceGenerationMode.SERVER;
 	}
-
+	
 	/**
-	 * @param newUseHeightmap               default = false
-	 * @param newUseBiomeColors             default = false
+	 * @param newUseHeightmap default = false
+	 * @param newUseBiomeColors default = false
 	 * @param newUseSolidBlocksInBiomeColor default = true
-	 * @param newDistanceGenerationMode     default = Server
+	 * @param newDistanceGenerationMode default = Server
 	 */
 	public LodBuilderConfig(boolean newUseHeightmap, boolean newUseBiomeColors,
-	                        boolean newUseSolidBlocksInBiomeColor, DistanceGenerationMode newDistanceGenerationMode)
+			boolean newUseSolidBlocksInBiomeColor, DistanceGenerationMode newDistanceGenerationMode)
 	{
 		useHeightmap = newUseHeightmap;
 		useBiomeColors = newUseBiomeColors;
 		useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor;
 		distanceGenerationMode = newDistanceGenerationMode;
 	}
-
+	
 	/**
-	 * @param newUseHeightmap               default = false
-	 * @param newUseBiomeColors             default = false
+	 * @param newUseHeightmap default = false
+	 * @param newUseBiomeColors default = false
 	 * @param newUseSolidBlocksInBiomeColor default = true
-	 * @param newDistanceGenerationMode     default = Server
 	 */
 	public LodBuilderConfig(boolean newUseHeightmap, boolean newUseBiomeColors, boolean newUseSolidBlocksInBiomeColor)
 	{
@@ -89,20 +81,11 @@ public class LodBuilderConfig
 		useHeightmap = newUseHeightmap;
 		useBiomeColors = newUseBiomeColors;
 		useSolidBlocksInColorGen = newUseSolidBlocksInBiomeColor;
-		if (newUseHeightmap)
-		{
-			distanceGenerationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
-		} else
-		{
-			distanceGenerationMode = DistanceGenerationMode.BIOME_ONLY;
-		}
+		distanceGenerationMode = newUseHeightmap ? DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT : DistanceGenerationMode.BIOME_ONLY;
 	}
-
+	
 	/**
-	 * @param newUseHeightmap               default = false
-	 * @param newUseBiomeColors             default = false
-	 * @param newUseSolidBlocksInBiomeColor default = true
-	 * @param newDistanceGenerationMode     default = Server
+	 * @param newDistanceGenerationMode default = Server
 	 */
 	public LodBuilderConfig(DistanceGenerationMode newDistanceGenerationMode)
 	{
@@ -1,448 +0,0 @@
-package com.seibel.lod.builders.lodTemplates;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.seibel.lod.config.LodConfig;
-import com.seibel.lod.enums.DebugMode;
-import com.seibel.lod.util.ColorUtil;
-import com.seibel.lod.util.DataPointUtil;
-import com.seibel.lod.wrappers.MinecraftWrapper;
-
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-
-
-public class Box
-{
-	
-	public static final int OFFSET = 0;
-	public static final int WIDTH = 1;
-	
-	public static final int X = 0;
-	public static final int Y = 1;
-	public static final int Z = 2;
-	
-	public static final int MIN = 0;
-	public static final int MAX = 1;
-	
-	public static final int VOID_FACE = 0;
-	
-	public static final Direction[] DIRECTIONS = new Direction[]{
-			Direction.UP,
-			Direction.DOWN,
-			Direction.WEST,
-			Direction.EAST,
-			Direction.NORTH,
-			Direction.SOUTH};
-	
-	public static final Direction[] ADJ_DIRECTIONS = new Direction[]{
-			Direction.EAST,
-			Direction.WEST,
-			Direction.SOUTH,
-			Direction.NORTH};
-	
-	@SuppressWarnings("serial")
-	public static final Map<Direction, int[][]> DIRECTION_VERTEX_MAP = new HashMap<Direction, int[][]>()
-	{{
-		put(Direction.UP, new int[][]{
-			{0, 1, 0},
-			{0, 1, 1},
-			{1, 1, 1},
-			{1, 1, 0}});
-		put(Direction.DOWN, new int[][]{
-			{1, 0, 0},
-			{1, 0, 1},
-			{0, 0, 1},
-			{0, 0, 0}});
-		put(Direction.EAST, new int[][]{
-			{1, 1, 0},
-			{1, 1, 1},
-			{1, 0, 1},
-			{1, 0, 0}});
-		put(Direction.WEST, new int[][]{
-			{0, 0, 0},
-			{0, 0, 1},
-			{0, 1, 1},
-			{0, 1, 0}});
-		put(Direction.SOUTH, new int[][]{
-			{1, 0, 1},
-			{1, 1, 1},
-			{0, 1, 1},
-			{0, 0, 1}});
-		put(Direction.NORTH, new int[][]{
-			{0, 0, 0},
-			{0, 1, 0},
-			{1, 1, 0},
-			{1, 0, 0}});
-	}};
-	
-	
-	@SuppressWarnings("serial")
-	public static final Map<Direction, int[]> FACE_DIRECTION = new HashMap<Direction, int[]>()
-	{{
-		put(Direction.UP, new int[]{Y, MAX});
-		put(Direction.DOWN, new int[]{Y, MIN});
-		put(Direction.EAST, new int[]{X, MAX});
-		put(Direction.WEST, new int[]{X, MIN});
-		put(Direction.SOUTH, new int[]{Z, MAX});
-		put(Direction.NORTH, new int[]{Z, MIN});
-	}};
-	
-	@SuppressWarnings("serial")
-	public static final Map<Direction, int[]> DIRECTION_NORMAL_MAP = new HashMap<Direction, int[]>()
-	{{
-		put(Direction.UP, new int[]{0, 1, 0});
-		put(Direction.DOWN, new int[]{0, -1, 0});
-		put(Direction.EAST, new int[]{1, 0, 0});
-		put(Direction.WEST, new int[]{-1, 0, 0});
-		put(Direction.SOUTH, new int[]{0, 0, 1});
-		put(Direction.NORTH, new int[]{0, 0, -1});
-	}};
-	
-	public int[][] box;
-	public long[] order;
-	public Map<Direction, int[]> colorMap;
-	public int debugColor;
-	public Map<Direction, int[][]> adjHeightAndDepth;
-	public Map<Direction, boolean[]> culling;
-	
-	@SuppressWarnings("serial")
-	public Box()
-	{
-		box = new int[2][3];
-		//order = new long[DetailDistanceUtil.getMaxVerticalData(0)];
-		colorMap = new HashMap<Direction, int[]>()
-		{{
-			put(Direction.UP, new int[1]);
-			put(Direction.DOWN, new int[1]);
-			put(Direction.EAST, new int[1]);
-			put(Direction.WEST, new int[1]);
-			put(Direction.SOUTH, new int[1]);
-			put(Direction.NORTH, new int[1]);
-		}};
-		adjHeightAndDepth = new HashMap<Direction, int[][]>()
-		{{
-			put(Direction.EAST, new int[32][2]);
-			put(Direction.WEST, new int[32][2]);
-			put(Direction.SOUTH, new int[32][2]);
-			put(Direction.NORTH, new int[32][2]);
-		}};
-		culling = new HashMap<Direction, boolean[]>()
-		{{
-			put(Direction.UP, new boolean[1]);
-			put(Direction.DOWN, new boolean[1]);
-			put(Direction.EAST, new boolean[1]);
-			put(Direction.WEST, new boolean[1]);
-			put(Direction.SOUTH, new boolean[1]);
-			put(Direction.NORTH, new boolean[1]);
-		}};
-	}
-	
-	public void setColor(int color)
-	{
-		this.debugColor = color;
-		for (Direction direction : DIRECTIONS)
-		{
-			colorMap.get(direction)[0] = ColorUtil.applyShade(color, MinecraftWrapper.INSTANCE.getClientWorld().getShade(direction, true));
-		}
-	}
-	
-	public int getColor(Direction direction)
-	{
-		if (LodConfig.CLIENT.debugging.debugMode.get() != DebugMode.SHOW_DETAIL)
-		{
-			return colorMap.get(direction)[0];
-		}
-		else
-		{
-			return ColorUtil.applyShade(debugColor, MinecraftWrapper.INSTANCE.getClientWorld().getShade(direction, true));
-		}
-	}
-	
-	public void reset()
-	{
-		for (int i = 0; i < box.length; i++)
-		{
-			Arrays.fill(box[i], 0);
-		}
-		
-		for (Direction direction : DIRECTIONS)
-		{
-			colorMap.get(direction)[0] = 0;
-		}
-		
-		//Arrays.fill(order, DataPointUtil.EMPTY_DATA);
-		for (Direction direction : ADJ_DIRECTIONS)
-		{
-			if(isCulled(direction)){
-				continue;
-			}
-			for (int i = 0; i < adjHeightAndDepth.get(direction).length; i++)
-			{
-				adjHeightAndDepth.get(direction)[i][0] = VOID_FACE;
-				adjHeightAndDepth.get(direction)[i][1] = VOID_FACE;
-			}
-		}
-	}
-	
-	public void setUpCulling(int cullingDistance, BlockPos playerPos)
-	{
-		for (Direction direction : DIRECTIONS)
-		{
-			if(direction == Direction.DOWN)
-				culling.get(direction)[0] = playerPos.get(direction.getAxis()) > getFacePos(direction) + cullingDistance;
-				else if(direction == Direction.UP)
-					culling.get(direction)[0] = playerPos.get(direction.getAxis()) < getFacePos(direction) - cullingDistance;
-				else if(direction == Direction.WEST)
-					culling.get(direction)[0] = -playerPos.get(direction.getAxis()) > getFacePos(direction) + cullingDistance;
-					else if(direction == Direction.NORTH)
-						culling.get(direction)[0] = -playerPos.get(direction.getAxis()) > getFacePos(direction) + cullingDistance;
-						else if(direction == Direction.EAST)
-							culling.get(direction)[0] = -playerPos.get(direction.getAxis()) < getFacePos(direction) - cullingDistance;
-						else if(direction == Direction.SOUTH)
-							culling.get(direction)[0] = -playerPos.get(direction.getAxis()) < getFacePos(direction) - cullingDistance;
-		}
-	}
-	
-	public boolean isCulled(Direction direction)
-	{
-		return culling.get(direction)[0];
-	}
-	
-	public void setAdjData(Map<Direction, long[]> adjData)
-	{
-		int height;
-		int depth;
-		int minY = getMinY();
-		int maxY = getMaxY();
-		for (Direction direction : ADJ_DIRECTIONS)
-		{
-			/*if(isCulled(direction)){
-				continue;
-			}*/
-			
-			long[] dataPoint = adjData.get(direction);
-			if (dataPoint == null || DataPointUtil.isItVoid(dataPoint[0]))
-			{
-				adjHeightAndDepth.get(direction)[0][0] = maxY;
-				adjHeightAndDepth.get(direction)[0][1] = minY;
-				adjHeightAndDepth.get(direction)[1][0] = VOID_FACE;
-				adjHeightAndDepth.get(direction)[1][1] = VOID_FACE;
-				continue;
-			}
-			
-			//We order the adj list
-			/**TODO remove this if the order is maintained naturally*/
-			/*order[0] = 0;
-			int count = 0;
-			for (int i = 0; i < dataPoint.length; i++)
-			{
-				int j = i - 1;
-				if(DataPointUtil.isItVoid(dataPoint[i]) || !DataPointUtil.doesItExist(dataPoint[i]))
-				{
-					continue;
-				}
-				while (j >= 0 && DataPointUtil.getHeight(order[j]) < DataPointUtil.getHeight(dataPoint[i]))
-				{
-					order[j + 1] = order[j];
-					j = j - 1;
-				}
-				order[j + 1] = dataPoint[i];
-				count++;
-			}*/
-			
-			int i;
-			int faceToDraw = 0;
-			boolean firstFace = true;
-			boolean toFinish = false;
-			boolean allAbove = true;
-			long singleAdjDataPoint;
-			for (i = 0; i < dataPoint.length; i++)
-			{
-				singleAdjDataPoint = dataPoint[i];
-				/*for (i = 0; i < count; i++)
-			{
-				singleAdjDataPoint = order[i];*/
-				
-				if(DataPointUtil.isItVoid(singleAdjDataPoint) || !DataPointUtil.doesItExist(singleAdjDataPoint))
-				{
-					break;
-				}
-				height = DataPointUtil.getHeight(singleAdjDataPoint);
-				depth = DataPointUtil.getDepth(singleAdjDataPoint);
-				
-				if (depth <= maxY) {
-					allAbove = false;
-					if (height < minY)
-					{//the adj data is lower than the current data
-						//we break since all the other data will be lower
-						
-						if (firstFace)
-						{
-							adjHeightAndDepth.get(direction)[0][0] = getMaxY();
-							adjHeightAndDepth.get(direction)[0][1] = getMinY();
-						} else
-						{
-							adjHeightAndDepth.get(direction)[faceToDraw][1] = getMinY();
-						}
-						faceToDraw++;
-						toFinish = false;
-						break;
-					} else if (depth <= minY && height >= maxY)
-					{//the adj data contains the current
-						//we do not draw the face
-						adjHeightAndDepth.get(direction)[0][0] = VOID_FACE;
-						adjHeightAndDepth.get(direction)[0][1] = VOID_FACE;
-						break;
-					} else if (depth <= minY)//&& height < maxY
-					{//the adj data intersect the lower part of the current data
-						//if this is the only face we use the maxY and break
-						//if there was other face we finish the last one and break
-						if (firstFace)
-						{
-							adjHeightAndDepth.get(direction)[0][0] = getMaxY();
-							adjHeightAndDepth.get(direction)[0][1] = height;
-						} else
-						{
-							adjHeightAndDepth.get(direction)[faceToDraw][1] = height;
-						}
-						toFinish = false;
-						faceToDraw++;
-						break;
-					} else if (height >= maxY)//depth > minY &&
-					{//the adj data intersect the higher part of the current data
-						//we start the creation of a new face
-						adjHeightAndDepth.get(direction)[faceToDraw][0] = depth;
-						firstFace = false;
-						toFinish = true;
-					} else {//if (depth > minY && height < maxY)
-						//the adj data is contained in the current data
-						if (firstFace)
-						{
-							adjHeightAndDepth.get(direction)[0][0] = getMaxY();
-						}
-						adjHeightAndDepth.get(direction)[faceToDraw][1] = height;
-						faceToDraw++;
-						adjHeightAndDepth.get(direction)[faceToDraw][0] = depth;
-						firstFace = false;
-						toFinish = true;
-					}
-				}
-				//else {//the adj data is higher than the current data
-				//we continue since there could be some other data that intersect the current
-				//}
-			}
-			if(allAbove){
-				adjHeightAndDepth.get(direction)[0][0] = getMaxY();
-				adjHeightAndDepth.get(direction)[0][1] = getMinY();
-				faceToDraw++;
-			}
-			else if (toFinish)
-			{
-				adjHeightAndDepth.get(direction)[faceToDraw][1] = minY;
-				faceToDraw++;
-			}
-			adjHeightAndDepth.get(direction)[faceToDraw][0] = VOID_FACE;
-			adjHeightAndDepth.get(direction)[faceToDraw][1] = VOID_FACE;
-		}
-	}
-	
-	public void set(int xWidth, int yWidth, int zWidth)
-	{
-		box[WIDTH][X] = xWidth;
-		box[WIDTH][Y] = yWidth;
-		box[WIDTH][Z] = zWidth;
-	}
-	
-	public void move(int xOffset, int yOffset, int zOffset)
-	{
-		box[OFFSET][X] = xOffset;
-		box[OFFSET][Y] = yOffset;
-		box[OFFSET][Z] = zOffset;
-	}
-	
-	
-	
-	public int getFacePos(Direction direction)
-	{
-		return box[OFFSET][FACE_DIRECTION.get(direction)[0]] + box[WIDTH][FACE_DIRECTION.get(direction)[0]] * FACE_DIRECTION.get(direction)[1];
-	}
-	
-	public int getCoord(Direction direction, int axis, int vertexIndex)
-	{
-		return box[OFFSET][axis] + box[WIDTH][axis] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][axis];
-	}
-	
-	public int getX(Direction direction, int vertexIndex)
-	{
-		return box[OFFSET][X] + box[WIDTH][X] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][X];
-	}
-	
-	public int getY(Direction direction, int vertexIndex)
-	{
-		return box[OFFSET][Y] + box[WIDTH][Y] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y];
-	}
-	
-	public int getY(Direction direction, int vertexIndex, int adjIndex)
-	{
-		if (direction == Direction.DOWN || direction == Direction.UP)
-		{
-			return box[OFFSET][Y] + box[WIDTH][Y] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y];
-		} else
-		{
-			return adjHeightAndDepth.get(direction)[adjIndex][1 - DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Y]];
-		}
-	}
-	
-	public int getZ(Direction direction, int vertexIndex)
-	{
-		return box[OFFSET][Z] + box[WIDTH][Z] * DIRECTION_VERTEX_MAP.get(direction)[vertexIndex][Z];
-	}
-	
-	/**
-	 * returns true if the given direction should be rendered.
-	 * TODO what does adjIndex represent?
-	 */
-	public boolean shouldRenderFace(Direction direction, int adjIndex)
-	{
-		if (direction == Direction.UP || direction == Direction.DOWN)
-		{
-			return adjIndex == 0;
-		}
-		return !(adjHeightAndDepth.get(direction)[adjIndex][0] == VOID_FACE && adjHeightAndDepth.get(direction)[adjIndex][1] == VOID_FACE);
-		
-	}
-	
-	public int getMinX()
-	{
-		return box[OFFSET][X];
-	}
-	
-	public int getMaxX()
-	{
-		return box[OFFSET][X] + box[WIDTH][X];
-	}
-	
-	public int getMinY()
-	{
-		return box[OFFSET][Y];
-	}
-	
-	public int getMaxY()
-	{
-		return box[OFFSET][Y] + box[WIDTH][Y];
-	}
-	
-	public int getMinZ()
-	{
-		return box[OFFSET][Z];
-	}
-	
-	public int getMaxZ()
-	{
-		return box[OFFSET][Z] + box[WIDTH][Z];
-	}
-	
-}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.builders.worldGeneration;

 import java.util.ConcurrentModificationException;
@@ -27,18 +29,16 @@ import java.util.concurrent.Executors;
 import java.util.function.Supplier;

 import com.google.common.util.concurrent.ThreadFactoryBuilder;
-import com.seibel.lod.builders.LodBuilder;
-import com.seibel.lod.builders.LodBuilderConfig;
+import com.seibel.lod.builders.lodBuilding.LodBuilder;
+import com.seibel.lod.builders.lodBuilding.LodBuilderConfig;
 import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.DistanceGenerationMode;
 import com.seibel.lod.objects.LodDimension;
 import com.seibel.lod.proxy.ClientProxy;
-import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;

 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.util.WeightedList.Entry;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.palette.UpgradeData;
 import net.minecraft.util.registry.Registry;
@@ -56,6 +56,7 @@ import net.minecraft.world.gen.feature.FeatureSpread;
 import net.minecraft.world.gen.feature.FeatureSpreadConfig;
 import net.minecraft.world.gen.feature.IceAndSnowFeature;
 import net.minecraft.world.gen.feature.NoFeatureConfig;
+import net.minecraft.world.gen.feature.template.TemplateManager;
 import net.minecraft.world.gen.placement.ConfiguredPlacement;
 import net.minecraft.world.gen.placement.DecoratedPlacementConfig;
 import net.minecraft.world.gen.placement.IPlacementConfig;
@@ -67,54 +68,51 @@ import net.minecraftforge.common.WorldWorkerManager.IWorker;

 /**
 * This is used to generate a LodChunk at a given ChunkPos.
- *
+ * 
 * @author James Seibel
- * @version 9-7-2021
+ * @version 10-22-2021
 */
-public class LodNodeGenWorker implements IWorker
+public class LodGenWorker implements IWorker
 {
-	public static ExecutorService genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfWorldGenerationThreads.get(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
-	//public static ExecutorService genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfWorldGenerationThreads.get(), new LodThreadFactory(LodNodeGenWorker.class.getSimpleName()));
-
+	public static ExecutorService genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.advancedModOptions.threading.numberOfWorldGenerationThreads.get(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
+	
 	private boolean threadStarted = false;
-	private LodChunkGenThread thread;
+	private final LodChunkGenThread thread;
 	
 	
-	/** If a configured feature fails for whatever reason,
+	/**
+	 * If a configured feature fails for whatever reason,
 	 * add it to this list, this is to hopefully remove any
-	 * features that could cause issues down the line. */
-	private static ConcurrentHashMap<Integer, ConfiguredFeature<?, ?>> configuredFeaturesToAvoid = new ConcurrentHashMap<>();
-
-
-
-	public LodNodeGenWorker(ChunkPos newPos, DistanceGenerationMode newGenerationMode,
-							LodBuilder newLodBuilder,
-							LodDimension newLodDimension, ServerWorld newServerWorld)
+	 * features that could cause issues down the line.
+	 */
+	private static final ConcurrentHashMap<Integer, ConfiguredFeature<?, ?>> configuredFeaturesToAvoid = new ConcurrentHashMap<>();
+	
+	
+	
+	public LodGenWorker(ChunkPos newPos, DistanceGenerationMode newGenerationMode,
+			LodBuilder newLodBuilder,
+			LodDimension newLodDimension, ServerWorld newServerWorld)
 	{
 		// just a few sanity checks
 		if (newPos == null)
 			throw new IllegalArgumentException("LodChunkGenWorker must have a non-null ChunkPos");
-
+		
 		if (newLodBuilder == null)
 			throw new IllegalArgumentException("LodChunkGenThread requires a non-null LodChunkBuilder");
-
+		
 		if (newLodDimension == null)
 			throw new IllegalArgumentException("LodChunkGenThread requires a non-null LodDimension");
-
+		
 		if (newServerWorld == null)
 			throw new IllegalArgumentException("LodChunkGenThread requires a non-null ServerWorld");
-
-
-
+		
+		
+		
 		thread = new LodChunkGenThread(newPos, newGenerationMode,
 				newLodBuilder,
 				newLodDimension, newServerWorld);
 	}
-
-	public static void resetGenerator(){
-		ExecutorService genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfWorldGenerationThreads.get(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
-	}
-
+	
 	@Override
 	public boolean doWork()
 	{
@@ -135,38 +133,38 @@ public class LodNodeGenWorker implements IWorker
 				newThread.setPriority(5);
 				genThreads.execute(newThread);
 			}
-
+			
 			threadStarted = true;
-
+			
 			// useful for debugging
 //        	ClientProxy.LOGGER.info(thread.lodDim.getNumberOfLods());
 //        	ClientProxy.LOGGER.info(genThreads.toString());
 		}
-
+		
 		return false;
 	}
-
+	
 	@Override
 	public boolean hasWork()
 	{
 		return !threadStarted;
 	}
-
-
-
-
-	private class LodChunkGenThread implements Runnable
+	
+	
+	
+	
+	private static class LodChunkGenThread implements Runnable
 	{
 		public final ServerWorld serverWorld;
 		public final LodDimension lodDim;
 		public final DistanceGenerationMode generationMode;
 		public final LodBuilder lodBuilder;
-
-		private ChunkPos pos;
-
+		
+		private final ChunkPos pos;
+		
 		public LodChunkGenThread(ChunkPos newPos, DistanceGenerationMode newGenerationMode,
-								 LodBuilder newLodBuilder,
-								 LodDimension newLodDimension, ServerWorld newServerWorld)
+				LodBuilder newLodBuilder,
+				LodDimension newLodDimension, ServerWorld newServerWorld)
 		{
 			pos = newPos;
 			generationMode = newGenerationMode;
@@ -174,7 +172,7 @@ public class LodNodeGenWorker implements IWorker
 			lodDim = newLodDimension;
 			serverWorld = newServerWorld;
 		}
-
+		
 		@Override
 		public void run()
 		{
@@ -182,14 +180,56 @@ public class LodNodeGenWorker implements IWorker
 			{
 				// only generate LodChunks if they can
 				// be added to the current LodDimension
-
-				/**TODO i must disable this if, i will find a way to replace it*/
+				
+				/* TODO I must disable this 'if', if I will find a way to replace it */
 				if (lodDim.regionIsInRange(pos.x / LodUtil.REGION_WIDTH_IN_CHUNKS, pos.z / LodUtil.REGION_WIDTH_IN_CHUNKS))
 				{
-//					long startTime = System.currentTimeMillis();
-
-					switch(generationMode)
+					//
+					//{
+					//	lodBuilder.generateLodNodeFromChunk(lodDim, loadedChunk, new LodBuilderConfig(DistanceGenerationMode.SERVER));
+					//}
+					//else
+					//{
+					/*
+					IChunk loadedChunk = null;
+					if (lodDim.isChunkPreGenerated(pos.x, pos.z) && LodConfig.CLIENT.worldGenerator.useExperimentalPreGenLoading.get())
 					{
+						// generate a Lod like normal
+						loadedChunk = ChunkLoader.getChunkFromFile(pos);
+						if(loadedChunk != null)
+							lodBuilder.generateLodNodeFromChunk(lodDim, loadedChunk, new LodBuilderConfig(DistanceGenerationMode.SERVER));
+						else
+						{
+							switch (generationMode)
+							{
+							case NONE:
+								// don't generate
+								break;
+							case BIOME_ONLY:
+							case BIOME_ONLY_SIMULATE_HEIGHT:
+								// fastest
+								generateUsingBiomesOnly();
+								break;
+							case SURFACE:
+								// faster
+								generateUsingSurface();
+								break;
+							case FEATURES:
+								// fast
+								generateUsingFeatures();
+								break;
+							case SERVER:
+								// very slow
+								lodBuilder.generateLodNodeFromChunk(lodDim, serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), new LodBuilderConfig(DistanceGenerationMode.SERVER));
+								//generateWithServer();
+								break;
+							}
+						}
+					}
+					else
+					{*/
+						switch (generationMode)
+						{
 						case NONE:
 							// don't generate
 							break;
@@ -210,31 +250,30 @@ public class LodNodeGenWorker implements IWorker
 							// very slow
 							generateWithServer();
 							break;
-					}
-
+						}
+					//}
+					
 					//lodRenderer.regenerateLODsNextFrame();
-
+					
 /*
 					boolean dataExistence = lodDim.doesDataExist(new LevelPos((byte) 3, pos.x, pos.z));
 					if (dataExistence)
 						ClientProxy.LOGGER.info(pos.x + " " + pos.z + " Success!");
 					else
 						ClientProxy.LOGGER.info(pos.x + " " + pos.z);
-*/
+ */
 					// shows the pool size, active threads, queued tasks and completed tasks
 //					ClientProxy.LOGGER.info(genThreads.toString());

 //					long endTime = System.currentTimeMillis();
 //					System.out.println(endTime - startTime);
-
+					
 				}// if in range
-				//else{
-
-				//}
 			}
 			catch (Exception e)
 			{
-				//e.printStackTrace();
+				ClientProxy.LOGGER.error(LodChunkGenThread.class.getSimpleName() + ": ran into an error: " + e.getMessage());
+				e.printStackTrace();
 			}
 			finally
 			{
@@ -242,13 +281,13 @@ public class LodNodeGenWorker implements IWorker
 				LodWorldGenerator.INSTANCE.numberOfChunksWaitingToGenerate.addAndGet(-1);
 				
 				// this position is no longer being generated
-				LodWorldGenerator.INSTANCE.positionWaitingToBeGenerated.remove(pos);
+				LodWorldGenerator.INSTANCE.positionsWaitingToBeGenerated.remove(pos);
 			}
-
+			
 		}// run
-
-
-
+		
+		
+		
 		/**
 		 * takes about 2-5 ms
 		 */
@@ -257,78 +296,78 @@ public class LodNodeGenWorker implements IWorker
 			List<IChunk> chunkList = new LinkedList<>();
 			ChunkPrimer chunk = new ChunkPrimer(pos, UpgradeData.EMPTY);
 			chunkList.add(chunk);
-
+			
 			ServerChunkProvider chunkSource = serverWorld.getChunkSource();
 			ChunkGenerator chunkGen = chunkSource.generator;
-
+			
 			// generate the terrain (this is thread safe)
 			ChunkStatus.EMPTY.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-			// override the chunk status so we can run the next generator stage
+			// override the chunk status, so we can run the next generator stage
 			chunk.setStatus(ChunkStatus.STRUCTURE_REFERENCES);
 			chunkGen.createBiomes(serverWorld.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), chunk);
 			chunk.setStatus(ChunkStatus.STRUCTURE_REFERENCES);
-
-
-
-
+			
+			
+			
+			
 			// generate fake height data for this LOD
 			int seaLevel = serverWorld.getSeaLevel();
-
+			
 			boolean simulateHeight = generationMode == DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
 			boolean inTheEnd = false;
-
+			
 			// add fake heightmap data so our LODs aren't at height 0
 			Heightmap heightmap = new Heightmap(chunk, LodUtil.DEFAULT_HEIGHTMAP);
-			for(int x = 0; x < LodUtil.CHUNK_WIDTH && !inTheEnd; x++)
+			for (int x = 0; x < LodUtil.CHUNK_WIDTH && !inTheEnd; x++)
 			{
-				for(int z = 0; z < LodUtil.CHUNK_WIDTH && !inTheEnd; z++)
+				for (int z = 0; z < LodUtil.CHUNK_WIDTH && !inTheEnd; z++)
 				{
 					if (simulateHeight)
 					{
 						// these heights are of course aren't super accurate,
 						// they are just to simulate height data where there isn't any
-						switch(chunk.getBiomes().getNoiseBiome(x >> 2, seaLevel >> 2, z >> 2).getBiomeCategory())
+						switch (chunk.getBiomes().getNoiseBiome(x >> 2, seaLevel >> 2, z >> 2).getBiomeCategory())
 						{
-							case NETHER:
-								heightmap.setHeight(x, z, serverWorld.getHeight() / 2);
-								break;
-
-							case EXTREME_HILLS:
-								heightmap.setHeight(x, z, seaLevel + 30);
-								break;
-							case MESA:
-								heightmap.setHeight(x, z, seaLevel + 20);
-								break;
-							case JUNGLE:
-								heightmap.setHeight(x, z, seaLevel + 20);
-								break;
-							case BEACH:
-								heightmap.setHeight(x, z, seaLevel + 5);
-								break;
-							case NONE:
-								heightmap.setHeight(x, z, 0);
-								break;
-
-							case OCEAN:
-							case RIVER:
-								heightmap.setHeight(x, z, seaLevel);
-								break;
-
-							case THEEND:
-								inTheEnd = true;
-								break;
-
-							// DESERT
-							// FOREST
-							// ICY
-							// MUSHROOM
-							// SAVANNA
-							// SWAMP
-							// TAIGA
-							// PLAINS
-							default:
-								heightmap.setHeight(x, z, seaLevel + 10);
-								break;
+						case NETHER:
+							heightmap.setHeight(x, z, serverWorld.getHeight() / 2);
+							break;
+						
+						case EXTREME_HILLS:
+							heightmap.setHeight(x, z, seaLevel + 30);
+							break;
+						case MESA:
+							heightmap.setHeight(x, z, seaLevel + 20);
+							break;
+						case JUNGLE:
+							heightmap.setHeight(x, z, seaLevel + 20);
+							break;
+						case BEACH:
+							heightmap.setHeight(x, z, seaLevel + 5);
+							break;
+						case NONE:
+							heightmap.setHeight(x, z, 0);
+							break;
+						
+						case OCEAN:
+						case RIVER:
+							heightmap.setHeight(x, z, seaLevel);
+							break;
+						
+						case THEEND:
+							inTheEnd = true;
+							break;
+						
+						// DESERT
+						// FOREST
+						// ICY
+						// MUSHROOM
+						// SAVANNA
+						// SWAMP
+						// TAIGA
+						// PLAINS
+						default:
+							heightmap.setHeight(x, z, seaLevel + 10);
+							break;
 						}// heightmap switch
 					}
 					else
@@ -339,10 +378,10 @@ public class LodNodeGenWorker implements IWorker
 					}
 				}// z
 			}// x
-
+			
 			chunk.setHeightmap(LodUtil.DEFAULT_HEIGHTMAP, heightmap.getRawData());
-
-
+			
+			
 			if (!inTheEnd)
 			{
 				lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false));
@@ -351,7 +390,8 @@ public class LodNodeGenWorker implements IWorker
 			{
 				// if we are in the end, don't generate any chunks.
 				// Since we don't know where the islands are, everything
-				// generates the same and it looks really bad.
+				// generates the same, and it looks awful.
+				//TODO it appears that 'if' can be collapsed, but comment says that it should not be a case
 				lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(true, true, false));
 			}

@@ -360,8 +400,8 @@ public class LodNodeGenWorker implements IWorker
 //			long endTime = System.currentTimeMillis();
 //			System.out.println(endTime - startTime);
 		}
-
-
+		
+		
 		/**
 		 * takes about 10 - 20 ms
 		 */
@@ -371,34 +411,37 @@ public class LodNodeGenWorker implements IWorker
 			ChunkPrimer chunk = new ChunkPrimer(pos, UpgradeData.EMPTY);
 			chunkList.add(chunk);
 			LodServerWorld lodServerWorld = new LodServerWorld(serverWorld, chunk);
-
+			
 			ServerChunkProvider chunkSource = serverWorld.getChunkSource();
+			ServerWorldLightManager lightEngine = (ServerWorldLightManager) serverWorld.getLightEngine();
+			TemplateManager templateManager = serverWorld.getStructureManager();
 			ChunkGenerator chunkGen = chunkSource.generator;
-
-
+			
+			
 			// generate the terrain (this is thread safe)
-			ChunkStatus.EMPTY.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-			// override the chunk status so we can run the next generator stage
+			ChunkStatus.EMPTY.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			// override the chunk status, so we can run the next generator stage
 			chunk.setStatus(ChunkStatus.STRUCTURE_REFERENCES);
 			chunkGen.createBiomes(serverWorld.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), chunk);
-			ChunkStatus.NOISE.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-			ChunkStatus.SURFACE.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-
-			// this feature has been proven to be thread safe
+			ChunkStatus.NOISE.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			ChunkStatus.SURFACE.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			
+			// this feature has been proven to be thread safe,
 			// so we will add it
 			IceAndSnowFeature snowFeature = new IceAndSnowFeature(NoFeatureConfig.CODEC);
 			snowFeature.place(lodServerWorld, chunkGen, serverWorld.random, chunk.getPos().getWorldPosition(), null);
-
+			
+			
 			lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.SURFACE));
-
-			/**TODO if we want to use Biome utils and terrain utils for overworld
+			
+			/*TODO if we want to use Biome utils and terrain utils for overworld
 			 * lodBuilder.generateLodNodeFromChunk(lodDim, pos ,detailLevel, serverWorld.getSeed());*/
 		}
-
-
+		
+		
 		/**
 		 * takes about 15 - 20 ms
-		 *
+		 * <p>
 		 * Causes concurrentModification Exceptions,
 		 * which could cause instability or world generation bugs
 		 */
@@ -408,20 +451,22 @@ public class LodNodeGenWorker implements IWorker
 			ChunkPrimer chunk = new ChunkPrimer(pos, UpgradeData.EMPTY);
 			chunkList.add(chunk);
 			LodServerWorld lodServerWorld = new LodServerWorld(serverWorld, chunk);
-
+			
 			ServerChunkProvider chunkSource = serverWorld.getChunkSource();
+			ServerWorldLightManager lightEngine = (ServerWorldLightManager) serverWorld.getLightEngine();
+			TemplateManager templateManager = serverWorld.getStructureManager();
 			ChunkGenerator chunkGen = chunkSource.generator;
-
-
+			
+			
 			// generate the terrain (this is thread safe)
-			ChunkStatus.EMPTY.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-			// override the chunk status so we can run the next generator stage
+			ChunkStatus.EMPTY.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			// override the chunk status, so we can run the next generator stage
 			chunk.setStatus(ChunkStatus.STRUCTURE_REFERENCES);
 			chunkGen.createBiomes(serverWorld.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), chunk);
-			ChunkStatus.NOISE.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-			ChunkStatus.SURFACE.generate(serverWorld, chunkGen, serverWorld.getStructureManager(), (ServerWorldLightManager) serverWorld.getLightEngine(), null, chunkList);
-
-
+			ChunkStatus.NOISE.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			ChunkStatus.SURFACE.generate(serverWorld, chunkGen, templateManager, lightEngine, null, chunkList);
+			
+			
 			// get all the biomes in the chunk
 			HashSet<Biome> biomes = new HashSet<>();
 			for (int x = 0; x < LodUtil.CHUNK_WIDTH; x++)
@@ -429,7 +474,7 @@ public class LodNodeGenWorker implements IWorker
 				for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
 				{
 					Biome biome = chunk.getBiomes().getNoiseBiome(x >> 2, serverWorld.getSeaLevel() >> 2, z >> 2);
-
+					
 					// Issue #35
 					// For some reason Jungle biomes cause incredible lag
 					// the features here must be interacting with each other
@@ -444,37 +489,37 @@ public class LodNodeGenWorker implements IWorker
 					}
 				}
 			}
-
+			
 			boolean allowUnstableFeatures = LodConfig.CLIENT.worldGenerator.allowUnstableFeatureGeneration.get();
-
+			
 			// generate all the features related to this chunk.
 			// this may or may not be thread safe
 			for (Biome biome : biomes)
 			{
 				List<List<Supplier<ConfiguredFeature<?, ?>>>> featuresForState = biome.generationSettings.features();
-
-				for(int featureStateToGenerate = 0; featureStateToGenerate < featuresForState.size(); featureStateToGenerate++)
+				
+				for (List<Supplier<ConfiguredFeature<?, ?>>> suppliers : featuresForState)
 				{
-					for(Supplier<ConfiguredFeature<?, ?>> featureSupplier : featuresForState.get(featureStateToGenerate))
+					for (Supplier<ConfiguredFeature<?, ?>> featureSupplier : suppliers)
 					{
 						ConfiguredFeature<?, ?> configuredFeature = featureSupplier.get();
-
+						
 						if (!allowUnstableFeatures &&
-								configuredFeaturesToAvoid.containsKey(configuredFeature.hashCode()))
+									configuredFeaturesToAvoid.containsKey(configuredFeature.hashCode()))
 							continue;
-
-
+						
+						
 						try
 						{
 							configuredFeature.place(lodServerWorld, chunkGen, serverWorld.random, chunk.getPos().getWorldPosition());
 						}
-						catch(ConcurrentModificationException e)
+						catch (ConcurrentModificationException e)
 						{
 							// This will happen. I'm not sure what to do about it
-							// except pray that it doesn't effect the normal world generation
+							// except pray that it doesn't affect the normal world generation
 							// in any harmful way.
 							// Update: this can cause crashes and high CPU usage.
-
+							
 							// Issue #35
 							// I tried cloning the config for each feature, but that
 							// path was blocked since I can't clone lambda methods.
@@ -483,31 +528,27 @@ public class LodNodeGenWorker implements IWorker
 							// ( https://github.com/kostaskougios/cloning
 							//   and
 							//   https://github.com/EsotericSoftware/kryo )
-
+							
 							if (!allowUnstableFeatures)
 								configuredFeaturesToAvoid.put(configuredFeature.hashCode(), configuredFeature);
 //							ClientProxy.LOGGER.info(configuredFeaturesToAvoid.mappingCount());
 						}
-						catch(UnsupportedOperationException e)
+						catch (UnsupportedOperationException e)
 						{
 							// This will happen when the LodServerWorld
 							// isn't able to return something that a feature
 							// generator needs
-
+							
 							if (!allowUnstableFeatures)
 								configuredFeaturesToAvoid.put(configuredFeature.hashCode(), configuredFeature);
 //							ClientProxy.LOGGER.info(configuredFeaturesToAvoid.mappingCount());
 						}
-						catch(Exception e)
+						catch (Exception e)
 						{
 							// I'm not sure what happened, print to the log
-
-							System.out.println();
-							System.out.println();
+							
 							e.printStackTrace();
-							System.out.println();
-							System.out.println();
-
+							
 							if (!allowUnstableFeatures)
 								configuredFeaturesToAvoid.put(configuredFeature.hashCode(), configuredFeature);
 //							ClientProxy.LOGGER.info(configuredFeaturesToAvoid.mappingCount());
@@ -515,129 +556,137 @@ public class LodNodeGenWorker implements IWorker
 					}
 				}
 			}
-
+			
 			// generate a Lod like normal
-
 			lodBuilder.generateLodNodeFromChunk(lodDim, chunk, new LodBuilderConfig(DistanceGenerationMode.FEATURES));
 		}
-
-
+		
+		
 		/**
 		 * on pre generated chunks 0 - 1 ms
 		 * on un generated chunks 0 - 50 ms
-		 * 	with the median seeming to hover around 15 - 30 ms
-		 * 	and outliers in the 100 - 200 ms range
-		 *
+		 * with the median seeming to hover around 15 - 30 ms
+		 * and outliers in the 100 - 200 ms range
+		 * <p>
 		 * Note this should not be multithreaded and does cause server/simulation lag
 		 * (Higher lag for generating than loading)
 		 */
 		private void generateWithServer()
 		{
-			lodBuilder.generateLodNodeAsync(serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), ClientProxy.getLodWorld(), serverWorld);
+			lodBuilder.generateLodNodeFromChunk(lodDim, serverWorld.getChunk(pos.x, pos.z, ChunkStatus.FEATURES), new LodBuilderConfig(DistanceGenerationMode.SERVER));
 		}
-
-
-
-
-
-
+		
+		
+		
+		
+		
+		
 		//================//
 		// Unused methods //
 		//================//
-
+		
 		// Sadly I wasn't able to get these to work,
 		// they are here for documentation purposes
-
+		
 		@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
 		private DecoratedFeatureConfig cloneDecoratedFeatureConfig(DecoratedFeatureConfig config)
 		{
-			IPlacementConfig placementConfig = null;
-
+			IPlacementConfig placementConfig;
+			
 			Class oldConfigClass = config.decorator.config().getClass();
-
+			
 			if (oldConfigClass == FeatureSpreadConfig.class)
 			{
 				FeatureSpreadConfig oldPlacementConfig = (FeatureSpreadConfig) config.decorator.config();
 				FeatureSpread oldSpread = oldPlacementConfig.count();
-
+				
 				placementConfig = new FeatureSpreadConfig(oldSpread);
 			}
-			else if(oldConfigClass == DecoratedPlacementConfig.class)
+			else if (oldConfigClass == DecoratedPlacementConfig.class)
 			{
 				DecoratedPlacementConfig oldPlacementConfig = (DecoratedPlacementConfig) config.decorator.config();
 				placementConfig = new DecoratedPlacementConfig(oldPlacementConfig.inner(), oldPlacementConfig.outer());
 			}
-			else if(oldConfigClass == NoiseDependant.class)
+			else if (oldConfigClass == NoiseDependant.class)
 			{
 				NoiseDependant oldPlacementConfig = (NoiseDependant) config.decorator.config();
 				placementConfig = new NoiseDependant(oldPlacementConfig.noiseLevel, oldPlacementConfig.belowNoise, oldPlacementConfig.aboveNoise);
 			}
 			else
 			{
-//				ClientProxy.LOGGER.debug("unkown decorated placement config: \"" + config.decorator.config().getClass() + "\"");
+//				ClientProxy.LOGGER.debug("unknown decorated placement config: \"" + config.decorator.config().getClass() + "\"");
 				return config;
 			}
-
-
+			
+			
 			ConfiguredPlacement<?> newPlacement = new ConfiguredPlacement(config.decorator.decorator, placementConfig);
 			return new DecoratedFeatureConfig(config.feature, newPlacement);
 		}
-
-
+		
+		
 		@SuppressWarnings("unused")
 		private BlockClusterFeatureConfig cloneBlockClusterFeatureConfig(BlockClusterFeatureConfig config)
 		{
 			WeightedBlockStateProvider provider = new WeightedBlockStateProvider();
 			provider.weightedList.entries.addAll(((WeightedBlockStateProvider) config.stateProvider).weightedList.entries);
-
+			
 			HashSet<Block> whitelist = new HashSet<>(config.whitelist);
-
+			
 			HashSet<BlockState> blacklist = new HashSet<>(config.blacklist);
-
-
+			
+			
 			BlockClusterFeatureConfig.Builder builder = new BlockClusterFeatureConfig.Builder(provider, config.blockPlacer);
 			builder.whitelist(whitelist);
 			builder.blacklist(blacklist);
 			builder.xspread(config.xspread);
 			builder.yspread(config.yspread);
 			builder.zspread(config.zspread);
-			if(config.canReplace) { builder.canReplace(); }
-			if(config.needWater) { builder.needWater(); }
-			if(config.project) { builder.noProjection(); }
+			if (config.canReplace)
+			{
+				builder.canReplace();
+			}
+			if (config.needWater)
+			{
+				builder.needWater();
+			}
+			if (config.project)
+			{
+				builder.noProjection();
+			}
 			builder.tries(config.tries);
-
-
+			
+			
 			return builder.build();
 		}
-
+		
 	}
-
-
+	
+	
 	/**
 	 * Stops the current genThreads if they are running
-	 * and then recreates the Executer service. <br><br>
-	 *
+	 * and then recreates the Executor service. <br><br>
+	 * <p>
 	 * This is done to clear any outstanding tasks
 	 * that may exist after the player leaves their current world.
 	 * If this isn't done unfinished tasks may be left in the queue
 	 * preventing new LodChunks form being generated.
 	 */
-	public static void restartExecuterService()
+	public static void restartExecutorService()
 	{
 		if (genThreads != null && !genThreads.isShutdown())
 		{
 			genThreads.shutdownNow();
 		}
-		genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.threading.numberOfWorldGenerationThreads.get(), new LodThreadFactory(LodNodeGenWorker.class.getSimpleName()));
+		genThreads = Executors.newFixedThreadPool(LodConfig.CLIENT.advancedModOptions.threading.numberOfWorldGenerationThreads.get(), new ThreadFactoryBuilder().setNameFormat("Gen-Worker-Thread-%d").build());
 	}
-
-
-
-
-
-    /*
-     * performance/generation tests related to
-     * serverWorld.getChunk(x, z, ChunkStatus. *** )
+	
+	
+	
+	
+	
+	/*
+	 * performance/generation tests related to
+	 * serverWorld.getChunk(x, z, ChunkStatus. *** )

     true/false is whether they generated blocks or not
     the time is how long it took to generate
@@ -659,6 +708,6 @@ public class LodNodeGenWorker implements IWorker
     At this point I would suggest using FEATURES, as it generates snow and trees
     (and any other object that is needed to make biomes distinct)

-     Otherwise if snow/trees aren't necessary SURFACE is the next fastest (although not by much)
-     */
+     Otherwise, if snow/trees aren't necessary SURFACE is the next fastest (although not by much)
+	 */
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.builders.worldGeneration;

 import java.util.HashMap;
@@ -65,266 +67,265 @@ import net.minecraft.world.storage.IWorldInfo;
 * This allows us to keep each LodChunk generation independent
 * of the actual ServerWorld, allowing us
 * to multithread generation.
- *
 * @author James Seibel
 * @version 7-26-2021
 */
 public class LodServerWorld implements ISeedReader
 {
-
+	
 	public HashMap<Heightmap.Type, Heightmap> heightmaps = new HashMap<>();
-
-	public IChunk chunk;
-
-	public ServerWorld serverWorld;
-
+	
+	public final IChunk chunk;
+	
+	public final ServerWorld serverWorld;
+	
 	public LodServerWorld(ServerWorld newServerWorld, IChunk newChunk)
 	{
 		chunk = newChunk;
 		serverWorld = newServerWorld;
 	}
-
-
+	
+	
 	@Override
 	public int getHeight(Type heightmapType, int x, int z)
 	{
 		// make sure the block position is set relative to the chunk
 		x = x % LodUtil.CHUNK_WIDTH;
 		x = (x < 0) ? x + 16 : x;
-
+		
 		z = z % LodUtil.CHUNK_WIDTH;
 		z = (z < 0) ? z + 16 : z;
-
+		
 		return chunk.getOrCreateHeightmapUnprimed(LodUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(x, z);
 	}
-
+	
 	@Override
 	public Biome getBiome(BlockPos pos)
 	{
 		return chunk.getBiomes().getNoiseBiome(pos.getX() >> 2, pos.getY() >> 2, pos.getZ() >> 2);
 	}
-
+	
 	@Override
 	public boolean setBlock(BlockPos pos, BlockState state, int flags, int recursionLeft)
 	{
 		return chunk.setBlockState(pos, state, false) == state;
 	}
-
+	
 	@Override
 	public BlockState getBlockState(BlockPos pos)
 	{
 		return chunk.getBlockState(pos);
 	}
-
+	
 	@Override
 	public FluidState getFluidState(BlockPos pos)
 	{
 		return chunk.getFluidState(pos);
 	}
-
-
+	
+	
 	@Override
 	public boolean isStateAtPosition(BlockPos pos, Predicate<BlockState> state)
 	{
 		return state.test(chunk.getBlockState(pos));
 	}
-
+	
 	@Override
 	public ITickList<Block> getBlockTicks()
 	{
 		return EmptyTickList.empty();
 	}
-
+	
 	@Override
 	public IChunk getChunk(int x, int z, ChunkStatus requiredStatus, boolean nonnull)
 	{
 		return chunk;
 	}
-
+	
 	@Override
 	public Stream<? extends StructureStart<?>> startsForFeature(SectionPos p_241827_1_, Structure<?> p_241827_2_)
 	{
 		return serverWorld.startsForFeature(p_241827_1_, p_241827_2_);
 	}
-
+	
 	@Override
 	public ITickList<Fluid> getLiquidTicks()
 	{
 		return EmptyTickList.empty();
 	}
-
+	
 	@Override
 	public WorldLightManager getLightEngine()
 	{
 		return new WorldLightManager(null, false, false);
 	}
-
+	
 	@Override
 	public long getSeed()
 	{
 		return serverWorld.getSeed();
 	}
-
+	
 	@Override
 	public DynamicRegistries registryAccess()
 	{
 		return serverWorld.registryAccess();
 	}
-
-
+	
+	
 	/**
 	 * All methods below shouldn't be needed
 	 * and thus have been left unimplemented.
 	 */
-
-
+	
+	
 	@Override
 	public Random getRandom()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public void playSound(PlayerEntity player, BlockPos pos, SoundEvent soundIn, SoundCategory category, float volume,
-	                      float pitch)
+			float pitch)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public void addParticle(IParticleData particleData, double x, double y, double z, double xSpeed, double ySpeed,
-	                        double zSpeed)
+			double zSpeed)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public BiomeManager getBiomeManager()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public int getSeaLevel()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public float getShade(Direction p_230487_1_, boolean p_230487_2_)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public WorldBorder getWorldBorder()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public boolean removeBlock(BlockPos pos, boolean isMoving)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 	@Override
 	public boolean destroyBlock(BlockPos pos, boolean dropBlock, Entity entity, int recursionLeft)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public ServerWorld getLevel()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public AbstractChunkProvider getChunkSource()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public DifficultyInstance getCurrentDifficultyAt(BlockPos arg0)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public IWorldInfo getLevelData()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public void levelEvent(PlayerEntity arg0, int arg1, BlockPos arg2, int arg3)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
-
+		
 	}
-
-
+	
+	
 	@Override
 	public List<Entity> getEntities(Entity arg0, AxisAlignedBB arg1, Predicate<? super Entity> arg2)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public <T extends Entity> List<T> getEntitiesOfClass(Class<? extends T> arg0, AxisAlignedBB arg1,
-	                                                     Predicate<? super T> arg2)
+			Predicate<? super T> arg2)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public List<? extends PlayerEntity> players()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public int getSkyDarken()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public Biome getUncachedNoiseBiome(int p_225604_1_, int p_225604_2_, int p_225604_3_)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public boolean isClientSide()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public DimensionType dimensionType()
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
-
+	
+	
 	@Override
 	public TileEntity getBlockEntity(BlockPos p_175625_1_)
 	{
 		throw new UnsupportedOperationException("Not Implemented");
 	}
-
+	
 }
@@ -1,3 +1,22 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.builders.worldGeneration;

 import java.util.HashSet;
@@ -6,14 +25,14 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicInteger;

-import com.seibel.lod.builders.LodBuilder;
+import com.seibel.lod.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.DistanceGenerationMode;
-import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.objects.LodDimension;
 import com.seibel.lod.objects.PosToGenerateContainer;
 import com.seibel.lod.render.LodRenderer;
 import com.seibel.lod.util.DetailDistanceUtil;
+import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;
@@ -24,71 +43,65 @@ import net.minecraftforge.common.WorldWorkerManager;

 /**
 * A singleton that handles all long distance LOD world generation.
- *
 * @author James Seibel
- * @version 8-24-2021
+ * @version 9-25-2021
 */
 public class LodWorldGenerator
 {
-	public MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
-
-	/**
-	 * This holds the thread used to generate new LODs off the main thread.
-	 */
-	private ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator"));
-
-	/**
-	 * we only want to queue up one generator thread at a time
-	 */
+	public final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	
+	/** This holds the thread used to generate new LODs off the main thread. */
+	private final ExecutorService mainGenThread = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName() + " world generator"));
+	
+	/** we only want to queue up one generator thread at a time */
 	private boolean generatorThreadRunning = false;
-
+	
 	/**
-	 * how many chunks to generate outside of the player's view distance at one
+	 * How many chunks to generate outside the player's view distance at one
 	 * time. (or more specifically how many requests to make at one time). I
 	 * multiply by 8 to make sure there is always a buffer of chunk requests, to
-	 * make sure the CPU is always busy and we can generate LODs as quickly as
+	 * make sure the CPU is always busy, and we can generate LODs as quickly as
 	 * possible.
 	 */
 	public int maxChunkGenRequests;
-
+	
 	/**
 	 * This keeps track of how many chunk generation requests are on going. This is
 	 * to limit how many chunks are queued at once. To prevent chunks from being
 	 * generated for a long time in an area the player is no longer in.
 	 */
-	public AtomicInteger numberOfChunksWaitingToGenerate = new AtomicInteger(0);
-
-	public Set<ChunkPos> positionWaitingToBeGenerated = new HashSet<>();
-
+	public final AtomicInteger numberOfChunksWaitingToGenerate = new AtomicInteger(0);
+	
+	public final Set<ChunkPos> positionsWaitingToBeGenerated = new HashSet<>();
+	
 	/**
 	 * Singleton copy of this object
 	 */
 	public static final LodWorldGenerator INSTANCE = new LodWorldGenerator();
-
-
+	
+	
 	private LodWorldGenerator()
 	{
-
+		
 	}
-
+	
 	/**
 	 * Queues up LodNodeGenWorkers for the given lodDimension.
-	 *
 	 * @param renderer needed so the LodNodeGenWorkers can flag that the
-	 *                 buffers need to be rebuilt.
+	 * buffers need to be rebuilt.
 	 */
 	public void queueGenerationRequests(LodDimension lodDim, LodRenderer renderer, LodBuilder lodBuilder)
 	{
 		if (LodConfig.CLIENT.worldGenerator.distanceGenerationMode.get() != DistanceGenerationMode.NONE
-				    && !generatorThreadRunning
-				    && mc.hasSingleplayerServer())
+				&& !generatorThreadRunning
+				&& mc.hasSinglePlayerServer())
 		{
 			// the thread is now running, don't queue up another thread
 			generatorThreadRunning = true;
-
+			
 			// just in case the config changed
-			maxChunkGenRequests = LodConfig.CLIENT.threading.numberOfWorldGenerationThreads.get() * 8;
-
+			maxChunkGenRequests = LodConfig.CLIENT.advancedModOptions.threading.numberOfWorldGenerationThreads.get() * 8;
+			
 			Thread generatorThread = new Thread(() ->
 			{
 				try
@@ -96,103 +109,96 @@ public class LodWorldGenerator
 					// round the player's block position down to the nearest chunk BlockPos
 					int playerPosX = mc.getPlayer().blockPosition().getX();
 					int playerPosZ = mc.getPlayer().blockPosition().getZ();
-
-					// if we don't have a full number of chunks to generate in chunksToGen
-					// we can top it off from this reserve
-
-
+					
+					
 					//=======================================//
-					// create the generation Request objects //
+					// fill in positionsWaitingToBeGenerated //
 					//=======================================//
-
+					
 					ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(lodDim.dimension);
-
-					PosToGenerateContainer posToGenerate = lodDim.getDataToGenerate(
+					
+					PosToGenerateContainer posToGenerate = lodDim.getPosToGenerate(
 							maxChunkGenRequests,
 							playerPosX,
 							playerPosZ);
-					//System.out.println(posToGenerate);
-					//here we prepare two sorted set
-					//the first contains the near pos to render
-					//the second contain the far pos to render
+					
+					
 					byte detailLevel;
 					int posX;
 					int posZ;
-					boolean nearOrFar = true;
-					boolean stopSwitch = false;
-					int near = 0;
-					int far = 0;
-
-					for (int index = 0; index < posToGenerate.getNumberOfPos(); index++)
+					int nearIndex = 0;
+					int farIndex = 0;
+					
+					for (int i = 0; i < posToGenerate.getNumberOfPos(); i++)
 					{
-						if (posToGenerate.getNthDetail(near, true) != 0 && near < posToGenerate.getNumberOfNearPos())
+						// I wish there was a way to compress this code, but I'm not aware of 
+						// an easy way to do so.
+						
+						// add the near positions
+						if (posToGenerate.getNthDetail(nearIndex, true) != 0 && nearIndex < posToGenerate.getNumberOfNearPos())
 						{
-							detailLevel = (byte) (posToGenerate.getNthDetail(near, true) - 1);
-							posX = posToGenerate.getNthPosX(near, true);
-							posZ = posToGenerate.getNthPosZ(near, true);
-							near++;
+							detailLevel = (byte) (posToGenerate.getNthDetail(nearIndex, true) - 1);
+							posX = posToGenerate.getNthPosX(nearIndex, true);
+							posZ = posToGenerate.getNthPosZ(nearIndex, true);
+							nearIndex++;
+							
 							ChunkPos chunkPos = new ChunkPos(LevelPosUtil.getChunkPos(detailLevel, posX), LevelPosUtil.getChunkPos(detailLevel, posZ));
-							if (numberOfChunksWaitingToGenerate.get() < maxChunkGenRequests)
-							{
-								// prevent generating the same chunk multiple times
-								if (positionWaitingToBeGenerated.contains(chunkPos))
-								{
-									continue;
-								}
-							}
-
-							// don't add null chunkPos (which shouldn't happen anyway)
-							// or add more to the generation queue
-							if (chunkPos == null || numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
+							
+							// prevent generating the same chunk multiple times
+							if (positionsWaitingToBeGenerated.contains(chunkPos))
 								continue;
-
-							positionWaitingToBeGenerated.add(chunkPos);
+							
+							// don't add more to the generation queue then allowed
+							if (numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
+								break;
+							
+							positionsWaitingToBeGenerated.add(chunkPos);
 							numberOfChunksWaitingToGenerate.addAndGet(1);
-							LodNodeGenWorker genWorker = new LodNodeGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
+							LodGenWorker genWorker = new LodGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
 							WorldWorkerManager.addWorker(genWorker);
 						}
-
-
-						if (posToGenerate.getNthDetail(far, false) != 0 && far < posToGenerate.getNumberOfFarPos())
+						
+						
+						// add the far positions
+						if (posToGenerate.getNthDetail(farIndex, false) != 0 && farIndex < posToGenerate.getNumberOfFarPos())
 						{
-							detailLevel = (byte) (posToGenerate.getNthDetail(far, false) - 1);
-							posX = posToGenerate.getNthPosX(far, false);
-							posZ = posToGenerate.getNthPosZ(far, false);
-							far++;
+							detailLevel = (byte) (posToGenerate.getNthDetail(farIndex, false) - 1);
+							posX = posToGenerate.getNthPosX(farIndex, false);
+							posZ = posToGenerate.getNthPosZ(farIndex, false);
+							farIndex++;
+							
 							ChunkPos chunkPos = new ChunkPos(LevelPosUtil.getChunkPos(detailLevel, posX), LevelPosUtil.getChunkPos(detailLevel, posZ));
-							if (numberOfChunksWaitingToGenerate.get() < maxChunkGenRequests)
-							{
-								// prevent generating the same chunk multiple times
-								if (positionWaitingToBeGenerated.contains(chunkPos))
-								{
-									continue;
-								}
-							}
-
-							// don't add null chunkPos (which shouldn't happen anyway)
-							// or add more to the generation queue
-							if (chunkPos == null || numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
+							
+							// don't add more to the generation queue then allowed
+							if (numberOfChunksWaitingToGenerate.get() >= maxChunkGenRequests)
 								continue;
-
-							positionWaitingToBeGenerated.add(chunkPos);
+							//break;
+							
+							// prevent generating the same chunk multiple times
+							if (positionsWaitingToBeGenerated.contains(chunkPos))
+								continue;
+							
+							positionsWaitingToBeGenerated.add(chunkPos);
 							numberOfChunksWaitingToGenerate.addAndGet(1);
-							LodNodeGenWorker genWorker = new LodNodeGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
+							LodGenWorker genWorker = new LodGenWorker(chunkPos, DetailDistanceUtil.getDistanceGenerationMode(detailLevel), lodBuilder, lodDim, serverWorld);
 							WorldWorkerManager.addWorker(genWorker);
 						}
 					}
-
-				} catch (Exception e)
+					
+				}
+				catch (Exception e)
 				{
 					// this shouldn't ever happen, but just in case
 					e.printStackTrace();
-				} finally
+				}
+				finally
 				{
 					generatorThreadRunning = false;
 				}
 			});
-
+			
 			mainGenThread.execute(generatorThread);
 		} // if distanceGenerationMode != DistanceGenerationMode.NONE && !generatorThreadRunning
-	}
-
+	} // queueGenerationRequests
+	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.config;

 import java.nio.file.Path;
@@ -26,17 +28,21 @@ import org.apache.logging.log4j.LogManager;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import com.electronwill.nightconfig.core.io.WritingMode;
 import com.seibel.lod.ModInfo;
+import com.seibel.lod.enums.BlockToAvoid;
+import com.seibel.lod.enums.BufferRebuildTimes;
 import com.seibel.lod.enums.DebugMode;
-import com.seibel.lod.enums.DetailDropOff;
 import com.seibel.lod.enums.DistanceGenerationMode;
-import com.seibel.lod.enums.DistanceQualityDropOff;
 import com.seibel.lod.enums.FogDistance;
 import com.seibel.lod.enums.FogDrawOverride;
 import com.seibel.lod.enums.GenerationPriority;
+import com.seibel.lod.enums.GpuUploadMethod;
 import com.seibel.lod.enums.HorizontalQuality;
 import com.seibel.lod.enums.HorizontalResolution;
+import com.seibel.lod.enums.HorizontalScale;
 import com.seibel.lod.enums.LodTemplate;
+import com.seibel.lod.enums.VanillaOverdraw;
 import com.seibel.lod.enums.VerticalQuality;
+import com.seibel.lod.util.LodUtil;

 import net.minecraftforge.common.ForgeConfigSpec;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -45,387 +51,489 @@ import net.minecraftforge.fml.config.ModConfig;

 /**
 * This handles any configuration the user has access to.
- *
 * @author James Seibel
- * @version 9-24-2021
+ * @version 10-23-2021
 */
@Mod.EventBusSubscriber
 public class LodConfig
 {
+	// CONFIG STRUCTURE
+	// 	-> Client
+	//		|
+	//		|-> Graphics
+	//		|		|-> QualityOption
+	//		|		|-> FogQualityOption
+	//		|		|-> AdvancedGraphicsOption
+	//		|
+	//		|-> World Generation
+	//		|
+	//		|-> Advanced Mod Option
+	//				|-> Threads
+	//				|-> Buffers
+	//				|-> Debugging
+	
+	
+	
 	public static class Client
 	{
 		public final Graphics graphics;
 		public final WorldGenerator worldGenerator;
-		public final Threading threading;
-		public final Debugging debugging;
-		public final Buffers buffers;
+		public final AdvancedModOptions advancedModOptions;
 		
+		
+		//================//
+		// Client Configs //
+		//================//
 		public Client(ForgeConfigSpec.Builder builder)
 		{
-			builder.push("client");
+			builder.push(this.getClass().getSimpleName());
 			{
 				graphics = new Graphics(builder);
 				worldGenerator = new WorldGenerator(builder);
-				threading = new Threading(builder);
-				debugging = new Debugging(builder);
-				buffers = new Buffers(builder);
+				advancedModOptions = new AdvancedModOptions(builder);
 			}
 			builder.pop();
 		}
-	}
-	
-	//================//
-	// Client Configs //
-	//================//
-	
-	public static class Graphics
-	{
-		public ForgeConfigSpec.EnumValue<FogDistance> fogDistance;
-		public ForgeConfigSpec.EnumValue<FogDrawOverride> fogDrawOverride;
-		
-		public ForgeConfigSpec.EnumValue<LodTemplate> lodTemplate;
-		
-		public ForgeConfigSpec.EnumValue<HorizontalResolution> drawResolution;
-		
-//		public ForgeConfigSpec.EnumValue<ShadingMode> shadingMode;
-		
-		public ForgeConfigSpec.EnumValue<HorizontalQuality> horizontalQuality;
-		
-		public ForgeConfigSpec.EnumValue<DetailDropOff> detailDropOff;
-		
-		public ForgeConfigSpec.IntValue lodChunkRenderDistance;
-		
-		public ForgeConfigSpec.BooleanValue disableDirectionalCulling;
-		
-		public ForgeConfigSpec.BooleanValue alwaysDrawAtMaxQuality;
 		
 		
-		Graphics(ForgeConfigSpec.Builder builder)
+		//==================//
+		// Graphics Configs //
+		//==================//
+		public static class Graphics
 		{
-			builder.comment("These settings control how the LODs look.").push(this.getClass().getSimpleName());
 			
-			fogDistance = builder
-					.comment("\n\n"
-							+ " At what distance should Fog be drawn on the LODs? \n"
-							+ " If the fog cuts off ubruptly or you are using Optifine's \"fast\" fog option \n"
-							+ " set this to " + FogDistance.NEAR + " or " + FogDistance.FAR + ". \n")
-					.defineEnum("fogDistance", FogDistance.NEAR_AND_FAR);
+			public final QualityOption qualityOption;
+			public final FogQualityOption fogQualityOption;
+			public final AdvancedGraphicsOption advancedGraphicsOption;
 			
-			fogDrawOverride = builder
-					.comment("\n\n"
-							+ " When should fog be drawn? \n"
-							+ " " + FogDrawOverride.USE_OPTIFINE_FOG_SETTING + ": Use whatever Fog setting Optifine is using. If Optifine isn't installed this defaults to " + FogDrawOverride.ALWAYS_DRAW_FOG_FANCY + ". \n"
-							+ " " + FogDrawOverride.NEVER_DRAW_FOG + ": Never draw fog on the LODs \n"
-							+ " " + FogDrawOverride.ALWAYS_DRAW_FOG_FAST + ": Always draw fast fog on the LODs \n"
-							+ " " + FogDrawOverride.ALWAYS_DRAW_FOG_FANCY + ": Always draw fancy fog on the LODs (if your graphics card supports it) \n")
-					.defineEnum("fogDrawOverride", FogDrawOverride.ALWAYS_DRAW_FOG_FANCY);
+			Graphics(ForgeConfigSpec.Builder builder)
+			{
+				builder.comment("These settings control how the mod will look in game").push("Graphics");
+				{
+					qualityOption = new QualityOption(builder);
+					advancedGraphicsOption = new AdvancedGraphicsOption(builder);
+					fogQualityOption = new FogQualityOption(builder);
+				}
+				builder.pop();
+			}
 			
-			lodTemplate = builder
-					.comment("\n\n"
-							+ " How should the LODs be drawn? \n"
-							+ " NOTE: Currently only " + LodTemplate.CUBIC + " is implemented! \n"
-							+ " \n"
-							+ " " + LodTemplate.CUBIC + ": LOD Chunks are drawn as rectangular prisms (boxes). \n"
-							+ " " + LodTemplate.TRIANGULAR + ": LOD Chunks smoothly transition between other. \n"
-							+ " " + LodTemplate.DYNAMIC + ": LOD Chunks smoothly transition between other, \n"
-							+ " " + "         unless a neighboring chunk is at a significantly different height. \n")
-					.defineEnum("lodTemplate", LodTemplate.CUBIC);
 			
-			detailDropOff = builder
-					.comment("\n\n"
-							+ " How smooth should the detail transition for LODs be? \n"
-							+ DetailDropOff.BY_CHUNK + ": quality is determined per-chunk (best quality option, may cause stuttering when moving)\n"
-							+ DetailDropOff.BY_REGION_FANCY + ": quality is determiend per-region (quality option)\n"
-							+ DetailDropOff.BY_REGION_FAST + ": quality is determiend per-region (performance option)\n")
-					.defineEnum("detailDropOff", DetailDropOff.BY_CHUNK);
+			public static class QualityOption
+			{
+				public final ForgeConfigSpec.EnumValue<HorizontalResolution> drawResolution;
+				
+				public final ForgeConfigSpec.IntValue lodChunkRenderDistance;
+				
+				public final ForgeConfigSpec.EnumValue<VerticalQuality> verticalQuality;
+				
+				public final ForgeConfigSpec.EnumValue<HorizontalScale> horizontalScale;
+				
+				public final ForgeConfigSpec.EnumValue<HorizontalQuality> horizontalQuality;
+				
+				
+				QualityOption(ForgeConfigSpec.Builder builder)
+				{
+					builder.comment("These settings control how detailed the fake chunks will be.").push(this.getClass().getSimpleName());
+					
+					verticalQuality = builder
+							.comment("\n\n"
+									+ " This indicates how detailed fake chunks will represent \n"
+									+ " overhangs, caves, floating islands, ect. \n"
+									+ " Higher options will use more memory and increase GPU usage. \n"
+									+ " " + VerticalQuality.LOW + ": uses at max 2 columns per position. \n"
+									+ " " + VerticalQuality.MEDIUM + ": uses at max 4 columns per position. \n"
+									+ " " + VerticalQuality.HIGH + ": uses at max 8 columns per position. \n")
+							.defineEnum("Vertical Quality", VerticalQuality.MEDIUM);
+					
+					horizontalScale = builder
+							.comment("\n\n"
+									+ " This indicates how quickly fake chunks drop off in quality. \n"
+									+ " " + HorizontalScale.LOW + ": quality drops every " + HorizontalScale.LOW.distanceUnit / 16 + " chunks. \n"
+									+ " " + HorizontalScale.MEDIUM + ": quality drops every " + HorizontalScale.MEDIUM.distanceUnit / 16 + " chunks. \n"
+									+ " " + HorizontalScale.HIGH + ": quality drops every " + HorizontalScale.HIGH.distanceUnit / 16 + " chunks. \n")
+							.defineEnum("Horizontal Scale", HorizontalScale.MEDIUM);
+					
+					horizontalQuality = builder
+							.comment("\n\n"
+									+ " This indicates the exponential base of the quadratic drop-off \n"
+									+ " " + HorizontalQuality.LOWEST + ": base " + HorizontalQuality.LOWEST.quadraticBase + ". \n"
+									+ " " + HorizontalQuality.LOW + ": base " + HorizontalQuality.LOW.quadraticBase + ". \n"
+									+ " " + HorizontalQuality.MEDIUM + ": base " + HorizontalQuality.MEDIUM.quadraticBase + ". \n"
+									+ " " + HorizontalQuality.HIGH + ": base " + HorizontalQuality.HIGH.quadraticBase + ". \n")
+							.defineEnum("Horizontal Quality", HorizontalQuality.MEDIUM);
+					
+					drawResolution = builder
+							.comment("\n\n"
+									+ " What is the maximum detail fake chunks should be drawn at? \n"
+									+ " " + HorizontalResolution.CHUNK + ": render 1 LOD for each Chunk. \n"
+									+ " " + HorizontalResolution.HALF_CHUNK + ": render 4 LODs for each Chunk. \n"
+									+ " " + HorizontalResolution.FOUR_BLOCKS + ": render 16 LODs for each Chunk. \n"
+									+ " " + HorizontalResolution.TWO_BLOCKS + ": render 64 LODs for each Chunk. \n"
+									+ " " + HorizontalResolution.BLOCK + ": render 256 LODs for each Chunk. \n")
+							.defineEnum("Block size", HorizontalResolution.BLOCK);
+					
+					lodChunkRenderDistance = builder
+							.comment("\n\n"
+									+ " The mod's render distance, measured in chunks. \n")
+							.defineInRange("Lod Render Distance", 64, 32, 1024);
+					
+					builder.pop();
+				}
+			}
 			
-			drawResolution = builder
-					.comment("\n\n"
-							+ " What is the maximum detail level that LODs should be drawn at? \n"
-							+ " " + HorizontalResolution.CHUNK + ": render 1 LOD for each Chunk. \n"
-							+ " " + HorizontalResolution.HALF_CHUNK + ": render 4 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.FOUR_BLOCKS + ": render 16 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.TWO_BLOCKS + ": render 64 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.BLOCK + ": render 256 LODs for each Chunk. \n")
-					.defineEnum("Draw resolution", HorizontalResolution.BLOCK);
 			
-			horizontalQuality = builder
-					.comment("\n\n"
-							+ " This indicates how quickly LODs drop off in quality. \n"
-							+ " " + HorizontalQuality.LOW + ": quality drops every 4 chunks. \n"
-							+ " " + HorizontalQuality.MEDIUM + ": quality drops every 8 chunks. \n"
-							+ " " + HorizontalQuality.HIGH + ": quality drops every 16 chunks. \n")
-					.defineEnum("lodDrawQuality", HorizontalQuality.MEDIUM);
+			public static class FogQualityOption
+			{
+				public final ForgeConfigSpec.EnumValue<FogDistance> fogDistance;
+				
+				public final ForgeConfigSpec.EnumValue<FogDrawOverride> fogDrawOverride;
+				
+				FogQualityOption(ForgeConfigSpec.Builder builder)
+				{
+					
+					builder.comment("These settings control the fog quality.").push(this.getClass().getSimpleName());
+					
+					fogDistance = builder
+							.comment("\n\n"
+									+ " At what distance should Fog be drawn on the fake chunks? \n"
+									+ " If the fog cuts off abruptly or you are using Optifine's \"fast\" fog option \n"
+									+ " set this to " + FogDistance.NEAR + " or " + FogDistance.FAR + ". \n")
+							.defineEnum("Fog Distance", FogDistance.NEAR_AND_FAR);
+					
+					fogDrawOverride = builder
+							.comment("\n\n"
+									+ " When should fog be drawn? \n"
+									+ " " + FogDrawOverride.OPTIFINE_SETTING + ": Use whatever Fog setting Optifine is using. If Optifine isn't installed this defaults to " + FogDrawOverride.FANCY + ". \n"
+									+ " " + FogDrawOverride.NO_FOG + ": Never draw fog on the LODs \n"
+									+ " " + FogDrawOverride.FAST + ": Always draw fast fog on the LODs \n"
+									+ " " + FogDrawOverride.FANCY + ": Always draw fancy fog on the LODs (if your graphics card supports it) \n")
+							.defineEnum("Fog Draw Override", FogDrawOverride.FANCY);
+					builder.pop();
+				}
+			}
 			
-			lodChunkRenderDistance = builder
-					.comment("\n\n"
-							+ " The mod's render distance, measured in chunks. \n")
-					.defineInRange("lodChunkRenderDistance", 64, 32, 1024);
 			
-			disableDirectionalCulling = builder
-					.comment("\n\n"
-							+ " If false LODs that are behind the player's camera \n"
-							+ " aren't drawn, increasing performance. \n\n"
-							+ ""
-							+ " If true all LODs are drawn, even those behind \n"
-							+ " the player's camera, decreasing performance. \n\n"
-							+ ""
-							+ " Disable this if you see LODs disapearing. \n"
-							+ " (This may happen if you are using a camera mod) \n")
-					.define("disableDirectionalCulling", false);
+			public static class AdvancedGraphicsOption
+			{
+				public final ForgeConfigSpec.EnumValue<LodTemplate> lodTemplate;
+				
+				public final ForgeConfigSpec.BooleanValue disableDirectionalCulling;
+				
+				public final ForgeConfigSpec.BooleanValue alwaysDrawAtMaxQuality;
+				
+				public final ForgeConfigSpec.EnumValue<VanillaOverdraw> vanillaOverdraw;
+				
+				public final ForgeConfigSpec.EnumValue<GpuUploadMethod> gpuUploadMethod;
+				
+				AdvancedGraphicsOption(ForgeConfigSpec.Builder builder)
+				{
+					
+					builder.comment("Advanced graphics option for the mod").push(this.getClass().getSimpleName());
+					
+					lodTemplate = builder
+							.comment("\n\n"
+									+ " How should the LODs be drawn? \n"
+									+ " NOTE: Currently only " + LodTemplate.CUBIC + " is implemented! \n"
+									+ " \n"
+									+ " " + LodTemplate.CUBIC + ": LOD Chunks are drawn as rectangular prisms (boxes). \n"
+									+ " " + LodTemplate.TRIANGULAR + ": LOD Chunks smoothly transition between other. \n"
+									+ " " + LodTemplate.DYNAMIC + ": LOD Chunks smoothly transition between each other, \n"
+									+ " " + "         unless a neighboring chunk is at a significantly different height. \n")
+							.defineEnum("LOD Template", LodTemplate.CUBIC);
+					
+					disableDirectionalCulling = builder
+							.comment("\n\n"
+									+ " If false fake chunks behind the player's camera \n"
+									+ " aren't drawn, increasing performance. \n\n"
+									+ ""
+									+ " If true all LODs are drawn, even those behind \n"
+									+ " the player's camera, decreasing performance. \n\n"
+									+ ""
+									+ " Disable this if you see LODs disappearing. \n"
+									+ " (Which may happen if you are using a camera mod) \n")
+							.define("Disable Directional Culling", false);
+					
+					alwaysDrawAtMaxQuality = builder
+							.comment("\n\n"
+									+ " Disable quality falloff, \n"
+									+ " all fake chunks will be drawn at the highest \n"
+									+ " available detail level. \n\n"
+									+ " "
+									+ " WARNING: \n"
+									+ " This could cause a Out Of Memory crash on render \n"
+									+ " distances higher than 128 \n")
+							.define("Always Use Max Quality", false);
+					
+					vanillaOverdraw = builder
+							.comment("\n\n"
+									+ " How often should LODs be drawn on top of regular chunks? \n"
+									+ " HALF and ALWAYS will prevent holes in the world, but may look odd for transparent blocks or in caves. \n\n"
+									+ " " + VanillaOverdraw.NEVER + ": LODs won't render on top of vanilla chunks. \n"
+									+ " " + VanillaOverdraw.DYNAMIC + ": LODs will render on top of distant vanilla chunks to hide delayed loading. \n"
+									+ " " + "     More effective on higher render distances. \n"
+									+ " " + "     For vanilla render distances less than or equal to " + LodUtil.MINIMUM_RENDER_DISTANCE_FOR_PARTIAL_OVERDRAW + " \n"
+									+ " " + "     " + VanillaOverdraw.NEVER + " or " + VanillaOverdraw.ALWAYS + " may be used depending on the dimension. \n"
+									+ " " + VanillaOverdraw.ALWAYS + ": LODs will render on all vanilla chunks preventing holes in the world. \n"
+									+ " " + VanillaOverdraw.BORDER + ": LODs will render only on the border of vanilla chunks preventing only some holes in the world. \n")
+							.defineEnum("Vanilla Overdraw", VanillaOverdraw.DYNAMIC);
+					
+					gpuUploadMethod = builder
+							.comment("\n\n"
+									+ " What method should be used to upload geometry to the GPU? \n\\n"
+									+ ""
+									+ " " + GpuUploadMethod.BUFFER_STORAGE + ": Default if OpenGL 4.5 is supported. Fast rendering, no stuttering. \n"
+									+ " " + GpuUploadMethod.SUB_DATA + ": Default if OpenGL 4.5 is NOT supported. Fast rendering but may stutter when uploading. \n"
+									+ " " + GpuUploadMethod.BUFFER_MAPPING + ": Slow rendering but won't stutter when uploading. Possibly better than " + GpuUploadMethod.SUB_DATA + " if using a integrated GPU. \n")
+							.defineEnum("GPU Upload Method", GpuUploadMethod.BUFFER_STORAGE);
+					
+					
+					builder.pop();
+				}
+			}
+		}
+		
+		
+		
+		
+		//========================//
+		// WorldGenerator Configs //
+		//========================//
+		public static class WorldGenerator
+		{
+			public final ForgeConfigSpec.EnumValue<GenerationPriority> generationPriority;
+			public final ForgeConfigSpec.EnumValue<DistanceGenerationMode> distanceGenerationMode;
+			public final ForgeConfigSpec.BooleanValue allowUnstableFeatureGeneration;
+			public final ForgeConfigSpec.EnumValue<BlockToAvoid> blockToAvoid;
+			//public final ForgeConfigSpec.BooleanValue useExperimentalPreGenLoading;
 			
-//			shadingMode = builder
-//					.comment("\n\n"
-//							+ " What kind of shading should the LODs have? \n"
-//							+ " \n"
-//							+ " " + ShadingMode.NONE + " \n"
-//							+ " " + "LODs will have the same lighting on every side. \n"
-//							+ " " + "Can make large similarly colored areas hard to differentiate. \n"
-//							+ "\n"
-//							+ " " + ShadingMode.GAME_SHADING + " \n"
-//							+ " " + "LODs will have darker sides and bottoms to simulate Minecraft's flat lighting.")
-//					.defineEnum("lightingMode", ShadingMode.GAME_SHADING);
+			WorldGenerator(ForgeConfigSpec.Builder builder)
+			{
+				builder.comment("These settings control how fake chunks outside your normal view range are generated.").push("Generation");
+				
+				generationPriority = builder
+						.comment("\n\n"
+								+ " " + GenerationPriority.FAR_FIRST + " \n"
+								+ " LODs are generated from low to high detail \n"
+								+ " with a small priority for far away regions. \n"
+								+ " This fills in the world fastest. \n\n"
+								+ ""
+								+ " " + GenerationPriority.NEAR_FIRST + " \n"
+								+ " LODs are generated around the player \n"
+								+ " in a spiral, similar to vanilla minecraft. \n")
+						.defineEnum("Generation Priority", GenerationPriority.FAR_FIRST);
+				
+				distanceGenerationMode = builder
+						.comment("\n\n"
+								+ " Note: The times listed here are the amount of time it took \n"
+								+ "       one of the developer's PC to generate 1 chunk, \n"
+								+ "       and are included so you can compare the \n"
+								+ "       different generation options. Your mileage may vary. \n"
+								+ "\n"
+								
+								+ " " + DistanceGenerationMode.NONE + " \n"
+								+ " Don't run the distance generator. \n"
+								
+								+ "\n"
+								+ " " + DistanceGenerationMode.BIOME_ONLY + " \n"
+								+ " Only generate the biomes and use the biome's \n"
+								+ " grass color, water color, or snow color. \n"
+								+ " Doesn't generate height, everything is shown at sea level. \n"
+								+ " Multithreaded - Fastest (2-5 ms) \n"
+								
+								+ "\n"
+								+ " " + DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT + " \n"
+								+ " Same as BIOME_ONLY, except instead \n"
+								+ " of always using sea level as the LOD height \n"
+								+ " different biome types (mountain, ocean, forest, etc.) \n"
+								+ " use predetermined heights to simulate having height data. \n"
+								+ " Multithreaded - Fastest (2-5 ms) \n"
+								
+								+ "\n"
+								+ " " + DistanceGenerationMode.SURFACE + " \n"
+								+ " Generate the world surface, \n"
+								+ " this does NOT include trees, \n"
+								+ " or structures. \n"
+								+ " Multithreaded - Faster (10-20 ms) \n"
+								
+								+ "\n"
+								+ " " + DistanceGenerationMode.FEATURES + " \n"
+								+ " Generate everything except structures. \n"
+								+ " WARNING: This may cause world generation bugs or instability! \n"
+								+ " Multithreaded - Fast (15-20 ms) \n"
+								
+								+ "\n"
+								+ " " + DistanceGenerationMode.SERVER + " \n"
+								+ " Ask the server to generate/load each chunk. \n"
+								+ " This will show player made structures, which can \n"
+								+ " be useful if you are adding the mod to a pre-existing world. \n"
+								+ " This is the most compatible, but causes server/simulation lag. \n"
+								+ " SingleThreaded - Slow (15-50 ms, with spikes up to 200 ms) \n")
+						.defineEnum("Distance Generation Mode", DistanceGenerationMode.SURFACE);
+				
+				allowUnstableFeatureGeneration = builder
+						.comment("\n\n"
+								+ " When using the " + DistanceGenerationMode.FEATURES + " generation mode \n"
+								+ " some features may not be thread safe, which could \n"
+								+ " cause instability and crashes. \n"
+								+ " By default (false) those features are skipped, \n"
+								+ " improving stability, but decreasing how many features are \n"
+								+ " actually generated. \n"
+								+ " (for example: some tree generation is unstable, \n"
+								+ "               so some trees may not be generated.) \n"
+								+ " By setting this to true, all features will be generated, \n"
+								+ " but your game will be more unstable and crashes may occur. \n"
+								+ " \n"
+								+ " I would love to remove this option and always generate everything, \n"
+								+ " but I'm not sure how to do that. \n"
+								+ " If you are a Java wizard, check out the git issue here: \n"
+								+ " https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/35 \n")
+						.define("Allow Unstable Feature Generation", false);
+				
+				blockToAvoid = builder
+						.comment("\n\n"
+								+ " " + BlockToAvoid.NONE + ": Use all blocks when generating fake chunks \n\n"
+								+ ""
+								+ " " + BlockToAvoid.NON_FULL + ": Only use full blocks when generating fake chunks (ignores slabs, lanterns, torches, grass, etc.) \n\n"
+								+ ""
+								+ " " + BlockToAvoid.NO_COLLISION + ": Only use solid blocks when generating fake chunks (ignores grass, torches, etc.) \n"
+								+ ""
+								+ " " + BlockToAvoid.BOTH + ": Only use full solid blocks when generating fake chunks \n"
+								+ "\n")
+						.defineEnum("Block to avoid", BlockToAvoid.BOTH);
+				
+				/*useExperimentalPreGenLoading = builder
+						 .comment("\n\n"
+								+ " if a chunk has been pre-generated, then the mod would use the real chunk for the \n"
+								+ "fake chunk creation. May require a deletion of the lod file to see the result. \n")
+						 .define("Use pre-generated chunks", false);*/
+				builder.pop();
+			}
+		}
+		
+		
+		
+		
+		//============================//
+		// AdvancedModOptions Configs //
+		//============================//
+		public static class AdvancedModOptions
+		{
 			
-			alwaysDrawAtMaxQuality = builder
-					.comment("\n\n"
-							+ " Disable LOD quality falloff, "
-							+ " all LODs will be drawn at the highest "
-							+ " available detail level. "
-							+ " "
-							+ " WARNING "
-							+ " This could cause a Out Of Memory crash on render "
-							+ " distances higher than 128 \n")
-					.define("alwaysDrawAtMaxQuality", false);
+			public final Threading threading;
+			public final Debugging debugging;
+			public final Buffers buffers;
 			
-			builder.pop();
+			public AdvancedModOptions(ForgeConfigSpec.Builder builder)
+			{
+				builder.comment("Advanced mod settings").push(this.getClass().getSimpleName());
+				{
+					threading = new Threading(builder);
+					debugging = new Debugging(builder);
+					buffers = new Buffers(builder);
+				}
+				builder.pop();
+			}
+			
+			public static class Threading
+			{
+				public final ForgeConfigSpec.IntValue numberOfWorldGenerationThreads;
+				public final ForgeConfigSpec.IntValue numberOfBufferBuilderThreads;
+				
+				Threading(ForgeConfigSpec.Builder builder)
+				{
+					builder.comment("These settings control how many CPU threads the mod uses for different tasks.").push(this.getClass().getSimpleName());
+					
+					numberOfWorldGenerationThreads = builder
+							.comment("\n\n"
+									+ " This is how many threads are used when generating LODs outside \n"
+									+ " the normal render distance. \n"
+									+ " If you experience stuttering when generating distant LODs, decrease \n"
+									+ " this number. If you want to increase LOD generation speed, \n"
+									+ " increase this number. \n\n"
+									+ ""
+									+ " The maximum value is the number of logical processors on your CPU. \n"
+									+ " Requires a restart to take effect. \n")
+							.defineInRange("numberOfWorldGenerationThreads", Math.max(1, Runtime.getRuntime().availableProcessors() / 2), 1, Runtime.getRuntime().availableProcessors());
+					
+					numberOfBufferBuilderThreads = builder
+							.comment("\n\n"
+									+ " This is how many threads are used when building vertex buffers \n"
+									+ " (The things sent to your GPU to draw the fake chunks). \n"
+									+ " If you experience high CPU usage when NOT generating distant \n"
+									+ " fake chunks, lower this number. \n"
+									+ " \n"
+									+ " The maximum value is the number of logical processors on your CPU. \n"
+									+ " Requires a restart to take effect. \n")
+							.defineInRange("numberOfBufferBuilderThreads", Math.max(1, Runtime.getRuntime().availableProcessors() / 2), 1, Runtime.getRuntime().availableProcessors());
+					
+					builder.pop();
+				}
+			}
+
+			
+			
+			
+			//===============//
+			// Debug Options //
+			//===============//
+			public static class Debugging
+			{
+				public final ForgeConfigSpec.BooleanValue drawLods;
+				public final ForgeConfigSpec.EnumValue<DebugMode> debugMode;
+				public final ForgeConfigSpec.BooleanValue enableDebugKeybindings;
+				
+				Debugging(ForgeConfigSpec.Builder builder)
+				{
+					builder.comment("These settings can be used to look for bugs, or see how certain aspects of the mod work.").push(this.getClass().getSimpleName());
+					
+					drawLods = builder
+							.comment("\n\n"
+									+ " If true, the mod is enabled and fake chunks will be drawn. \n"
+									+ " If false, the mod will still generate fake chunks, \n"
+									+ " but they won't be rendered. \n")
+							.define("Disable Drawing", true);
+					
+					debugMode = builder
+							.comment("\n\n"
+									+ " " + DebugMode.OFF + ": Fake chunks will be drawn with their normal colors. \n"
+									+ " " + DebugMode.SHOW_DETAIL + ": Fake chunks color will be based on their detail level. \n"
+									+ " " + DebugMode.SHOW_DETAIL_WIREFRAME + ": Fake chunks color will be based on their detail level, drawn as a wireframe. \n")
+							.defineEnum("Debug Mode", DebugMode.OFF);
+					
+					enableDebugKeybindings = builder
+							.comment("\n\n"
+									+ " If true the F4 key can be used to cycle through the different debug modes. \n"
+									+ " and the F6 key can be used to enable and disable LOD rendering.")
+							.define("Enable Debug Keybinding", false);
+					
+					builder.pop();
+				}
+			}
+			
+			
+			public static class Buffers
+			{
+				public final ForgeConfigSpec.EnumValue<BufferRebuildTimes> rebuildTimes;
+				
+				Buffers(ForgeConfigSpec.Builder builder)
+				{
+					builder.comment("These settings affect how often geometry is are built.").push(this.getClass().getSimpleName());
+					
+					rebuildTimes = builder
+							.comment("\n\n"
+									+ " How frequently should geometry be rebuilt and sent to the GPU? \n"
+									+ " Higher settings may cause stuttering, but will prevent holes in the world \n")
+							.defineEnum("rebuildFrequency", BufferRebuildTimes.NORMAL);
+					
+					builder.pop();
+				}
+			}
 		}
 	}
 	
-	public static class WorldGenerator
-	{
-		public ForgeConfigSpec.EnumValue<VerticalQuality> lodQualityMode;
-		public ForgeConfigSpec.EnumValue<HorizontalResolution> generationResolution;
-		public ForgeConfigSpec.EnumValue<DistanceGenerationMode> distanceGenerationMode;
-		public ForgeConfigSpec.EnumValue<GenerationPriority> generationPriority;
-		public ForgeConfigSpec.BooleanValue allowUnstableFeatureGeneration;
-		public ForgeConfigSpec.EnumValue<DistanceQualityDropOff> lodDistanceCalculatorType;
-		
-		WorldGenerator(ForgeConfigSpec.Builder builder)
-		{
-			builder.comment("These settings control how LODs outside your normal view range are generated.").push(this.getClass().getSimpleName());
-			
-			lodQualityMode = builder
-					.comment("\n\n"
-							+ " Use 3d lods or 2d lods? \n"
-							+ " " + VerticalQuality.HEIGHTMAP + ": LODs are solid from the lowest world point to the highest. Not good for floating islands or caves. Faster \n"
-							+ " " + VerticalQuality.MULTI_LOD + ": LODs have gaps between vertical blocks. Good for floating islands and caves. Slower \n")
-					.defineEnum("lodQualityMode", VerticalQuality.HEIGHTMAP);
-			
-			generationResolution = builder
-					.comment("\n\n"
-							+ " What is the maximum detail level that LODs should be generated at? \n"
-							+ " " + HorizontalResolution.CHUNK + ": render 1 LOD for each Chunk. \n"
-							+ " " + HorizontalResolution.HALF_CHUNK + ": render 4 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.FOUR_BLOCKS + ": render 16 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.TWO_BLOCKS + ": render 64 LODs for each Chunk. \n"
-							+ " " + HorizontalResolution.BLOCK + ": render 256 LODs for each Chunk. \n")
-					.defineEnum("Generation Resolution", HorizontalResolution.BLOCK);
-			
-			lodDistanceCalculatorType = builder
-					.comment("\n\n"
-							+ " " + DistanceQualityDropOff.LINEAR + " \n"
-							+ " with LINEAR calculator the quality of block decrease \n"
-							+ " linearly to the distance of the player \n"
-							
-							                                     + "\n"
-							                                     + " " + DistanceQualityDropOff.QUADRATIC + " \n"
-							                                     + " with QUADRATIC calculator the quality of block decrease \n"
-							                                     + " quadratically to the distance of the player \n")
-					.defineEnum("lodDistanceComputation", DistanceQualityDropOff.LINEAR);
-			
-			generationPriority = builder
-					.comment("\n\n"
-							+ " " + GenerationPriority.FAR_FIRST + " \n"
-							+ " LODs are generated from low to high detail\n"
-							+ " with a small priority for far regions. \n"
-							+ " This fills in the world fastest. \n"
-							
-							                              + "\n"
-							                              + " " + GenerationPriority.NEAR_FIRST + " \n"
-							                              + " LODs are generated around the player \n"
-							                              + " in a spiral, similar to vanilla minecraft. \n")
-					.defineEnum("Generation priority", GenerationPriority.NEAR_FIRST);
-			
-			distanceGenerationMode = builder
-					.comment("\n\n"
-							+ " Note: The times listed here are the amount of time it took \n"
-							+ "       one of the developer's PC to generate 1 chunk, \n"
-							+ "       and are included so you can compare the \n"
-							+ "       different generation options. Your mileage may vary. \n"
-							+ "\n"
-							
-							+ " " + DistanceGenerationMode.NONE + " \n"
-							+ " Don't run the distance generator. \n"
-							
-							+ " " + DistanceGenerationMode.BIOME_ONLY + " \n"
-							+ " Only generate the biomes and use the biome's \n"
-							+ " grass color, water color, or snow color. \n"
-							+ " Doesn't generate height, everything is shown at sea level. \n"
-							+ " Multithreaded - Fastest (2-5 ms) \n"
-							
-							+ "\n"
-							+ " " + DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT + " \n"
-							+ " Same as BIOME_ONLY, except instead \n"
-							+ " of always using sea level as the LOD height \n"
-							+ " different biome types (mountain, ocean, forest, etc.) \n"
-							+ " use predetermined heights to simulate having height data. \n"
-							+ " Multithreaded - Fastest (2-5 ms) \n"
-							
-							+ "\n"
-							+ " " + DistanceGenerationMode.SURFACE + " \n"
-							+ " Generate the world surface, \n"
-							+ " this does NOT include caves, trees, \n"
-							+ " or structures. \n"
-							+ " Multithreaded - Faster (10-20 ms) \n"
-							
-							+ "\n"
-							+ " " + DistanceGenerationMode.FEATURES + " \n"
-							+ " Generate everything except structures. \n"
-							+ " WARNING: This may cause world generation bugs or instability! \n"
-							+ " Multithreaded - Fast (15-20 ms) \n"
-							
-							+ "\n"
-							+ " " + DistanceGenerationMode.SERVER + " \n"
-							+ " Ask the server to generate/load each chunk. \n"
-							+ " This is the most compatible, but causes server/simulation lag. \n"
-							+ " This will show player made structures, which can \n"
-							+ " be useful if you are adding the mod to a pre-existing world. \n"
-							+ " Singlethreaded - Slow (15-50 ms, with spikes up to 200 ms) \n")
-					.defineEnum("distanceGenerationMode", DistanceGenerationMode.SURFACE);
-			
-			allowUnstableFeatureGeneration = builder
-					.comment("\n\n"
-							+ " When using the " + DistanceGenerationMode.FEATURES + " generation mode \n"
-							+ " some features may not be thread safe, which could \n"
-							+ " cause instability and crashes. \n"
-							+ " By default (false) those features are skipped, \n"
-							+ " improving stability, but decreasing how many features are \n"
-							+ " actually generated. \n"
-							+ " (for example: some tree generation is unstable, \n"
-							+ "               so some trees may not be generated.) \n"
-							+ " By setting this to true, all features will be generated, \n"
-							+ " but your game will be more unstable and crashes may occur. \n"
-							+ " \n"
-							+ " I would love to remove this option and always generate everything, \n"
-							+ " but I'm not sure how to do that. \n"
-							+ " If you are a Java wizard, check out the git issue here: \n"
-							+ " https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/35 \n")
-					.define("allowUnstableFeatureGeneration", false);
-			
-			builder.pop();
-		}
-	}
 	
-	public static class Threading
-	{
-		public ForgeConfigSpec.IntValue numberOfWorldGenerationThreads;
-		public ForgeConfigSpec.IntValue numberOfBufferBuilderThreads;
-		
-		Threading(ForgeConfigSpec.Builder builder)
-		{
-			builder.comment("These settings control how many CPU threads the mod uses for different tasks.").push(this.getClass().getSimpleName());
-			
-			numberOfWorldGenerationThreads = builder
-					.comment("\n\n"
-							+ " This is how many threads are used when generating LODs outside \n"
-							+ " the normal render distance. \n"
-							+ " If you experience stuttering when generating distant LODs, decrease \n"
-							+ " this number. If you want to increase LOD generation speed, \n"
-							+ " increase this number. \n"
-							+ " \n"
-							+ " The maximum value is the number of logical processors on your CPU. \n"
-							+ " Requires a restart to take effect. \n")
-					.defineInRange("numberOfWorldGenerationThreads", Runtime.getRuntime().availableProcessors() / 2, 1, Runtime.getRuntime().availableProcessors());
-			
-			numberOfBufferBuilderThreads = builder
-					.comment("\n\n"
-							+ " This is how many threads are used when building vertex buffers \n"
-							+ " (The things sent to your GPU to draw the LODs). \n"
-							+ " If you experience high CPU useage when NOT generating distant \n"
-							+ " LODs, lower this number. \n"
-							+ " \n"
-							+ " The maximum value is the number of logical processors on your CPU. \n"
-							+ " Requires a restart to take effect. \n")
-					.defineInRange("numberOfBufferBuilderThreads", Runtime.getRuntime().availableProcessors(), 1, Runtime.getRuntime().availableProcessors());
-			
-			builder.pop();
-		}
-	}
-	
-	public static class Debugging
-	{
-		public ForgeConfigSpec.EnumValue<DebugMode> debugMode;
-		public ForgeConfigSpec.BooleanValue enableDebugKeybindings;
-		
-		Debugging(ForgeConfigSpec.Builder builder)
-		{
-			builder.comment("These settings can be used to look for bugs, or see how certain aspects of the mod work.").push(this.getClass().getSimpleName());
-			
-			debugMode = builder
-					.comment("\n\n"
-							+ " " + DebugMode.OFF + ": LODs will draw with their normal colors. \n"
-							+ " " + DebugMode.SHOW_DETAIL + ": LOD colors will be based on their detail level. \n"
-							+ " " + DebugMode.SHOW_DETAIL_WIREFRAME + ": LOD colors will be based on their detail level, drawn as a wireframe. \n")
-					.defineEnum("debugMode", DebugMode.OFF);
-			
-			enableDebugKeybindings = builder
-					.comment("\n\n"
-							+ " If true the F4 key can be used to cycle through the different debug modes. \n"
-							+ " and the F6 key can be used to enable and disable LOD rendering.")
-					.define("enableDebugKeybinding", false);
-			
-			builder.pop();
-		}
-	}
-	
-	public static class Buffers
-	{
-		public ForgeConfigSpec.IntValue bufferRebuildPlayerMoveTimeout;
-		public ForgeConfigSpec.IntValue bufferRebuildChunkChangeTimeout;
-		public ForgeConfigSpec.IntValue bufferRebuildLodChangeTimeout;
-		
-		Buffers(ForgeConfigSpec.Builder builder)
-		{
-			builder.comment("These settings affect when Vertex Buffers are built.").push(this.getClass().getSimpleName());
-			
-			bufferRebuildPlayerMoveTimeout = builder
-					.comment("\n\n"
-							+ " How long in milliseconds should we wait to \n"
-							+ " rebuild the vertex buffers when the player moves \n"
-							+ " a chunk or more? \n")
-					.defineInRange("bufferRebuildPlayerMoveTimeout", 2000, 1, 60000);
-			
-			bufferRebuildChunkChangeTimeout = builder
-					.comment("\n\n"
-							+ " How long in milliseconds should we wait to \n"
-							+ " rebuild the vertex buffers when the vanilla rendered \n"
-							+ " chunks change? \n")
-					.defineInRange("bufferRebuildChunkChangeTimeout", 1000, 1, 60000);
-			
-			bufferRebuildLodChangeTimeout = builder
-					.comment("\n\n"
-							+ " How long in milliseconds should we wait to \n"
-							+ " rebuild the vertex buffers when the LOD regions change? \n")
-					.defineInRange("bufferRebuildLodChangeTimeout", 5000, 1, 60000);
-			
-			builder.pop();
-		}
-	}
-	
-	/**
-	 * {@link Path} to the configuration file of this mod
-	 */
-	private static final Path CONFIG_PATH = Paths.get("config", ModInfo.MODID + ".toml");
+	/** {@link Path} to the configuration file of this mod */
+	private static final Path CONFIG_PATH = Paths.get("config", ModInfo.NAME + ".toml");
 	
 	public static final ForgeConfigSpec CLIENT_SPEC;
 	public static final Client CLIENT;
@@ -446,13 +554,13 @@ public class LodConfig
 	@SubscribeEvent
 	public static void onLoad(final ModConfig.Loading configEvent)
 	{
-		LogManager.getLogger().debug(ModInfo.MODNAME, "Loaded forge config file {}", configEvent.getConfig().getFileName());
+		LogManager.getLogger().debug(ModInfo.NAME, "Loaded forge config file {}", configEvent.getConfig().getFileName());
 	}
 	
 	@SubscribeEvent
 	public static void onFileChange(final ModConfig.Reloading configEvent)
 	{
-		LogManager.getLogger().debug(ModInfo.MODNAME, "Forge config just got changed on the file system!");
+		LogManager.getLogger().debug(ModInfo.NAME, "Forge config just got changed on the file system!");
 	}
 	
 }
@@ -0,0 +1,47 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.enums;
+
+/**
+ * heightmap <br>
+ * multi_lod <br>
+ * 
+ * @author Leonardo Amato
+ * @version 19-10-2021
+ */
+public enum BlockToAvoid
+{
+	NONE(false, false),
+	
+	NON_FULL(true, false),
+	
+	NO_COLLISION(false, true),
+	
+	BOTH(true, true);
+	
+	public boolean nonFull;
+	public boolean noCollision;
+	
+	BlockToAvoid(boolean nonFull, boolean noCollision)
+	{
+		this.nonFull = nonFull;
+		this.noCollision = noCollision;
+	}
+}
@@ -0,0 +1,49 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.enums;
+
+/**
+ * Near_First <br>
+ * Far_First <br>
+ * <br>
+ * Determines how fast the buffers need to be regenerated
+ * 
+ * @author Leonardo Amato
+ * @version 9-25-2021
+ */
+public enum BufferRebuildTimes
+{
+	FREQUENT(1000, 500, 2500),
+	
+	NORMAL(2000, 1000, 5000),
+	
+	RARE(5000, 2000, 10000);
+	
+	public final int playerMoveTimeout;
+	public final int renderedChunkTimeout;
+	public final int chunkChangeTimeout;
+	
+	BufferRebuildTimes(int playerMoveTimeout, int renderedChunkTimeout, int chunkChangeTimeout)
+	{
+		this.playerMoveTimeout = playerMoveTimeout;
+		this.renderedChunkTimeout = renderedChunkTimeout;
+		this.chunkChangeTimeout = chunkChangeTimeout;
+	}
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 /**
@@ -25,6 +27,7 @@ package com.seibel.lod.enums;
 */
 public enum DebugMode
 {
+	/** LODs are rendered normally */
 	OFF,
 	
 	/** LOD colors are based on their detail */
@@ -35,7 +38,8 @@ public enum DebugMode
 	
 	/** used when cycling through the different modes */
 	private DebugMode next;
-	static 
+	
+	static
 	{
 		OFF.next = SHOW_DETAIL;
 		SHOW_DETAIL.next = SHOW_DETAIL_WIREFRAME;
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 /**
@@ -26,7 +28,7 @@ package com.seibel.lod.enums;
 * SERVER <br><br>
 * <p>
 * In order of fastest to slowest.
- *
+ * 
 * @author James Seibel
 * @author Leonardo Amato
 * @version 8-7-2021
@@ -37,7 +39,7 @@ public enum DistanceGenerationMode
 	 * Don't generate anything
 	 */
 	NONE((byte) 0),
-
+	
 	/**
 	 * Only generate the biomes and use biome
 	 * grass/foliage color, water color, or ice color
@@ -46,7 +48,7 @@ public enum DistanceGenerationMode
 	 * Multithreaded - Fastest (2-5 ms)
 	 */
 	BIOME_ONLY((byte) 1),
-
+	
 	/**
 	 * Same as BIOME_ONLY, except instead
 	 * of always using sea level as the LOD height
@@ -54,7 +56,7 @@ public enum DistanceGenerationMode
 	 * use predetermined heights to simulate having height data.
 	 */
 	BIOME_ONLY_SIMULATE_HEIGHT((byte) 2),
-
+	
 	/**
 	 * Generate the world surface,
 	 * this does NOT include caves, trees,
@@ -62,7 +64,7 @@ public enum DistanceGenerationMode
 	 * Multithreaded - Faster (10-20 ms)
 	 */
 	SURFACE((byte) 3),
-
+	
 	/**
 	 * Generate everything except structures.
 	 * NOTE: This may cause world generation bugs or instability,
@@ -70,7 +72,7 @@ public enum DistanceGenerationMode
 	 * Multithreaded - Fast (15-20 ms)
 	 */
 	FEATURES((byte) 4),
-
+	
 	/**
 	 * Ask the server to generate/load each chunk.
 	 * This is the most compatible, but causes server/simulation lag.
@@ -79,13 +81,13 @@ public enum DistanceGenerationMode
 	 * Singlethreaded - Slow (15-50 ms, with spikes up to 200 ms)
 	 */
 	SERVER((byte) 5);
-
-
+	
+	
 	/**
 	 * The higher the number the more complete the generation is.
 	 */
 	public final byte complexity;
-
+	
 	DistanceGenerationMode(byte complexity)
 	{
 		this.complexity = complexity;
@@ -1,18 +0,0 @@
-package com.seibel.lod.enums;
-
-/**
- * @author Leonardo Amato
- * @version 22-08-2021
- */
-public enum DistanceQualityDropOff
-{
-	/**
-	 * different Lod detail render and generate linearly to the distance
-	 */
-	LINEAR,
-
-	/**
-	 * different Lod detail render and generate quadratically to the distance
-	 */
-	QUADRATIC,
-}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 /**
@@ -32,5 +34,5 @@ public enum FogDistance
 	FAR,
 	
 	/** only looks good if the fog quality is set to Fancy. */
-	NEAR_AND_FAR;
+	NEAR_AND_FAR
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 /**
@@ -24,20 +26,22 @@ package com.seibel.lod.enums;
 * ALWAYS_DRAW_FOG_FANCY <br>
 * 
 * @author James Seibel
- * @version 7-03-2021
+ * @version 7-3-2021
 */
 public enum FogDrawOverride
 {
-	/** Use whatever Fog setting optifine is using.
-	 * If optifine isn't installed this defaults to ALWAYS_DRAW_FOG. */
-	USE_OPTIFINE_FOG_SETTING,
+	/**
+	 * Use whatever Fog setting optifine is using.
+	 * If optifine isn't installed this defaults to ALWAYS_DRAW_FOG.
+	 */
+	OPTIFINE_SETTING,
 	
 	/** Never draw fog on the LODs */
-	NEVER_DRAW_FOG,
+	NO_FOG,
 	
-	/** Always draw fog on the LODs */
-	ALWAYS_DRAW_FOG_FAST,
+	/** Always draw fast fog on the LODs */
+	FAST,
 	
-	/** Always draw fog on the LODs */
-	ALWAYS_DRAW_FOG_FANCY;
+	/** Always draw fancy fog on the LODs */
+	FANCY
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 /**
@@ -27,5 +29,5 @@ public enum FogQuality
 {
 	FAST,
 	FANCY,
-	OFF;
+	OFF
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,15 +16,22 @@
 *    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.enums;

 /**
- * @author James Seibel
+ * Near_First <br>
+ * Far_First <br>
+ * <br>
+ * Determines which LODs should have priority when generating
+ * outside the normal view distance.
+ * 
 * @author Leonardo Amato
+ * @version 9-25-2021
 */
 public enum GenerationPriority
 {
 	NEAR_FIRST,
-
-	FAR_FIRST;
+	
+	FAR_FIRST
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,14 +16,23 @@
 *    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.enums;

 /**
- *
+ * Minecraft, Lod_Builder, None
+ * 
+ * @author James Seibel
+ * @version 10-1-2021
 */
-public enum DetailDropOff
+public enum GlProxyContext
 {
-	BY_REGION_FAST,
-	BY_REGION_FANCY,
-	BY_CHUNK,
-}
+	/** Minecraft's render thread */
+	MINECRAFT,
+	
+	/** The context we send buffers to the GPU on */
+	LOD_BUILDER,
+	
+	/** used to un-bind threads */
+	NONE,
+}
@@ -0,0 +1,38 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.enums;
+
+/**
+ * Buffer_Storage, Sub_Data, Buffer_Mapping
+ * 
+ * @author James Seibel
+ * @version 10-23-2021
+ */
+public enum GpuUploadMethod
+{
+	/** Default if OpenGL 4.5 is supported. Fast rendering, no stuttering. */
+	BUFFER_STORAGE,
+	
+	/** Default if OpenGL 4.5 is NOT supported. Fast rendering but may stutter when uploading. */
+	SUB_DATA,
+	
+	/** May end up storing buffers in System memory. Slower rendering but won't stutter when uploading. */
+	BUFFER_MAPPING,
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,32 +16,38 @@
 *    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.enums;

 /**
- * USE_OPTIFINE_FOG_SETTING, <br>
- * NEVER_DRAW_FOG, <br>
- * ALWAYS_DRAW_FOG_FAST, <br>
- * ALWAYS_DRAW_FOG_FANCY <br>
- *
- * @author James Seibel
- * @version 7-03-2021
+ * Lowest <br>
+ * Low <br>
+ * Medium <br>
+ * High <br>
+ * <br>
+ * this indicates the base of the quadratic function we use for the quality drop off
+ * 
+ * @author Leonardo Amato
+ * @version 9-29-2021
 */
 public enum HorizontalQuality
 {
-	/** Lods are 2D with heightMap */
-	LOW(64),
-
-	/** Lods expand in three dimension */
-	MEDIUM(128),
-
-	/** Lods expand in three dimension */
-	HIGH(256);
-
-	public int distanceUnit;
-
-	HorizontalQuality(int distanceUnit)
+	/** 1.0 AKA Linear */
+	LOWEST(1.0f),
+	
+	/** exponent 1.5 */
+	LOW(1.5f),
+	
+	/** exponent 2.0 */
+	MEDIUM(2.0f),
+	
+	/** exponent 2.2 */
+	HIGH(2.2f);
+	
+	public final double quadraticBase;
+	
+	HorizontalQuality(double distanceUnit)
 	{
-		this.distanceUnit = distanceUnit;
+		this.quadraticBase = distanceUnit;
 	}
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.enums;

 import java.util.ArrayList;
@@ -23,35 +25,50 @@ import java.util.Collections;
 import com.seibel.lod.util.LodUtil;

 /**
- * single, double, quad, half, full
+ * chunk <Br>
+ * half_chunk <Br>
+ * four_blocks <br>
+ * two_blocks <Br>
+ * block <br>
 * 
 * @author James Seibel
- * @version 8-11-2021
+ * @author Leonardo Amato
+ * @version 9-25-2021
 */
 public enum HorizontalResolution
 {
-	/** render 1 LOD for each chunk */
-	CHUNK(1, 4),
-	
-	/** render 4 LODs for each chunk */
-	HALF_CHUNK(2, 3),
-	
-	/** render 16 LODs for each chunk */
-	FOUR_BLOCKS(4, 2),
+	/** render 256 LODs for each chunk */
+	BLOCK(16, 0),
 	
 	/** render 64 LODs for each chunk */
 	TWO_BLOCKS(8, 1),
 	
-	/** render 256 LODs for each chunk */
-	BLOCK(16, 0);
-
-	/** How many DataPoints should 
-	 * be drawn per side per LodChunk */
+	/** render 16 LODs for each chunk */
+	FOUR_BLOCKS(4, 2),
+	
+	/** render 4 LODs for each chunk */
+	HALF_CHUNK(2, 3),
+	
+	/** render 1 LOD for each chunk */
+	CHUNK(1, 4);
+	
+	
+	
+	
+	
+	/**
+	 * How many DataPoints should
+	 * be drawn per side, per LodChunk
+	 */
 	public final int dataPointLengthCount;
+	
 	/** How wide each LOD DataPoint is */
 	public final int dataPointWidth;
-	/** This is the same as detailLevel in LodQuadTreeNode, 
-	 * lowest is 0 highest is 9 */
+	
+	/**
+	 * This is the same as detailLevel in LodQuadTreeNode,
+	 * lowest is 0 highest is 9
+	 */
 	public final byte detailLevel;
 	
 	/* Start/End X/Z give the block positions
@@ -61,19 +78,19 @@ public enum HorizontalResolution
 	
 	public final int[] endX;
 	public final int[] endZ;
-
 	
-	/** 
+	
+	/**
 	 * 1st dimension: LodDetail.detailLevel <br>
 	 * 2nd dimension: An array of all LodDetails that are less than or <br>
-	 *                equal to that detailLevel
+	 * equal to that detailLevel
 	 */
 	private static HorizontalResolution[][] lowerDetailArrays;
 	
 	
 	
 	
-	private HorizontalResolution(int newLengthCount, int newDetailLevel)
+	HorizontalResolution(int newLengthCount, int newDetailLevel)
 	{
 		detailLevel = (byte) newDetailLevel;
 		dataPointLengthCount = newLengthCount;
@@ -87,15 +104,15 @@ public enum HorizontalResolution
 		
 		
 		int index = 0;
-		for(int x = 0; x < newLengthCount; x++)
+		for (int x = 0; x < newLengthCount; x++)
 		{
-			for(int z = 0; z < newLengthCount; z++)
+			for (int z = 0; z < newLengthCount; z++)
 			{
 				startX[index] = x * dataPointWidth;
 				startZ[index] = z * dataPointWidth;
 				
-				endX[index] = (x*dataPointWidth) + dataPointWidth;
-				endZ[index] = (z*dataPointWidth) + dataPointWidth;
+				endX[index] = (x * dataPointWidth) + dataPointWidth;
+				endZ[index] = (z * dataPointWidth) + dataPointWidth;
 				
 				index++;
 			}
@@ -108,7 +125,7 @@ public enum HorizontalResolution
 	
 	
 	
-	/** 
+	/**
 	 * Returns an array of all LodDetails that have a detail level
 	 * that is less than or equal to the given LodDetail
 	 */
@@ -120,12 +137,12 @@ public enum HorizontalResolution
 			lowerDetailArrays = new HorizontalResolution[HorizontalResolution.values().length][];
 			
 			// go through each LodDetail
-			for(HorizontalResolution currentDetail : HorizontalResolution.values())
+			for (HorizontalResolution currentDetail : HorizontalResolution.values())
 			{
 				ArrayList<HorizontalResolution> lowerDetails = new ArrayList<>();
 				
 				// find the details lower than currentDetail
-				for(HorizontalResolution compareDetail : HorizontalResolution.values())
+				for (HorizontalResolution compareDetail : HorizontalResolution.values())
 				{
 					if (currentDetail.detailLevel <= compareDetail.detailLevel)
 					{
@@ -148,8 +165,8 @@ public enum HorizontalResolution
 	public static HorizontalResolution getDetailForDistance(HorizontalResolution maxDetailLevel, int distance, int maxDistance)
 	{
 		HorizontalResolution[] lowerDetails = getSelfAndLowerDetails(maxDetailLevel);
-		int distaneBetweenDetails = maxDistance / lowerDetails.length;
-		int index = LodUtil.clamp(0, distance / distaneBetweenDetails, lowerDetails.length - 1);
+		int distanceBetweenDetails = maxDistance / lowerDetails.length;
+		int index = LodUtil.clamp(0, distance / distanceBetweenDetails, lowerDetails.length - 1);
 		
 		return lowerDetails[index];
 		
@@ -0,0 +1,49 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.enums;
+
+/**
+ * Low <br>
+ * Medium <br>
+ * High <br>
+ * <br>
+ * this is a quality scale for the detail drop-off
+ * 
+ * @author Leonardo Amato
+ * @version 9-25-2021
+ */
+public enum HorizontalScale
+{
+	/** Lods are 2D with heightMap */
+	LOW(64),
+	
+	/** Lods expand in three dimension */
+	MEDIUM(128),
+	
+	/** Lods expand in three dimension */
+	HIGH(256);
+	
+	public final int distanceUnit;
+	
+	HorizontalScale(int distanceUnit)
+	{
+		this.distanceUnit = distanceUnit;
+	}
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,47 +16,47 @@
 *    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.enums;

-import com.seibel.lod.builders.lodTemplates.AbstractLodTemplate;
-import com.seibel.lod.builders.lodTemplates.CubicLodTemplate;
-import com.seibel.lod.builders.lodTemplates.DynamicLodTemplate;
-import com.seibel.lod.builders.lodTemplates.TriangularLodTemplate;
+import com.seibel.lod.builders.bufferBuilding.lodTemplates.AbstractLodTemplate;
+import com.seibel.lod.builders.bufferBuilding.lodTemplates.CubicLodTemplate;
+import com.seibel.lod.builders.bufferBuilding.lodTemplates.DynamicLodTemplate;
+import com.seibel.lod.builders.bufferBuilding.lodTemplates.TriangularLodTemplate;

 /**
 * Cubic, Triangular, Dynamic
 * 
 * @author James Seibel
- * @version 8-4-2021
+ * @version 10-10-2021
 */
 public enum LodTemplate
 {
-	// used for position
-
-	/** Chunks are rendered as
-	 * rectangular prisms. */
+	/**
+	 * LODs are rendered as
+	 * rectangular prisms.
+	 */
 	CUBIC(new CubicLodTemplate()),
 	
-	/** Chunks smoothly transition between
-	 * each other. */
+	/**
+	 * LODs smoothly transition between
+	 * each other.
+	 */
 	TRIANGULAR(new TriangularLodTemplate()),
 	
-	/** Chunks smoothly transition between
-	 * each other, unless a neighboring chunk
-	 * is at a significantly different height. */
+	/**
+	 * LODs smoothly transition between
+	 * each other, unless a neighboring LOD
+	 * is at a significantly different height.
+	 */
 	DYNAMIC(new DynamicLodTemplate());
 	
 	
 	public final AbstractLodTemplate template;
 	
-	private LodTemplate(AbstractLodTemplate newTemplate)
+	LodTemplate(AbstractLodTemplate newTemplate)
 	{
 		template = newTemplate;
 	}
 	
-	
-	public int getBufferMemoryForSingleLod(int maxVerticalData)
-	{
-		return template.getBufferMemoryForSingleNode(maxVerticalData);
-	}
 }
@@ -1,18 +1,22 @@
 package com.seibel.lod.enums;

 /**
- * NONE, DARKEN_SIDES
+ * NONE, GAME_SHADING
 * 
 * @author James Seibel
 * @version 7-25-2020
 */
 public enum ShadingMode
 {
-	/** LODs will have the same lighting on every side.
-	Fastest, but can make large similarly colored areas hard to differentiate */
-	NONE,
+	/**
+	 * LODs will have darker sides and bottoms to simulate
+	 * Minecraft's fast lighting.
+	 */
+	GAME_SHADING,
 	
-	/** LODs will have darker sides and bottoms to simulate top down lighting.
-	Fastest */
-	GAME_SHADING;
+	/**
+	 * LODs will use ambient occlusion to mimic Minecarft's
+	 * Fancy lighting.
+	 */
+	AMBIENT_OCCLUSION
 }
@@ -0,0 +1,45 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.enums;
+
+/**
+ * None, Dynamic, Always
+ *
+ * <p>
+ * This represents how far the LODs should overlap with
+ * the vanilla Minecraft terrain.
+ * 
+ * @author James Seibel
+ * @version 10-11-2021
+ */
+public enum VanillaOverdraw
+{
+	/** Never draw LODs where a minecraft chunk could be. */
+	NEVER,
+	
+	/** Draw LODs over the farther minecraft chunks. */
+	DYNAMIC,
+	
+	/** Draw LODs over all minecraft chunks. */
+	ALWAYS,
+	
+	/** Draw LODs over border chunks. */
+	BORDER,
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,22 +16,65 @@
 *    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.enums;

 /**
- * USE_OPTIFINE_FOG_SETTING, <br>
- * NEVER_DRAW_FOG, <br>
- * ALWAYS_DRAW_FOG_FAST, <br>
- * ALWAYS_DRAW_FOG_FANCY <br>
- *
- * @author James Seibel
- * @version 7-03-2021
+ * heightmap <br>
+ * multi_lod <br>
+ * 
+ * @author Leonardo Amato
+ * @version 10-07-2021
 */
 public enum VerticalQuality
 {
-	/** Lods are 2D with heightMap */
-	HEIGHTMAP,
-
-	/** Lods expand in three dimension */
-	MULTI_LOD;
+	LOW(
+			new int[] { 2,
+					2,
+					2,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1 }
+	),
+	
+	MEDIUM(
+			new int[] { 4,
+					4,
+					2,
+					2,
+					2,
+					1,
+					1,
+					1,
+					1,
+					1,
+					1 }
+	),
+	
+	HIGH(
+			new int[] {
+					8,
+					8,
+					4,
+					4,
+					2,
+					2,
+					2,
+					1,
+					1,
+					1,
+					1 }
+	);
+	
+	public final int[] maxVerticalData;
+	
+	VerticalQuality(int[] maxVerticalData)
+	{
+		this.maxVerticalData = maxVerticalData;
+	}
 }
@@ -0,0 +1,74 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.handlers;
+
+import java.io.File;
+
+import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.wrappers.MinecraftWrapper;
+
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.chunk.IChunk;
+import net.minecraft.world.chunk.storage.ChunkSerializer;
+import net.minecraft.world.server.ServerWorld;
+
+/**
+ * 
+ * @author ??
+ * @version ??
+ */
+public class ChunkLoader
+{
+	public static IChunk getChunkFromFile(ChunkPos pos){
+		
+		ClientWorld clientWorld = MinecraftWrapper.INSTANCE.getClientWorld();
+		if (clientWorld == null)
+			return null;
+		ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(clientWorld.dimensionType());
+		try
+		{
+			File file = new File(serverWorld.getChunkSource().getDataStorage().dataFolder.getParent() + File.separatorChar + "region", "r." + (pos.x >> 5) + "." + (pos.z >> 5) + ".mca");
+			if(!file.exists())
+				return  null;
+			IChunk loadedChunk = ChunkSerializer.read(
+					serverWorld,
+					serverWorld.getStructureManager(),
+					serverWorld.getPoiManager(),
+					pos,
+					serverWorld.getChunkSource().chunkMap.read(pos)
+			);
+			boolean emptyChunk = true;
+			for(int i = 0; i < 16; i++){
+				for(int j = 0; j < 16; j++){
+					emptyChunk &= loadedChunk.isYSpaceEmpty(i,j);
+				}
+			}
+			if(emptyChunk)
+				return null;
+			else
+				return loadedChunk;
+		}
+		catch (Exception e)
+		{
+			return null;
+		}
+	}
+}
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,57 +16,55 @@
 *    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.handlers;

-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

+import org.apache.commons.compress.compressors.xz.XZCompressorInputStream;
+import org.apache.commons.compress.compressors.xz.XZCompressorOutputStream;
+
 import com.seibel.lod.enums.DistanceGenerationMode;
 import com.seibel.lod.enums.VerticalQuality;
-import com.seibel.lod.objects.*;
+import com.seibel.lod.objects.LodDimension;
+import com.seibel.lod.objects.LodRegion;
+import com.seibel.lod.objects.RegionPos;
+import com.seibel.lod.objects.VerticalLevelContainer;
 import com.seibel.lod.proxy.ClientProxy;
 import com.seibel.lod.util.LodThreadFactory;
 import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.util.ThreadMapUtil;

 /**
 * This object handles creating LodRegions
 * from files and saving LodRegion objects
 * to file.
- *
+ * 
 * @author James Seibel
- * @version 9-7-2021
+ * @author Cola
+ * @version 9-25-2021
 */
 public class LodDimensionFileHandler
 {
-
-	private LodDimension loadedDimension = null;
-	public long regionLastWriteTime[][];
-
-	private File dimensionDataSaveFolder;
-
-	/**
-	 * lod
-	 */
+	/** This is the dimension that owns this file handler */
+	private LodDimension lodDimension;
+	
+	private final File dimensionDataSaveFolder;
+	
+	/** lod */
 	private static final String FILE_NAME_PREFIX = "lod";
-	/**
-	 * .txt
-	 */
-	private static final String FILE_EXTENSION = ".dat";
-	/**
-	 * detail-#
-	 */
+	/** .txt */
+	private static final String FILE_EXTENSION = ".xz";
+	/** detail- */
 	private static final String DETAIL_FOLDER_NAME_PREFIX = "detail-";
-
+	
 	/**
 	 * .tmp <br>
 	 * Added to the end of the file path when saving to prevent
@@ -74,135 +73,169 @@ public class LodDimensionFileHandler
 	 * FILE_EXTENSION.
 	 */
 	private static final String TMP_FILE_EXTENSION = ".tmp";
-
+	
 	/**
 	 * This is the file version currently accepted by this
 	 * file handler, older versions (smaller numbers) will be deleted and overwritten,
 	 * newer versions (larger numbers) will be ignored and won't be read.
 	 */
 	public static final int LOD_SAVE_FILE_VERSION = 6;
-
+	
 	/**
 	 * Allow saving asynchronously, but never try to save multiple regions
 	 * at a time
 	 */
-	private ExecutorService fileWritingThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName()));
-
-
-	public LodDimensionFileHandler(File newSaveFolder, LodDimension newLoadedDimension)
+	private final ExecutorService fileWritingThreadPool = Executors.newSingleThreadExecutor(new LodThreadFactory(this.getClass().getSimpleName()));
+	
+	
+	
+	
+	public LodDimensionFileHandler(File newSaveFolder, LodDimension newLodDimension)
 	{
 		if (newSaveFolder == null)
 			throw new IllegalArgumentException("LodDimensionFileHandler requires a valid File location to read and write to.");
-
+		
 		dimensionDataSaveFolder = newSaveFolder;
-
-		loadedDimension = newLoadedDimension;
-		// these two variable are used in sync with the LodDimension
-		regionLastWriteTime = new long[loadedDimension.getWidth()][loadedDimension.getWidth()];
-		for (int i = 0; i < loadedDimension.getWidth(); i++)
-			for (int j = 0; j < loadedDimension.getWidth(); j++)
-				regionLastWriteTime[i][j] = -1;
+		lodDimension = newLodDimension;
 	}
-
-
+	
+	
+	
 	//================//
 	// read from file //
 	//================//
-
+	
 	/**
-	 * Return the LodRegion region at the given coordinates.
-	 * (null if the file doesn't exist)
+	 * Returns the LodRegion at the given coordinates.
+	 * Returns an empty region if the file doesn't exist.
 	 */
 	public LodRegion loadRegionFromFile(byte detailLevel, RegionPos regionPos, DistanceGenerationMode generationMode, VerticalQuality verticalQuality)
 	{
 		int regionX = regionPos.x;
 		int regionZ = regionPos.z;
-		LodRegion region = new LodRegion(LodUtil.REGION_DETAIL_LEVEL,regionPos, generationMode, verticalQuality);
+		LodRegion region = new LodRegion(LodUtil.REGION_DETAIL_LEVEL, regionPos, generationMode, verticalQuality);
+		
 		for (byte tempDetailLevel = LodUtil.REGION_DETAIL_LEVEL; tempDetailLevel >= detailLevel; tempDetailLevel--)
 		{
 			String fileName = getFileNameAndPathForRegion(regionX, regionZ, generationMode, tempDetailLevel, verticalQuality);
-
+			
 			try
 			{
 				// if the fileName was null that means the folder is inaccessible
 				// for some reason
 				if (fileName == null)
 					throw new IllegalArgumentException("Unable to read region [" + regionX + ", " + regionZ + "] file, no fileName.");
-
-
-				File f = new File(fileName);
-
-				if (!f.exists())
+				
+				File file = new File(fileName);
+				if (!file.exists())
 				{
-					// there wasn't a file, don't
-					// return anything
-					continue;
+					//there is no file for current gen mode
+					//search others above current from the most to the least detailed
+					DistanceGenerationMode tempGenMode = DistanceGenerationMode.SERVER;
+					while (tempGenMode != generationMode)
+					{
+						fileName = getFileNameAndPathForRegion(regionX, regionZ, tempGenMode, tempDetailLevel, verticalQuality);
+						if (fileName != null)
+						{
+							file = new File(fileName);
+							if (file.exists())
+								break;
+						}
+						//decrease gen mode
+						if (tempGenMode == DistanceGenerationMode.SERVER)
+							tempGenMode = DistanceGenerationMode.FEATURES;
+						else if (tempGenMode == DistanceGenerationMode.FEATURES)
+							tempGenMode = DistanceGenerationMode.SURFACE;
+						else if (tempGenMode == DistanceGenerationMode.SURFACE)
+							tempGenMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
+						else if (tempGenMode == DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT)
+							tempGenMode = DistanceGenerationMode.BIOME_ONLY;
+						else if (tempGenMode == DistanceGenerationMode.BIOME_ONLY)
+							tempGenMode = DistanceGenerationMode.NONE;
+					}
+					if (!file.exists())
+						//there wasn't a file, don't return anything
+						continue;
 				}
-				byte[] data = {0};
-				long dataSize = f.length();
+				
+				
+				
+				// don't try parsing empty files
+				long dataSize = file.length();
 				dataSize -= 1;
-				if (dataSize > 0) {
-					try (InputStream inputStream = new BufferedInputStream(new FileInputStream(f))) {
-						int fileVersion = -1;
+				if (dataSize > 0)
+				{
+					try (XZCompressorInputStream inputStream = new XZCompressorInputStream(new FileInputStream(file)))
+					{
+						int fileVersion;
 						fileVersion = inputStream.read();
+						
 						// check if this file can be read by this file handler
-						if (fileVersion < LOD_SAVE_FILE_VERSION) {
+						if (fileVersion < LOD_SAVE_FILE_VERSION)
+						{
 							// the file we are reading is an older version,
 							// close the reader and delete the file.
 							inputStream.close();
-							f.delete();
-							ClientProxy.LOGGER.info("Outdated LOD region file for region: (" + regionX + "," + regionZ + ") version found: " + fileVersion +
-									", version requested: " + LOD_SAVE_FILE_VERSION +
-									" File was been deleted.");
-
-							break;
-						} else if (fileVersion > LOD_SAVE_FILE_VERSION) {
-							// the file we are reading is a newer version,
-							// close the reader and ignore the file, we don't
-							// want to accidently delete anything the user may want.
-							inputStream.close();
-							ClientProxy.LOGGER.info("Newer LOD region file for region: (" + regionX + "," + regionZ + ") version found: " + fileVersion +
-									", version requested: " + LOD_SAVE_FILE_VERSION +
-									" this region will not be written to in order to protect the newer file.");
-
+							file.delete();
+							ClientProxy.LOGGER.info("Outdated LOD region file for region: (" + regionX + "," + regionZ + ")"
+									+ " version found: " + fileVersion
+									+ ", version requested: " + LOD_SAVE_FILE_VERSION
+									+ ". File was been deleted.");
+							
 							break;
 						}
-						// this file is a readable version, begin reading the file
-						data = new byte[(int) dataSize];
+						else if (fileVersion > LOD_SAVE_FILE_VERSION)
+						{
+							// the file we are reading is a newer version,
+							// close the reader and ignore the file, we don't
+							// want to accidentally delete anything the user may want.
+							inputStream.close();
+							ClientProxy.LOGGER.info("Newer LOD region file for region: (" + regionX + "," + regionZ + ")"
+									+ " version found: " + fileVersion
+									+ ", version requested: " + LOD_SAVE_FILE_VERSION
+									+ " this region will not be written to in order to protect the newer file.");
+							
+							break;
+						}
+						
+						
+						// this file is a readable version, 
+						// read the file
+						byte[] data = ThreadMapUtil.getSaveContainer(tempDetailLevel);
 						inputStream.read(data);
 						inputStream.close();
-					} catch (IOException ex) {
-						ex.printStackTrace();
+						
+						
+						// add the data to our region
+						region.addLevelContainer(new VerticalLevelContainer(data));
+					}
+					catch (IOException ioEx)
+					{
+						ClientProxy.LOGGER.error("LOD file read error. Unable to read to [" + fileName + "] error [" + ioEx.getMessage() + "]: ");
+						ioEx.printStackTrace();
 					}
 				}
-				switch (region.getLodQualityMode()){
-					default:
-					case HEIGHTMAP:
-						region.addLevel(new SingleLevelContainer(data));
-						break;
-					case MULTI_LOD:
-						region.addLevel(new VerticalLevelContainer(data));
-						break;
-				}
-				//region.addLevel(new SingleLevelContainer(data));
-			} catch (Exception e)
+			}
+			catch (Exception e)
 			{
 				// the buffered reader encountered a
 				// problem reading the file
 				ClientProxy.LOGGER.error("LOD file read error. Unable to read to [" + fileName + "] error [" + e.getMessage() + "]: ");
 				e.printStackTrace();
 			}
-		}
+		}// for each detail level
+		
 		if (region.getMinDetailLevel() >= detailLevel)
-			region.expand(detailLevel);
+			region.growTree(detailLevel);
+		
 		return region;
 	}
-
-
+	
+	
 	//==============//
 	// Save to File //
 	//==============//
-
+	
 	/**
 	 * Save all dirty regions in this LodDimension to file.
 	 */
@@ -210,28 +243,29 @@ public class LodDimensionFileHandler
 	{
 		fileWritingThreadPool.execute(saveDirtyRegionsThread);
 	}
-
-	private Thread saveDirtyRegionsThread = new Thread(() ->
+	
+	private final Thread saveDirtyRegionsThread = new Thread(() ->
 	{
 		try
 		{
-			for (int i = 0; i < loadedDimension.getWidth(); i++)
+			for (int i = 0; i < lodDimension.getWidth(); i++)
 			{
-				for (int j = 0; j < loadedDimension.getWidth(); j++)
+				for (int j = 0; j < lodDimension.getWidth(); j++)
 				{
-					if (loadedDimension.isRegionToRegen(i,j) && loadedDimension.getRegionByArrayIndex(i,j) != null)
+					if (lodDimension.GetIsRegionDirty(i, j) && lodDimension.getRegionByArrayIndex(i, j) != null)
 					{
-						saveRegionToFile(loadedDimension.getRegionByArrayIndex(i,j));
-						loadedDimension.setRegenByArrayIndex(i, j,false);
+						saveRegionToFile(lodDimension.getRegionByArrayIndex(i, j));
+						lodDimension.SetIsRegionDirty(i, j, false);
 					}
 				}
 			}
-		} catch (Exception e)
+		}
+		catch (Exception e)
 		{
 			e.printStackTrace();
 		}
 	});
-
+	
 	/**
 	 * Save a specific region to disk.<br>
 	 * Note: <br>
@@ -242,23 +276,20 @@ public class LodDimensionFileHandler
 	 */
 	private void saveRegionToFile(LodRegion region)
 	{
-		// convert to region coordinates
-		int x = region.regionPosX;
-		int z = region.regionPosZ;
 		for (byte detailLevel = region.getMinDetailLevel(); detailLevel <= LodUtil.REGION_DETAIL_LEVEL; detailLevel++)
 		{
-			String fileName = getFileNameAndPathForRegion(x, z, region.getGenerationMode(), detailLevel, region.getLodQualityMode());
-			File oldFile = new File(fileName);
-
+			String fileName = getFileNameAndPathForRegion(region.regionPosX, region.regionPosZ, region.getGenerationMode(), detailLevel, region.getVerticalQuality());
+			
 			// if the fileName was null that means the folder is inaccessible
 			// for some reason
 			if (fileName == null)
 			{
-				ClientProxy.LOGGER.warn("Unable to save region [" + x + ", " + z + "] to file, no fileName.");
+				ClientProxy.LOGGER.warn("Unable to save region [" + region.regionPosX + ", " + region.regionPosZ + "] to file, file is inaccessible.");
 				return;
 			}
-
-
+			File oldFile = new File(fileName);
+			//ClientProxy.LOGGER.info("saving region [" + region.regionPosX + ", " + region.regionPosZ + "] to file.");
+			
 			try
 			{
 				// make sure the file and folder exists
@@ -269,90 +300,102 @@ public class LodDimensionFileHandler
 					if (!oldFile.getParentFile().exists())
 						oldFile.getParentFile().mkdirs();
 					oldFile.createNewFile();
-				} else
+				}
+				else
 				{
 					// the file exists, make sure it
 					// is the correct version.
 					// (to make sure we don't overwrite a newer
 					// version file if it exists)
 					int fileVersion = LOD_SAVE_FILE_VERSION;
-					try (InputStream inputStream = new BufferedInputStream(new FileInputStream(oldFile))) {
+					try (XZCompressorInputStream inputStream = new XZCompressorInputStream(new FileInputStream(oldFile)))
+					{
 						fileVersion = inputStream.read();
 						inputStream.close();
-					} catch (IOException ex) {
+					}
+					catch (IOException ex)
+					{
 						ex.printStackTrace();
 					}
+					
 					// check if this file can be written to by the file handler
-					if (fileVersion > LOD_SAVE_FILE_VERSION) {
+					if (fileVersion > LOD_SAVE_FILE_VERSION)
+					{
 						// the file we are reading is a newer version,
-						// don't write anything, we don't want to accidently
+						// don't write anything, we don't want to accidentally
 						// delete anything the user may want.
 						return;
-					}  // if(fileVersion > LOD_SAVE_FILE_VERSION)
-					//else {
-						// we are good to continue and overwrite the old file
-					//}
-
+					}
+					
+					// if we got this far then we are good
+					// to overwrite the old file
 				}
-
-				// the old file is good, now create a new save file
+				
+				// the old file is good, now create a new temporary save file
 				File newFile = new File(fileName + TMP_FILE_EXTENSION);
-				try (OutputStream outputStream = new BufferedOutputStream(new FileOutputStream(newFile))) {
-
+				try (XZCompressorOutputStream outputStream = new XZCompressorOutputStream(new FileOutputStream(newFile), 3))
+				{
 					// add the version of this file
 					outputStream.write(LOD_SAVE_FILE_VERSION);
-
+					
 					// add each LodChunk to the file
 					outputStream.write(region.getLevel(detailLevel).toDataString());
 					outputStream.close();
-
+					
 					// overwrite the old file with the new one
 					Files.move(newFile.toPath(), oldFile.toPath(), StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
-				}catch (IOException ex) {
+				}
+				catch (IOException ex)
+				{
 					ex.printStackTrace();
 				}
-			} catch (Exception e)
+			}
+			catch (Exception e)
 			{
 				ClientProxy.LOGGER.error("LOD file write error. Unable to write to [" + fileName + "] error [" + e.getMessage() + "]: ");
 				e.printStackTrace();
 			}
 		}
 	}
-
-
+	
+	
+	
+	
+	
 	//================//
 	// helper methods //
 	//================//
-
-
+	
+	
 	/**
 	 * Return the name of the file that should contain the
 	 * region at the given x and z. <br>
-	 * Returns null if this object isn't ready to read and write. <br><br>
+	 * Returns null if this object isn't available to read and write. <br><br>
 	 * <p>
-	 * example: "lod.0.0.txt" <br><br>
+	 * example: "lod.0.0.txt" <br>
 	 * <p>
-	 * Returns null if there is an IO Exception.
+	 * Returns null if there is an IO or security Exception.
 	 */
 	private String getFileNameAndPathForRegion(int regionX, int regionZ, DistanceGenerationMode generationMode, byte detailLevel, VerticalQuality verticalQuality)
 	{
 		try
 		{
 			// saveFolder is something like
-			// ".\Super Flat\DIM-1\data"
+			// ".\Super Flat\DIM-1\data\"
 			// or
-			// ".\Super Flat\data"
+			// ".\Super Flat\data\"
 			return dimensionDataSaveFolder.getCanonicalPath() + File.separatorChar +
-					       verticalQuality + File.separatorChar +
+					verticalQuality + File.separatorChar +
 					generationMode.toString() + File.separatorChar +
 					DETAIL_FOLDER_NAME_PREFIX + detailLevel + File.separatorChar +
 					FILE_NAME_PREFIX + "." + regionX + "." + regionZ + FILE_EXTENSION;
-		} catch (IOException | SecurityException e)
+		}
+		catch (IOException | SecurityException e)
 		{
 			ClientProxy.LOGGER.warn("Unable to get the filename for the region [" + regionX + ", " + regionZ + "], error: [" + e.getMessage() + "], stacktrace: ");
 			e.printStackTrace();
 			return null;
 		}
 	}
-
+	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,26 +16,28 @@
 *    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.handlers;

 import java.lang.reflect.Field;
 import java.lang.reflect.Method;

 import com.seibel.lod.enums.FogQuality;
+import com.seibel.lod.proxy.ClientProxy;
 import com.seibel.lod.wrappers.MinecraftWrapper;

 /**
 * This object is used to get variables from methods
 * where they are private. Specifically the fog setting
 * in Optifine.
- *
+ * 
 * @author James Seibel
- * @version 9-7-2021
+ * @version 9-25-2021
 */
 public class ReflectionHandler
 {
 	public static final ReflectionHandler INSTANCE = new ReflectionHandler();
-	private MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	private final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
 	
 	public Field ofFogField = null;
 	public Method vertexBufferUploadMethod = null;
@@ -68,6 +71,7 @@ public class ReflectionHandler
 		// we didn't find the field,
 		// either optifine isn't installed, or
 		// optifine changed the name of the variable
+		ClientProxy.LOGGER.info(ReflectionHandler.class.getSimpleName() + ": unable to find the Optifine fog field. If Optifine isn't installed this can be ignored.");
 	}
 	
 	
@@ -91,17 +95,18 @@ public class ReflectionHandler
 		try
 		{
 			returnNum = (int) ofFogField.get(mc.getOptions());
-		} catch (IllegalArgumentException | IllegalAccessException e)
+		}
+		catch (IllegalArgumentException | IllegalAccessException e)
 		{
 			e.printStackTrace();
 		}
 		
 		switch (returnNum)
 		{
-		// optifine's "default" option,
-		// it should never be called in this case
+		default:
 		case 0:
-			return FogQuality.FAST;
+			// optifine's "default" option,
+			// it should never be called in this case
 			
 			// normal options
 		case 1:
@@ -110,9 +115,6 @@ public class ReflectionHandler
 			return FogQuality.FANCY;
 		case 3:
 			return FogQuality.OFF;
-			
-		default:
-			return FogQuality.FAST;
 		}
 	}
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,22 +16,25 @@
 *    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.mixin;

-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.seibel.lod.LodMain;
-import com.seibel.lod.proxy.ClientProxy;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.WorldRenderer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.seibel.lod.LodMain;
+import com.seibel.lod.config.LodConfig;
+
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.WorldRenderer;
+
 /**
 * This class is used to mix in my rendering code
 * before Minecraft starts rendering blocks.
- * If this wasn't done and we used Forge's 
+ * If this wasn't done, and we used Forge's
 * render last event, the LODs would render on top
 * of the normal terrain.
 * 
@@ -42,7 +46,7 @@ public class MixinWorldRenderer
 {
 	private static float previousPartialTicks = 0;
 	
-	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/matrix/MatrixStack;F)V", cancellable = false)
+	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/matrix/MatrixStack;F)V")
 	private void renderSky(MatrixStack matrixStackIn, float partialTicks, CallbackInfo callback)
 	{
 		// get the partial ticks since renderBlockLayer doesn't
@@ -50,12 +54,12 @@ public class MixinWorldRenderer
 		previousPartialTicks = partialTicks;
 	}
 	
-	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/matrix/MatrixStack;DDD)V", cancellable = false)
+	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/matrix/MatrixStack;DDD)V")
 	private void renderChunkLayer(RenderType renderType, MatrixStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
 	{
 		// only render if LODs are enabled and
 		// only render before solid blocks
-		if (ClientProxy.drawLods && renderType.equals(RenderType.solid()))
+		if (LodConfig.CLIENT.advancedModOptions.debugging.drawLods.get() && renderType.equals(RenderType.solid()))
 			LodMain.client_proxy.renderLods(matrixStackIn, previousPartialTicks);
 	}
 }
@@ -1,92 +1,115 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.objects;

+/**
+ * A level container is a quad tree level
+ */
 public interface LevelContainer
 {
-	public static final char VERTICAL_DATA_DELIMITER = '\t';
-	public static final char DATA_DELIMITER = ' ';
-
-	/**With this you can add data to the level container
-	 *
-	 * @param data actual data to add in a array of long format.
+	/**
+	 * With this you can add data to the level container
+	 * @param data actual data to add in an array of long format.
 	 * @param posX x position in the detail level
 	 * @param posZ z position in the detail level
 	 * @param index z position in the detail level
 	 * @return true if correctly added, false otherwise
 	 */
-	public boolean addData(long data, int posX, int posZ, int index);
-
-	/**With this you can add data to the level container
-	 *
-	 * @param data actual data to add in a array of long format.
+	boolean addData(long data, int posX, int posZ, int index);
+	
+	/**
+	 * With this you can add data to the level container
+	 * @param data actual data to add in an array of long[] format.
 	 * @param posX x position in the detail level
 	 * @param posZ z position in the detail level
 	 * @return true if correctly added, false otherwise
 	 */
-	public boolean addSingleData(long data, int posX, int posZ);
-
-	/**With this you can get data from the level container
-	 *
+	boolean addVerticalData(long[] data, int posX, int posZ);
+	
+	/**
+	 * With this you can add data to the level container
+	 * @param data actual data to add in an array of long format.
+	 * @param posX x position in the detail level
+	 * @param posZ z position in the detail level
+	 * @return true if correctly added, false otherwise
+	 */
+	boolean addSingleData(long data, int posX, int posZ);
+	
+	/**
+	 * With this you can get data from the level container
 	 * @param posX x position in the detail level
 	 * @param posZ z position in the detail level
 	 * @return the data in long array format
 	 */
-	public long getData(int posX, int posZ, int index);
-
-	/**With this you can get data from the level container
-	 *
+	long getData(int posX, int posZ, int index);
+	
+	/**
+	 * With this you can get data from the level container
 	 * @param posX x position in the detail level
 	 * @param posZ z position in the detail level
 	 * @return the data in long array format
 	 */
-	public long getSingleData(int posX, int posZ);
-
+	long getSingleData(int posX, int posZ);
+	
 	/**
 	 * @param posX x position in the detail level
 	 * @param posZ z position in the detail level
 	 * @return true only if the data exist
 	 */
-	public boolean doesItExist(int posX, int posZ);
-
+	boolean doesItExist(int posX, int posZ);
+	
 	/**
-	 * @return return the deatilLevel of this level container
+	 * @return return the detailLevel of this level container
 	 */
-	public byte getDetailLevel();
-
-
-	public int getMaxVerticalData();
-
-	public void clear(int posX, int posZ);
-
-	/**This return a level container with detail level lower than the current level.
+	byte getDetailLevel();
+	
+	
+	int getMaxVerticalData();
+	
+	/** Clears the dataPoint at the given array index */
+	void clear(int posX, int posZ);
+	
+	/**
+	 * This return a level container with detail level lower than the current level.
 	 * The new level container may use information of this level.
 	 * @return the new level container
 	 */
-	public LevelContainer expand();
-
+	LevelContainer expand();
+	
 	/**
-	 *
 	 * @param lowerLevelContainer lower level where we extract the data
 	 * @param posX x position in the detail level to update
 	 * @param posZ z position in the detail level to update
 	 */
-	public void updateData(LevelContainer lowerLevelContainer, int posX, int posZ);
-
+	void updateData(LevelContainer lowerLevelContainer, int posX, int posZ);
+	
 	/**
 	 * This will give the data to save in the file
 	 * @return data as a String
 	 */
-	public byte[] toDataString();
-
-
+	byte[] toDataString();
+	
+	
 	/**
 	 * This will give the data to save in the file
 	 * @return data as a String
 	 */
-	public int getMaxNumberOfLods();
-
-	/**
-	 * This will give the data to save in the file
-	 * @return data as a String
-	 */
-	public int getMaxMemoryUse();
+	int getMaxNumberOfLods();
 }
@@ -1,9 +1,25 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.objects;

-
-import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.DistanceGenerationMode;
-import com.seibel.lod.enums.LodTemplate;
 import com.seibel.lod.enums.VerticalQuality;
 import com.seibel.lod.util.DataPointUtil;
 import com.seibel.lod.util.DetailDistanceUtil;
@@ -11,40 +27,57 @@ import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodUtil;

 /**
- * STANDARD TO FOLLOW
- * every coordinate called posX or posZ is a relative coordinate and not and absolute coordinate
- * if an array contain coordinate the order is the following
- * 0 for x, 1 for z in 2D
- * 0 for x, 1 for y, 2 for z in 3D
+ * This object holds all loaded LevelContainers acting as a quad tree
+ * for a given region. <Br><Br>
+ *
+ * <strong>Coordinate Standard: </strong><br>
+ * Coordinate called posX or posZ are relative LevelPos coordinates <br>
+ * unless stated otherwise. <br>
+ * 
+ * @author Leonardo Amato
+ * @version 10-10-2021
 */
 public class LodRegion
 {
-	//x coord,
-	private byte minDetailLevel;
+	/**
+	 * Number of detail level supported by a region
+	 */
 	private static final byte POSSIBLE_LOD = 10;
-	//private int numberOfPoints;
-	//For each of the following field the first slot is for the level of detail
-	//Important: byte have a [-128, 127] range. When converting from or to int a 128 should be added or removed
-	//If there is a bug with color then it's probably caused by this.
-	//in the future other fields like transparency and light level could be added
-
-	private LevelContainer[] dataContainer;
-
-
+	
+	
+	/**
+	 * Holds the lowest (least detailed) detail level in this region
+	 */
+	private byte minDetailLevel;
+	
+	/**
+	 * This holds all data for this region
+	 */
+	private final LevelContainer[] dataContainer;
+	
+	/**
+	 * This chunk Pos has been generated
+	 */
+	//private final boolean[] preGeneratedChunkPos;
+	
+	/**
+	 * the generation mode for this region
+	 */
 	private DistanceGenerationMode generationMode;
+	/**
+	 * the vertical quality of this region
+	 */
 	private VerticalQuality verticalQuality;
-
+	
+	/**
+	 * this region's x RegionPos
+	 */
 	public final int regionPosX;
+	/**
+	 * this region's z RegionPos
+	 */
 	public final int regionPosZ;
-
-	public LodRegion(RegionPos regionPos)
-	{
-		this.minDetailLevel = LodUtil.REGION_DETAIL_LEVEL;
-		this.regionPosX = regionPos.x;
-		this.regionPosZ = regionPos.z;
-		dataContainer = new LevelContainer[POSSIBLE_LOD];
-	}
-
+	
 	public LodRegion(byte minDetailLevel, RegionPos regionPos, DistanceGenerationMode generationMode, VerticalQuality verticalQuality)
 	{
 		this.minDetailLevel = minDetailLevel;
@@ -53,307 +86,369 @@ public class LodRegion
 		this.verticalQuality = verticalQuality;
 		this.generationMode = generationMode;
 		dataContainer = new LevelContainer[POSSIBLE_LOD];
-
-
+		
+		
 		// Initialize all the different matrices
 		for (byte lod = minDetailLevel; lod <= LodUtil.REGION_DETAIL_LEVEL; lod++)
 		{
-			switch (verticalQuality)
-			{
-				default:
-				case HEIGHTMAP:
-					dataContainer[lod] = new SingleLevelContainer(lod);
-					break;
-				case MULTI_LOD:
-					dataContainer[lod] = new VerticalLevelContainer(lod);
-					break;
-			}
+			dataContainer[lod] = new VerticalLevelContainer(lod);
 		}
+		
+		boolean fileFound = false;
+		
+		/*
+		preGeneratedChunkPos = new boolean[32 * 32];
+		if (MinecraftWrapper.INSTANCE.hasSinglePlayerServer() && LodConfig.CLIENT.worldGenerator.useExperimentalPreGenLoading.get())
+		{
+			File regionFileDirHead;
+			File regionFileDirParent;
+			// local world
+			
+			ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(MinecraftWrapper.INSTANCE.getCurrentDimension());
+			
+			// provider needs a separate variable to prevent
+			// the compiler from complaining
+			StringBuilder string = new StringBuilder();
+			try
+			{
+				ServerChunkProvider provider = serverWorld.getChunkSource();
+				
+				//System.out.println(provider.dataStorage.dataFolder);
+				regionFileDirHead = new File(provider.dataStorage.dataFolder.getCanonicalFile().getParentFile().toPath().toAbsolutePath().toString() + File.separatorChar + "region", "r." + regionPosZ + "." + regionPosX + ".mca");
+				if (regionFileDirHead.exists())
+				{
+					regionFileDirParent = regionFileDirHead.getParentFile();
+					//string.append(regionFileDirParent.toString());
+					string.append(regionFileDirHead);
+					RegionFile regionFile = new RegionFile(regionFileDirHead, regionFileDirParent, true);
+					for (int x = 0; x < 32; x++)
+					{
+						for (int z = 0; z < 32; z++)
+						{
+							preGeneratedChunkPos[x * 32 + z] = regionFile.doesChunkExist(new ChunkPos(regionPosX * 32 + x, regionPosZ * 32 + z));
+						}
+					}
+					
+					string.append("region " + regionPosX + " " + regionPosZ + "\n");
+					for (int x = 0; x < 32; x++)
+					{
+						for (int z = 0; z < 32; z++)
+						{
+							//regionFile.doesChunkExist()
+							string.append(preGeneratedChunkPos[x * 32 + z] + "\t");
+						}
+						string.append("\n");
+					}
+					regionFile.close();
+				}
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+			System.out.println(string);
+		}*/
+		
 	}
-
-	public VerticalQuality getLodQualityMode()
-	{
-		return verticalQuality;
-	}
-
-	public DistanceGenerationMode getGenerationMode()
-	{
-		return generationMode;
-	}
-
-	public int getMaxVerticalData(byte detailLevel)
-	{
-		return dataContainer[detailLevel].getMaxVerticalData();
-	}
-
+	
+	
 	/**
-	 * This method can be used to insert data into the LodRegion
-	 *
-	 * @return if the data was added successfully
+	 * Return true if the chunk has been pregenerated in game
+	 */
+	//public boolean isChunkPreGenerated(int xChunkPos, int zChunkPos)
+	//{
+	//	xChunkPos = LevelPosUtil.getRegionModule(LodUtil.CHUNK_DETAIL_LEVEL, xChunkPos);
+	//	zChunkPos = LevelPosUtil.getRegionModule(LodUtil.CHUNK_DETAIL_LEVEL, zChunkPos);
+	//	return preGeneratedChunkPos[xChunkPos * 32 + zChunkPos];
+	//}
+	
+	/**
+	 * Inserts the data point into the region.
+	 * <p>
+	 * TODO this will always return true unless it has
+	 * @return true if the data was added successfully
 	 */
 	public boolean addData(byte detailLevel, int posX, int posZ, int verticalIndex, long data)
 	{
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-
-		// For some reason the dataContainer can contain null entries
+		
+		// The dataContainer could have null entries if the
+		// detailLevel changes.
 		if (this.dataContainer[detailLevel] == null)
 		{
-			if (verticalQuality == VerticalQuality.HEIGHTMAP)
-				this.dataContainer[detailLevel] = new SingleLevelContainer(detailLevel);
-			else
-				this.dataContainer[detailLevel] = new VerticalLevelContainer(detailLevel);
+			this.dataContainer[detailLevel] = new VerticalLevelContainer(detailLevel);
 		}
-
+		
 		this.dataContainer[detailLevel].addData(data, posX, posZ, verticalIndex);
-
+		
 		return true;
 	}
-
+	
 	/**
-	 * This method will return the data in the position relative to the level of detail
-	 *
-	 * @return the data at the relative pos and level
+	 * Inserts the vertical data into the region.
+	 * <p>
+	 * TODO this will always return true unless it has
+	 * @return true if the data was added successfully
+	 */
+	public boolean addVerticalData(byte detailLevel, int posX, int posZ, long[] data)
+	{
+		//position is already relative
+		//posX = LevelPosUtil.getRegionModule(detailLevel, posX);
+		//posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
+		
+		// The dataContainer could have null entries if the
+		// detailLevel changes.
+		if (this.dataContainer[detailLevel] == null)
+			this.dataContainer[detailLevel] = new VerticalLevelContainer(detailLevel);
+		
+		return this.dataContainer[detailLevel].addVerticalData(data, posX, posZ);
+	}
+	
+	/**
+	 * Get the dataPoint at the given relative position.
+	 * @return the data at the relative pos and detail level,
+	 * 0 if the data doesn't exist.
 	 */
 	public long getData(byte detailLevel, int posX, int posZ, int verticalIndex)
 	{
 		return dataContainer[detailLevel].getData(posX, posZ, verticalIndex);
 	}
-
+	
 	/**
-	 * This method will return the data in the position relative to the level of detail
-	 *
-	 * @return the data at the relative pos and level
+	 * Get the dataPoint at the given relative position.
+	 * @return the data at the relative pos and detail level,
+	 * 0 if the data doesn't exist.
 	 */
 	public long getSingleData(byte detailLevel, int posX, int posZ)
 	{
 		return dataContainer[detailLevel].getSingleData(posX, posZ);
 	}
-
+	
+	/**
+	 * Clears the datapoint at the given relative position
+	 */
 	public void clear(byte detailLevel, int posX, int posZ)
 	{
 		dataContainer[detailLevel].clear(posX, posZ);
 	}
-
+	
 	/**
-	 * This method will return all the levelPos that are renderable according to the requisite given in input
-	 *
-	 * @return
+	 * This method will fill the posToGenerate array with all levelPos that
+	 * are render-able.
+	 * <p>
+	 * TODO why don't we return the posToGenerate, it would make this easier to understand
 	 */
-	public void getDataToGenerate(PosToGenerateContainer posToGenerate, int playerPosX, int playerPosZ)
+	public void getPosToGenerate(PosToGenerateContainer posToGenerate,
+			int playerBlockPosX, int playerBlockPosZ)
 	{
-		getDataToGenerate(posToGenerate, LodUtil.REGION_DETAIL_LEVEL, 0, 0, playerPosX, playerPosZ);
-
+		getPosToGenerate(posToGenerate, LodUtil.REGION_DETAIL_LEVEL, 0, 0, playerBlockPosX, playerBlockPosZ);
+		
 	}
-
-	private void getDataToGenerate(PosToGenerateContainer posToGenerate, byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ)
+	
+	/**
+	 * A recursive method that fills the posToGenerate array with all levelPos that
+	 * need to be generated.
+	 * <p>
+	 * TODO why don't we return the posToGenerate, it would make this easier to understand
+	 */
+	private void getPosToGenerate(PosToGenerateContainer posToGenerate, byte detailLevel,
+			int childOffsetPosX, int childOffsetPosZ, int playerPosX, int playerPosZ)
 	{
+		// equivalent to 2^(...)
 		int size = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
-
-		//here i calculate the the LevelPos is in range
-		//This is important to avoid any kind of hole in the generation
-		//nt minDistance = LevelPosUtil.minDistance(detailLevel, posX + regionPosX * size, posZ + regionPosZ * size, playerPosX, playerPosZ);
-		int maxDistance = LevelPosUtil.maxDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
-
+		
+		// calculate what LevelPos are in range to generate
+		int maxDistance = LevelPosUtil.maxDistance(detailLevel, childOffsetPosX, childOffsetPosZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
+		
+		// determine this child's levelPos
 		byte childDetailLevel = (byte) (detailLevel - 1);
-		int childPosX = posX * 2;
-		int childPosZ = posZ * 2;
-
+		int childPosX = childOffsetPosX * 2;
+		int childPosZ = childOffsetPosZ * 2;
+		
 		int childSize = 1 << (LodUtil.REGION_DETAIL_LEVEL - childDetailLevel);
-		//we have reached the target detail level
+		
 		byte targetDetailLevel = DetailDistanceUtil.getLodGenDetail(DetailDistanceUtil.getGenerationDetailFromDistance(maxDistance)).detailLevel;
-		if (targetDetailLevel > detailLevel)
+		if (targetDetailLevel <= detailLevel)
 		{
-			return;
-		} else if (targetDetailLevel == detailLevel)
-		{
-			if (!doesDataExist(detailLevel, posX, posZ))
+			if (targetDetailLevel == detailLevel)
 			{
-				posToGenerate.addPosToGenerate(detailLevel, posX + regionPosX * size, posZ + regionPosZ * size);
+				if (!doesDataExist(detailLevel, childOffsetPosX, childOffsetPosZ))
+					posToGenerate.addPosToGenerate(detailLevel, childOffsetPosX + regionPosX * size, childOffsetPosZ + regionPosZ * size);
 			}
-		} else
-		{
-			//we want max a request per chunk. So for lod smaller than chunk we explore only the top rigth child
-			if (detailLevel > LodUtil.CHUNK_DETAIL_LEVEL)
+			else
 			{
-				int num = 0;
-				//We take all the children that are not generated to at least the generation level taken in input
+				// we want at max one request per chunk (since the world generator creates chunks).
+				// So for lod smaller than a chunk, only recurse down
+				// the top right child
+				
+				if (detailLevel > LodUtil.CHUNK_DETAIL_LEVEL)
+				{
+					int ungeneratedChildren = 0;
+					
+					// make sure all children are generated to this detailLevel
+					for (int x = 0; x <= 1; x++)
+					{
+						for (int z = 0; z <= 1; z++)
+						{
+							if (!doesDataExist(childDetailLevel, childPosX + x, childPosZ + z))
+							{
+								ungeneratedChildren++;
+								posToGenerate.addPosToGenerate(childDetailLevel, childPosX + x + regionPosX * childSize, childPosZ + z + regionPosZ * childSize);
+							}
+						}
+					}
+					
+					// only if all the children are correctly generated
+					// should we go deeper
+					if (ungeneratedChildren == 0)
+						for (int x = 0; x <= 1; x++)
+							for (int z = 0; z <= 1; z++)
+								getPosToGenerate(posToGenerate, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ);
+				}
+				else
+				{
+					// The detail Level is smaller than a chunk.
+					// Only recurse down the top right child.
+					
+					if (DetailDistanceUtil.getLodGenDetail(childDetailLevel).detailLevel <= (childDetailLevel))
+					{
+						if (!doesDataExist(childDetailLevel, childPosX, childPosZ))
+							posToGenerate.addPosToGenerate(childDetailLevel, childPosX + regionPosX * childSize, childPosZ + regionPosZ * childSize);
+						else
+							getPosToGenerate(posToGenerate, childDetailLevel, childPosX, childPosZ, playerPosX, playerPosZ);
+					}
+				}
+			}
+		}
+		// we have gone beyond the target Detail level
+		// we can stop generating
+		
+	}
+	
+	
+	/**
+	 * This method will fill the posToRender array with all levelPos that
+	 * are render-able.
+	 * <p>
+	 * TODO why don't we return the posToRender, it would make this easier to understand
+	 */
+	public void getPosToRender(PosToRenderContainer posToRender,
+			int playerPosX, int playerPosZ, boolean requireCorrectDetailLevel)
+	{
+		getPosToRender(posToRender, LodUtil.REGION_DETAIL_LEVEL, 0, 0, playerPosX, playerPosZ, requireCorrectDetailLevel);
+	}
+	
+	/**
+	 * This method will fill the posToRender array with all levelPos that
+	 * are render-able.
+	 * <p>
+	 * TODO why don't we return the posToRender, it would make this easier to understand
+	 * TODO this needs some more comments, James was only able to figure out part of it
+	 */
+	private void getPosToRender(PosToRenderContainer posToRender,
+			byte detailLevel, int posX, int posZ,
+			int playerPosX, int playerPosZ, boolean requireCorrectDetailLevel)
+	{
+		// equivalent to 2^(...)
+		int size = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
+		
+		byte desiredLevel;
+		int maxDistance;
+		int minDistance;
+		int childLevel;
+		
+		
+		// calculate the LevelPos that are in range
+		maxDistance = LevelPosUtil.maxDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
+		desiredLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(maxDistance));
+		minDistance = LevelPosUtil.minDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
+		childLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(minDistance));
+		
+		if (detailLevel == childLevel - 1)
+		{
+			posToRender.addPosToRender(detailLevel,
+					posX + regionPosX * size,
+					posZ + regionPosZ * size);
+		}
+		else
+			//if (desiredLevel > detailLevel)
+			//{
+			// we have gone beyond the target Detail level
+			// we can stop generating
+			//} else
+			if (desiredLevel == detailLevel)
+			{
+				posToRender.addPosToRender(detailLevel,
+						posX + regionPosX * size,
+						posZ + regionPosZ * size);
+			}
+			else //case where (detailLevel > desiredLevel)
+			{
+				int childPosX = posX * 2;
+				int childPosZ = posZ * 2;
+				byte childDetailLevel = (byte) (detailLevel - 1);
+				int childrenCount = 0;
+				
 				for (int x = 0; x <= 1; x++)
 				{
 					for (int z = 0; z <= 1; z++)
 					{
-
-						if (!doesDataExist(childDetailLevel, childPosX + x, childPosZ + z))
+						if (doesDataExist(childDetailLevel, childPosX + x, childPosZ + z))
 						{
-							num++;
-							posToGenerate.addPosToGenerate(childDetailLevel, childPosX + x + regionPosX * childSize, childPosZ + z + regionPosZ * childSize);
+							if (!requireCorrectDetailLevel)
+								childrenCount++;
+							else
+								getPosToRender(posToRender, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ, requireCorrectDetailLevel);
 						}
 					}
 				}
-
-				//only if all the children are correctly generated we go deeper
-				if (num == 0)
+				
+				
+				if (!requireCorrectDetailLevel)
 				{
-					for (int x = 0; x <= 1; x++)
+					// If all the four children exist go deeper
+					if (childrenCount == 4)
 					{
-						for (int z = 0; z <= 1; z++)
-						{
-							getDataToGenerate(posToGenerate, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ);
-						}
+						for (int x = 0; x <= 1; x++)
+							for (int z = 0; z <= 1; z++)
+								getPosToRender(posToRender, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ, requireCorrectDetailLevel);
 					}
-				}
-			} else
-			//now we keep exploring the top right child
-			{
-				if (DetailDistanceUtil.getLodGenDetail(childDetailLevel).detailLevel <= (childDetailLevel))
-				{
-					if (!doesDataExist(childDetailLevel, childPosX, childPosZ))
+					else
 					{
-						posToGenerate.addPosToGenerate(childDetailLevel, childPosX + regionPosX * childSize, childPosZ + regionPosZ * childSize);
-					} else
-					{
-						getDataToGenerate(posToGenerate, childDetailLevel, childPosX, childPosZ, playerPosX, playerPosZ);
+						posToRender.addPosToRender(detailLevel,
+								posX + regionPosX * size,
+								posZ + regionPosZ * size);
 					}
 				}
 			}
-		}
 	}
-
-
+	
+	
 	/**
-	 * @return
-	 */
-	public void getDataToRender(PosToRenderContainer posToRender, int playerPosX, int playerPosZ, boolean requireCorrectDetailLevel)
-	{
-		getDataToRender(posToRender, LodUtil.REGION_DETAIL_LEVEL, 0, 0, playerPosX, playerPosZ, requireCorrectDetailLevel);
-	}
-
-	/**
-	 * @return
-	 */
-	private void getDataToRender(PosToRenderContainer posToRender, byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ, boolean requireCorrectDetailLevel)
-	{
-		int size = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
-
-		//here i calculate the the LevelPos is in range
-		//This is important to avoid any kind of hole in the rendering
-		byte supposedLevel;
-		int maxDistance;
-		boolean stopNow = false;
-		int minDistance;
-		int childLevel;
-		switch (LodConfig.CLIENT.graphics.detailDropOff.get())
-		{
-			default:
-			case BY_CHUNK:
-				maxDistance = LevelPosUtil.maxDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
-				supposedLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(maxDistance));
-				minDistance = LevelPosUtil.minDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
-				childLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(minDistance));
-				stopNow = detailLevel == childLevel - 1;
-
-				break;
-			case BY_REGION_FANCY:
-				supposedLevel = minDetailLevel;
-				break;
-			case BY_REGION_FAST:
-				int playerRegionX = LevelPosUtil.getRegion(LodUtil.BLOCK_DETAIL_LEVEL, playerPosX);
-				int playerRegionZ = LevelPosUtil.getRegion(LodUtil.BLOCK_DETAIL_LEVEL, playerPosZ);
-				if (playerRegionX == regionPosX && playerRegionZ == regionPosZ)
-				{
-					maxDistance = LevelPosUtil.maxDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
-					supposedLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(maxDistance));
-					minDistance = LevelPosUtil.minDistance(detailLevel, posX, posZ, playerPosX, playerPosZ, regionPosX, regionPosZ);
-					childLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(minDistance));
-					stopNow = detailLevel == childLevel - 1;
-				} else
-				{
-					maxDistance = LevelPosUtil.maxDistance(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ, playerRegionX * 512 + 256, playerRegionZ * 512 + 256);
-					supposedLevel = DetailDistanceUtil.getLodDrawDetail(DetailDistanceUtil.getDrawDetailFromDistance(maxDistance));
-				}
-				break;
-		}
-
-		if (stopNow)
-		{
-			posToRender.addPosToRender(detailLevel,
-					posX + regionPosX * size,
-					posZ + regionPosZ * size);
-		} else if (supposedLevel > detailLevel)
-		{
-			return;
-		} else if (supposedLevel == detailLevel)
-		{
-			posToRender.addPosToRender(detailLevel,
-					posX + regionPosX * size,
-					posZ + regionPosZ * size);
-		} else //case where (detailLevel > supposedLevel)
-		{
-			int childPosX = posX * 2;
-			int childPosZ = posZ * 2;
-			byte childDetailLevel = (byte) (detailLevel - 1);
-			int childrenCount = 0;
-			for (int x = 0; x <= 1; x++)
-			{
-				for (int z = 0; z <= 1; z++)
-				{
-					if (doesDataExist(childDetailLevel, childPosX + x, childPosZ + z))
-					{
-						if (!requireCorrectDetailLevel)
-						{
-							childrenCount++;
-						} else
-						{
-							getDataToRender(posToRender, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ, requireCorrectDetailLevel);
-						}
-					}
-				}
-			}
-
-			//If all the four children exist we go deeper
-
-			if (!requireCorrectDetailLevel)
-			{
-				if (childrenCount == 4)
-				{
-					for (int x = 0; x <= 1; x++)
-					{
-						for (int z = 0; z <= 1; z++)
-						{
-							getDataToRender(posToRender, childDetailLevel, childPosX + x, childPosZ + z, playerPosX, playerPosZ, requireCorrectDetailLevel);
-						}
-					}
-				} else
-				{
-					posToRender.addPosToRender(detailLevel,
-							posX + regionPosX * size,
-							posZ + regionPosZ * size);
-				}
-			}
-		}
-	}
-
-	/**
-	 *
+	 * Updates all children.
+	 * <p>
+	 * TODO could this be renamed mergeArea?
 	 */
 	public void updateArea(byte detailLevel, int posX, int posZ)
 	{
 		int width;
 		int startX;
 		int startZ;
-		for (byte bottom = (byte) (minDetailLevel + 1); bottom <= detailLevel; bottom++)
+		
+		// TODO what are each of these loops updating?
+		for (byte down = (byte) (minDetailLevel + 1); down <= detailLevel; down++)
 		{
-			startX = LevelPosUtil.convert(detailLevel, posX, bottom);
-			startZ = LevelPosUtil.convert(detailLevel, posZ, bottom);
-			width = 1 << (detailLevel - bottom);
+			startX = LevelPosUtil.convert(detailLevel, posX, down);
+			startZ = LevelPosUtil.convert(detailLevel, posZ, down);
+			width = 1 << (detailLevel - down);
+			
 			for (int x = 0; x < width; x++)
-			{
 				for (int z = 0; z < width; z++)
-				{
-					update(bottom, startX + x, startZ + z);
-				}
-			}
+					update(down, startX + x, startZ + z);
 		}
+		
+		
 		for (byte up = (byte) (detailLevel + 1); up <= LodUtil.REGION_DETAIL_LEVEL; up++)
 		{
 			update(up,
@@ -361,112 +456,131 @@ public class LodRegion
 					LevelPosUtil.convert(detailLevel, posZ, up));
 		}
 	}
-
+	
 	/**
-	 *
+	 * Update the child at the given relative Pos
+	 * <p>
+	 * TODO could this be renamed mergeChildData?
 	 */
 	private void update(byte detailLevel, int posX, int posZ)
 	{
 		dataContainer[detailLevel].updateData(dataContainer[detailLevel - 1], posX, posZ);
 	}
-
-
+	
+	
 	/**
-	 * @return
+	 * Returns if data exists at the given relative Pos.
 	 */
 	public boolean doesDataExist(byte detailLevel, int posX, int posZ)
 	{
-		if (detailLevel < minDetailLevel) return false;
+		if (detailLevel < minDetailLevel)
+			return false;
+		
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
+		
 		if (dataContainer == null || dataContainer[detailLevel] == null)
 			return false;
+		
 		return dataContainer[detailLevel].doesItExist(posX, posZ);
 	}
-
+	
 	/**
-	 * @return
+	 * Gets the generation mode for the data point at the given relative pos.
 	 */
 	public byte getGenerationMode(byte detailLevel, int posX, int posZ)
 	{
 		if (dataContainer[detailLevel].doesItExist(posX, posZ))
-		{
-			//We take the bottom information always
+			// We take the bottom information always
+			// TODO what does that mean? bottom of what?
 			return DataPointUtil.getGenerationMode(dataContainer[detailLevel].getSingleData(posX, posZ));
-		} else
-		{
+		else
 			return DistanceGenerationMode.NONE.complexity;
-		}
 	}
-
+	
+	/**
+	 * Returns the lowest (least detailed) detail level in this region
+	 * TODO is that right?
+	 */
 	public byte getMinDetailLevel()
 	{
 		return minDetailLevel;
 	}
-
+	
 	/**
-	 * This will be used to save a level
-	 *
-	 * @param detailLevel
-	 * @return
+	 * Returns the LevelContainer for the detailLevel
+	 * @throws IllegalArgumentException if the detailLevel is less than minDetailLevel
 	 */
 	public LevelContainer getLevel(byte detailLevel)
 	{
 		if (detailLevel < minDetailLevel)
-		{
-			throw new IllegalArgumentException("getLevel asked for a level that does not exist: minimum " + minDetailLevel + " level requested " + detailLevel);
-		}
+			throw new IllegalArgumentException("getLevel asked for a detail level that does not exist: minimum: [" + minDetailLevel + "] level requested: [" + detailLevel + "]");
+		
 		return dataContainer[detailLevel];
 	}
-
+	
 	/**
-	 * @param levelContainer
+	 * Add the levelContainer to this Region, updating the minDetailLevel
+	 * if necessary.
+	 * @throws IllegalArgumentException if the LevelContainer's detailLevel
+	 * is 2 or more detail levels lower than the
+	 * minDetailLevel of this region.
 	 */
-	public void addLevel(LevelContainer levelContainer)
+	public void addLevelContainer(LevelContainer levelContainer)
 	{
 		if (levelContainer.getDetailLevel() < minDetailLevel - 1)
 		{
-			throw new IllegalArgumentException("addLevel requires a level that is at least the minimum level of the region -1 ");
+			throw new IllegalArgumentException(
+					"the LevelContainer's detailLevel was "
+							+ "[" + levelContainer.getDetailLevel() + "] but this region "
+							+ "only allows adding LevelContainers with a "
+							+ "detail level of [" + (minDetailLevel - 1) + "]");
 		}
-		if (levelContainer.getDetailLevel() == minDetailLevel - 1) minDetailLevel = levelContainer.getDetailLevel();
+		
+		if (levelContainer.getDetailLevel() == minDetailLevel - 1)
+			minDetailLevel = levelContainer.getDetailLevel();
+		
 		dataContainer[levelContainer.getDetailLevel()] = levelContainer;
-
 	}
-
+	
+	// TODO James thinks cutTree and growTree (which he renamed to match cutTree)
+	// should have more descriptive names, to make sure the "Tree" portion isn't
+	// confused with Minecraft trees (the plant).
+	
 	/**
-	 * @param detailLevel
+	 * Removes any dataContainers that are higher than
+	 * the given detailLevel
 	 */
 	public void cutTree(byte detailLevel)
 	{
-		if (minDetailLevel < detailLevel)
+		if (detailLevel > minDetailLevel)
 		{
-			for (byte tempLod = 0; tempLod < detailLevel; tempLod++)
-			{
-				dataContainer[tempLod] = null;
-			}
+			for (byte detailLevelIndex = 0; detailLevelIndex < detailLevel; detailLevelIndex++)
+				dataContainer[detailLevelIndex] = null;
+			
 			minDetailLevel = detailLevel;
 		}
 	}
-
+	
 	/**
-	 * @param detailLevel
+	 * Make this region more detailed to the detailLevel given.
+	 * TODO is that correct?
 	 */
-	public void expand(byte detailLevel)
+	public void growTree(byte detailLevel)
 	{
 		if (detailLevel < minDetailLevel)
 		{
-			for (byte tempLod = (byte) (minDetailLevel - 1); tempLod >= detailLevel; tempLod--)
+			for (byte detailLevelIndex = (byte) (minDetailLevel - 1); detailLevelIndex >= detailLevel; detailLevelIndex--)
 			{
-				if (dataContainer[tempLod + 1] == null)
-				{
-					dataContainer[tempLod + 1] = new SingleLevelContainer((byte) (tempLod + 1));
-				}
-				dataContainer[tempLod] = dataContainer[tempLod + 1].expand();
+				if (dataContainer[detailLevelIndex + 1] == null)
+					dataContainer[detailLevelIndex + 1] = new VerticalLevelContainer((byte) (detailLevelIndex + 1));
+				
+				dataContainer[detailLevelIndex] = dataContainer[detailLevelIndex + 1].expand();
 			}
 			minDetailLevel = detailLevel;
 		}
 	}
-
+	
 	/**
 	 * return RegionPos of this lod region
 	 */
@@ -474,37 +588,38 @@ public class LodRegion
 	{
 		return new RegionPos(regionPosX, regionPosZ);
 	}
-
+	
 	/**
-	 * return needed memory in byte
-	 *
-	 * @param template
+	 * Returns how many LODs are in this region
 	 */
-	public int getMinMemoryNeeded(LodTemplate template)
-	{
-		int count = 0;
-		for (byte tempLod = LodUtil.REGION_DETAIL_LEVEL; tempLod > minDetailLevel; tempLod--)
-		{
-			//i'm doing a upper limit of the minimum
-			//Color should be just 3 byte but i'm gonna calculate as 12 byte
-			//Height and depth should be just 4 byte but i'm gonna calculate as 8 byte
-			count += dataContainer[tempLod].getMaxMemoryUse() * template.getBufferMemoryForSingleLod(dataContainer[tempLod].getMaxVerticalData());
-			//count += Math.pow(2, LodUtil.REGION_DETAIL_LEVEL - tempLod) * (24 + 8 + 8 + 8 + 8);
-		}
-		return count;
-	}
-
-	@Override
-	public String toString()
-	{
-		return getLevel(LodUtil.REGION_DETAIL_LEVEL).toString();
-	}
-
 	public int getNumberOfLods()
 	{
 		int count = 0;
 		for (LevelContainer container : dataContainer)
 			count += container.getMaxNumberOfLods();
+		
 		return count;
 	}
+	
+	public VerticalQuality getVerticalQuality()
+	{
+		return verticalQuality;
+	}
+	
+	public DistanceGenerationMode getGenerationMode()
+	{
+		return generationMode;
+	}
+	
+	public int getMaxVerticalData(byte detailLevel)
+	{
+		return dataContainer[detailLevel].getMaxVerticalData();
+	}
+	
+	
+	@Override
+	public String toString()
+	{
+		return getLevel(LodUtil.REGION_DETAIL_LEVEL).toString();
+	}
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.objects;

 import java.util.Hashtable;
@@ -26,34 +28,40 @@ import net.minecraft.world.DimensionType;

 /**
 * This stores all LODs for a given world.
- *
+ * 
 * @author James Seibel
 * @author Leonardo Amato
- * @version 8-17-2021
+ * @version 9-27-2021
 */
 public class LodWorld
 {
+	/** name of this world */
 	private String worldName;
-
+	
+	/** dimensions in this world */
 	private Map<DimensionType, LodDimension> lodDimensions;
-
-	/**
-	 * If true then the LOD world is setup and ready to use
-	 */
+	
+	/** If true then the LOD world is setup and ready to use */
 	private boolean isWorldLoaded = false;
-
+	
+	/** the name given to the world if it isn't loaded */
 	public static final String NO_WORLD_LOADED = "No world loaded";
-
-
+	
+	
+	
 	public LodWorld()
 	{
 		worldName = NO_WORLD_LOADED;
 	}
-
+	
+	
+	
 	/**
-	 * Set up the LodQuadTreeWorld with the given newWorldName. <br>
-	 * This should be done whenever loading a new world.
-	 *
+	 * Set up the LodWorld with the given newWorldName. <br>
+	 * This should be done whenever loading a new world. <br><br>
+	 * <p>
+	 * Note a System.gc() call may be in order after calling this <Br>
+	 * since a lot of LOD data is now homeless. <br>
 	 * @param newWorldName name of the world
 	 */
 	public void selectWorld(String newWorldName)
@@ -63,21 +71,24 @@ public class LodWorld
 			deselectWorld();
 			return;
 		}
-
+		
 		if (worldName.equals(newWorldName))
 			// don't recreate everything if we
 			// didn't actually change worlds
 			return;
-
+		
 		worldName = newWorldName;
-		lodDimensions = new Hashtable<DimensionType, LodDimension>();
+		lodDimensions = new Hashtable<>();
 		isWorldLoaded = true;
 	}
-
+	
 	/**
 	 * Set the worldName to "No world loaded"
 	 * and clear the lodDimensions Map. <br>
-	 * This should be done whenever unloaded a world.
+	 * This should be done whenever unloaded a world. <br><br>
+	 * <p>
+	 * Note a System.gc() call may be in order after calling this <Br>
+	 * since a lot of LOD data is now homeless. <br>
 	 */
 	public void deselectWorld()
 	{
@@ -85,46 +96,46 @@ public class LodWorld
 		lodDimensions = null;
 		isWorldLoaded = false;
 	}
-
-
+	
+	
 	/**
-	 * Adds newStorage to this world, if a LodQuadTreeDimension
+	 * Adds newDimension to this world, if a LodDimension
 	 * already exists for the given dimension it is replaced.
 	 */
-	public void addLodDimension(LodDimension newStorage)
+	public void addLodDimension(LodDimension newDimension)
 	{
 		if (lodDimensions == null)
 			return;
-
-		lodDimensions.put(newStorage.dimension, newStorage);
+		
+		lodDimensions.put(newDimension.dimension, newDimension);
 	}
-
+	
 	/**
-	 * Returns null if no LodQuadTreeDimension exists for the given dimension
+	 * Returns null if no LodDimension exists for the given dimension
 	 */
 	public LodDimension getLodDimension(DimensionType dimension)
 	{
 		if (lodDimensions == null)
 			return null;
-
+		
 		return lodDimensions.get(dimension);
 	}
-
+	
 	/**
 	 * Resizes the max width in regions that each LodDimension
 	 * should use.
 	 */
-	public void resizeDimensionRegionWidth(int newWidth)
+	public void resizeDimensionRegionWidth(int newRegionWidth)
 	{
 		if (lodDimensions == null)
 			return;
-
+		
 		saveAllDimensions();
-
+		
 		for (DimensionType key : lodDimensions.keySet())
-			lodDimensions.get(key).setRegionWidth(newWidth);
+			lodDimensions.get(key).setRegionWidth(newRegionWidth);
 	}
-
+	
 	/**
 	 * Requests all dimensions save any dirty regions they may have.
 	 */
@@ -132,24 +143,26 @@ public class LodWorld
 	{
 		if (lodDimensions == null)
 			return;
-
+		
+		// TODO we should only print this if lods were actually saved to file
+		// but that requires a LodDimension.hasDirtyRegions() method or something similar
 		ClientProxy.LOGGER.info("Saving LODs");
-
+		
 		for (DimensionType key : lodDimensions.keySet())
 			lodDimensions.get(key).saveDirtyRegionsToFileAsync();
 	}
-
-
-	public boolean getIsWorldLoaded()
+	
+	
+	public boolean getIsWorldNotLoaded()
 	{
-		return isWorldLoaded;
+		return !isWorldLoaded;
 	}
-
+	
 	public String getWorldName()
 	{
 		return worldName;
 	}
-
+	
 	@Override
 	public String toString()
 	{
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.objects;

 import com.seibel.lod.enums.FogDistance;
@@ -29,11 +31,13 @@ import com.seibel.lod.enums.FogQuality;
 */
 public class NearFarFogSettings
 {
-	public NearOrFarSetting near = new NearOrFarSetting(FogDistance.NEAR);
-	public NearOrFarSetting far = new NearOrFarSetting(FogDistance.FAR);
+	public final NearOrFarSetting near = new NearOrFarSetting(FogDistance.NEAR);
+	public final NearOrFarSetting far = new NearOrFarSetting(FogDistance.FAR);
 	
-	/** If true that means Minecraft is
-	 * rendering fog along side us */
+	/**
+	 * If true that means Minecraft is
+	 * rendering fog alongside us
+	 */
 	public boolean vanillaIsRenderingFog = true;
 	
 	public NearFarFogSettings()
@@ -47,13 +51,10 @@ public class NearFarFogSettings
 	 * This holds all relevant data to rendering fog at either
 	 * near or far distances.
 	 */
-	public class NearOrFarSetting
+	public static class NearOrFarSetting
 	{
 		public FogQuality quality = FogQuality.FANCY;
-		public FogDistance distance = FogDistance.FAR;
-		
-		/** If true this section should render with fog */
-		public boolean enabled = true;
+		public FogDistance distance;
 		
 		public NearOrFarSetting(FogDistance newFogDistance)
 		{
@@ -1,46 +1,75 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.objects;

 import com.seibel.lod.util.LevelPosUtil;

+/**
+ * Holds the levelPos that need to be generated.
+ * TODO is that correct?
+ * 
+ * @author Leonardo Amato
+ * @version 9-27-2021
+ */
 public class PosToGenerateContainer
 {
-	private int playerPosX;
-	private int playerPosZ;
-	private byte farMinDetail;
-	private int maxSize;
-	private int maxNearSize;
-	private int maxFarSize;
+	private final int playerPosX;
+	private final int playerPosZ;
+	private final byte farMinDetail;
 	private int nearSize;
 	private int farSize;
-	private int[][] nearPosToGenerate;
-	private int[][] farPosToGenerate;
-
-
-	public PosToGenerateContainer(byte farMinDetail, int maxDataToGenerate, int maxFarDataToGenerate, int playerPosX, int playerPosZ)
+	
+	// TODO what is the format of these two arrays? [detailLevel][4-children]?
+	private final int[][] nearPosToGenerate;
+	private final int[][] farPosToGenerate;
+	
+	
+	
+	
+	public PosToGenerateContainer(byte farMinDetail, int maxDataToGenerate, int playerPosX, int playerPosZ)
 	{
 		this.playerPosX = playerPosX;
 		this.playerPosZ = playerPosZ;
 		this.farMinDetail = farMinDetail;
-		maxNearSize = maxDataToGenerate-maxFarDataToGenerate;
-		maxFarSize = maxFarDataToGenerate;
-		maxSize = maxDataToGenerate;
 		nearSize = 0;
 		farSize = 0;
 		nearPosToGenerate = new int[maxDataToGenerate][4];
 		farPosToGenerate = new int[maxDataToGenerate][4];
 	}
-
+	
+	
+	
+	// TODO what is going on in this method?
 	public void addPosToGenerate(byte detailLevel, int posX, int posZ)
 	{
 		int distance = LevelPosUtil.minDistance(detailLevel, posX, posZ, playerPosX, playerPosZ);
 		int index;
+		
 		if (detailLevel >= farMinDetail)
-		{//We are introducing a position in the far array
-
-			if(farSize < farPosToGenerate.length)
+		{
+			// We are introducing a position in the far array
+			
+			if (farSize < farPosToGenerate.length)
 				farSize++;
-			index = farSize;
-			//while (index > 0 && LevelPosUtil.compareDistance(distance, farPosToGenerate[index - 1][3]) <= 0)
+			
+			index = farSize - 1;
 			while (index > 0 && LevelPosUtil.compareDistance(distance, farPosToGenerate[index - 1][3]) <= 0)
 			{
 				farPosToGenerate[index][0] = farPosToGenerate[index - 1][0];
@@ -49,18 +78,24 @@ public class PosToGenerateContainer
 				farPosToGenerate[index][3] = farPosToGenerate[index - 1][3];
 				index--;
 			}
-			if (index != farSize-1 || farSize != farPosToGenerate.length)
+			
+			
+			if (index != farSize - 1 || farSize != farPosToGenerate.length)
 			{
 				farPosToGenerate[index][0] = detailLevel + 1;
 				farPosToGenerate[index][1] = posX;
 				farPosToGenerate[index][2] = posZ;
 				farPosToGenerate[index][3] = distance;
 			}
-		} else
-		{//We are introducing a position in the near array
-			if(nearSize < nearPosToGenerate.length)
+		}
+		else
+		{
+			//We are introducing a position in the near array
+			
+			if (nearSize < nearPosToGenerate.length)
 				nearSize++;
-			index = nearSize-1;
+			
+			index = nearSize - 1;
 			while (index > 0 && LevelPosUtil.compareDistance(distance, nearPosToGenerate[index - 1][3]) <= 0)
 			{
 				nearPosToGenerate[index][0] = nearPosToGenerate[index - 1][0];
@@ -69,7 +104,9 @@ public class PosToGenerateContainer
 				nearPosToGenerate[index][3] = nearPosToGenerate[index - 1][3];
 				index--;
 			}
-			if (index != nearSize-1 || nearSize != nearPosToGenerate.length)
+			
+			
+			if (index != nearSize - 1 || nearSize != nearPosToGenerate.length)
 			{
 				nearPosToGenerate[index][0] = detailLevel + 1;
 				nearPosToGenerate[index][1] = posX;
@@ -78,22 +115,25 @@ public class PosToGenerateContainer
 			}
 		}
 	}
-
+	
+	
+	
 	public int getNumberOfPos()
 	{
-		return nearSize+farSize;
+		return nearSize + farSize;
 	}
-
+	
 	public int getNumberOfNearPos()
 	{
 		return nearSize;
 	}
-
+	
 	public int getNumberOfFarPos()
 	{
 		return farSize;
 	}
-
+	
+	// TODO what does getNth mean? could the name be more descriptive or is it just a index?
 	public int getNthDetail(int n, boolean near)
 	{
 		if (near)
@@ -101,6 +141,7 @@ public class PosToGenerateContainer
 		else
 			return farPosToGenerate[n][0];
 	}
+	
 	public int getNthPosX(int n, boolean near)
 	{
 		if (near)
@@ -108,6 +149,7 @@ public class PosToGenerateContainer
 		else
 			return farPosToGenerate[n][1];
 	}
+	
 	public int getNthPosZ(int n, boolean near)
 	{
 		if (near)
@@ -115,6 +157,7 @@ public class PosToGenerateContainer
 		else
 			return farPosToGenerate[n][2];
 	}
+	
 	public int getNthGeneration(int n, boolean near)
 	{
 		if (near)
@@ -122,49 +165,46 @@ public class PosToGenerateContainer
 		else
 			return farPosToGenerate[n][3];
 	}
-
+	
+	@Override
 	public String toString()
-	{/*
+	{
 		StringBuilder builder = new StringBuilder();
-		builder.append("Number of pos to generate ");
-		builder.append(farSize + nearSize);
 		builder.append('\n');
-		builder.append("Number of near pos to generate ");
-		builder.append(nearSize);
-		builder.append('\n');
-		builder.append("Number of far pos to generate ");
-		builder.append(farSize);
 		builder.append('\n');
 		builder.append('\n');
 		builder.append("near pos to generate");
 		builder.append('\n');
-		for (int i = 0; i < nearSize; i++)
+		for (int[] ints : nearPosToGenerate)
 		{
-			builder.append(posToGenerate[i][0]-1);
+			if (ints[0] == 0)
+				break;
+			builder.append(ints[0] - 1);
 			builder.append(" ");
-			builder.append(posToGenerate[i][1]);
+			builder.append(ints[1]);
 			builder.append(" ");
-			builder.append(posToGenerate[i][2]);
+			builder.append(ints[2]);
 			builder.append(" ");
-			builder.append(posToGenerate[i][3]);
+			builder.append(ints[3]);
 			builder.append('\n');
 		}
 		builder.append('\n');
+		
 		builder.append("far pos to generate");
 		builder.append('\n');
-		for (int i = maxSize - 1; i >= maxSize - farSize; i--)
+		for (int[] ints : farPosToGenerate)
 		{
-			builder.append(posToGenerate[i][0]-1);
+			if (ints[0] == 0)
+				break;
+			builder.append(ints[0] - 1);
 			builder.append(" ");
-			builder.append(posToGenerate[i][1]);
+			builder.append(ints[1]);
 			builder.append(" ");
-			builder.append(posToGenerate[i][2]);
+			builder.append(ints[2]);
 			builder.append(" ");
-			builder.append(posToGenerate[i][3]);
+			builder.append(ints[3]);
 			builder.append('\n');
 		}
-		builder.append('\n');
-		return builder.toString();*/
-		return " ";
+		return builder.toString();
 	}
 }
@@ -1,27 +1,46 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.objects;

+import java.util.Arrays;
+
 import com.seibel.lod.proxy.ClientProxy;
 import com.seibel.lod.util.LevelPosUtil;
 import com.seibel.lod.util.LodUtil;

-import java.util.Arrays;
-
 /**
- * 
 * @author Leonardo Amato
 * @version 9-18-2021
 */
 public class PosToRenderContainer
 {
 	public byte minDetail;
-	private int size;
+	private final int size;
 	private int regionPosX;
 	private int regionPosZ;
 	private int numberOfPosToRender;
 	private int[] posToRender;
-	/*TODO this population matrix could be converted to boolean to improve memory use*/
+	/*TODO this population matrix could be converted to boolean to improve memory use
+	 *  no since bools are stored as bytes anyway - cola*/
 	private byte[][] population;
-
+	
 	public PosToRenderContainer(byte minDetail, int regionPosX, int regionPosZ)
 	{
 		this.minDetail = minDetail;
@@ -29,95 +48,98 @@ public class PosToRenderContainer
 		this.regionPosX = regionPosX;
 		this.regionPosZ = regionPosZ;
 		this.size = 1 << (LodUtil.REGION_DETAIL_LEVEL - minDetail);
-		posToRender = new int[size*size*3];
+		posToRender = new int[size * size * 3];
 		population = new byte[size][size];
 	}
-
+	
 	public void addPosToRender(byte detailLevel, int posX, int posZ)
 	{
-		// When rapidly changing dimensions the bufferBuidler can cause this,
+		// When rapidly changing dimensions the bufferBuilder can cause this,
 		// James isn't sure why, but this will prevent an exception at
 		// the very least (while stilling logging the problem). 
 		if (numberOfPosToRender >= posToRender.length)
 		{
 			// This is might be due to dimensions having a different width
 			// when first loading in
-			ClientProxy.LOGGER.error("Unable to addPosToRender. numberOfPosToRender [" + numberOfPosToRender +"] detailLevel [" + detailLevel + "] Pos [" + posX + "," + posZ + "]");
+			ClientProxy.LOGGER.error("Unable to addPosToRender. numberOfPosToRender [" + numberOfPosToRender + "] detailLevel [" + detailLevel + "] Pos [" + posX + "," + posZ + "]");
 			numberOfPosToRender++; // incrementing so we can see how many pos over the limit we would go
 			return;
 		}
 		
 		//if(numberOfPosToRender >= posToRender.length)
 		//	posToRender = Arrays.copyOf(posToRender, posToRender.length*2);
-		posToRender[numberOfPosToRender*3 + 0] = detailLevel;
-		posToRender[numberOfPosToRender*3 + 1] = posX;
-		posToRender[numberOfPosToRender*3 + 2] = posZ;
+		posToRender[numberOfPosToRender * 3] = detailLevel;
+		posToRender[numberOfPosToRender * 3 + 1] = posX;
+		posToRender[numberOfPosToRender * 3 + 2] = posZ;
 		numberOfPosToRender++;
-		population[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel,posX,minDetail))]
-				[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel,posZ,minDetail))] = (byte) (detailLevel + 1);
+		population[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel, posX, minDetail))]
+				[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel, posZ, minDetail))] = (byte) (detailLevel + 1);
 	}
-
+	
 	public boolean contains(byte detailLevel, int posX, int posZ)
 	{
-		if(LevelPosUtil.getRegion(detailLevel, posX) == regionPosX && LevelPosUtil.getRegion(detailLevel, posZ) == regionPosZ)
-		{
-			return (population[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel,posX,minDetail))]
-					        [LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel,posZ,minDetail))] == (detailLevel + 1));
-		}else
-		{
+		if (LevelPosUtil.getRegion(detailLevel, posX) == regionPosX && LevelPosUtil.getRegion(detailLevel, posZ) == regionPosZ)
+			return (population[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel, posX, minDetail))]
+					[LevelPosUtil.getRegionModule(minDetail, LevelPosUtil.convert(detailLevel, posZ, minDetail))] == (detailLevel + 1));
+		else
 			return false;
-		}
 	}
-	public void clear(byte minDetail, int regionPosX, int regionPosZ){
+	
+	public void clear(byte minDetail, int regionPosX, int regionPosZ)
+	{
 		this.numberOfPosToRender = 0;
 		this.regionPosX = regionPosX;
 		this.regionPosZ = regionPosZ;
-		if(this.minDetail == minDetail)
+		if (this.minDetail == minDetail)
 		{
 			Arrays.fill(posToRender, 0);
-			for(int i = 0; i< population.length; i++)
-				Arrays.fill(population[i], (byte) 0);
-		}else{
+			for (byte[] bytes : population)
+				Arrays.fill(bytes, (byte) 0);
+		}
+		else
+		{
 			this.minDetail = minDetail;
 			int size = 1 << (LodUtil.REGION_DETAIL_LEVEL - minDetail);
-			posToRender = new int[size*size*3];
+			posToRender = new int[size * size * 3];
 			population = new byte[size][size];
 		}
 	}
-
+	
 	public int getNumberOfPos()
 	{
 		return numberOfPosToRender;
 	}
-
+	
 	public byte getNthDetailLevel(int n)
 	{
-		return (byte) posToRender[n*3 + 0];
+		return (byte) posToRender[n * 3];
 	}
+	
 	public int getNthPosX(int n)
 	{
-		return posToRender[n*3 + 1];
+		return posToRender[n * 3 + 1];
 	}
+	
 	public int getNthPosZ(int n)
 	{
-		return posToRender[n*3 + 2];
+		return posToRender[n * 3 + 2];
 	}
-
+	
 	@Override
 	public String toString()
 	{
-
+		
 		StringBuilder builder = new StringBuilder();
 		builder.append("To render ");
 		builder.append(numberOfPosToRender);
 		builder.append('\n');
-		for(int i = 0; i < numberOfPosToRender; i++)
+		for (int i = 0; i < numberOfPosToRender; i++)
 		{
-			builder.append(posToRender[i*3 + 0]);
+			builder.append(posToRender[i * 3]);
 			builder.append(" ");
-			builder.append(posToRender[i*3 + 1]);
+			builder.append(posToRender[i * 3 + 1]);
 			builder.append(" ");
-			builder.append(posToRender[i*3 + 2]);
+			builder.append(posToRender[i * 3 + 2]);
 			builder.append('\n');
 		}
 		builder.append('\n');
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.objects;

 import com.seibel.lod.util.LodUtil;
@@ -24,7 +26,7 @@ import net.minecraft.util.math.ChunkPos;

 /**
 * This object is similar to ChunkPos or BlockPos.
- *
+ * 
 * @author James Seibel
 * @version 8-21-2021
 */
@@ -32,10 +34,10 @@ public class RegionPos
 {
 	public int x;
 	public int z;
-
-
+	
+	
 	/**
-	 * Default Constructor <br>
+	 * Default Constructor <br><br>
 	 * <p>
 	 * Sets x and z to 0
 	 */
@@ -44,41 +46,43 @@ public class RegionPos
 		x = 0;
 		z = 0;
 	}
-
+	
+	/** simple constructor that sets x and z to new x and z. */
 	public RegionPos(int newX, int newZ)
 	{
 		x = newX;
 		z = newZ;
 	}
-
+	
+	/** Converts from a BlockPos to a RegionPos */
 	public RegionPos(BlockPos pos)
 	{
 		this(new ChunkPos(pos));
 	}
-
+	
+	/** Converts from a ChunkPos to a RegionPos */
 	public RegionPos(ChunkPos pos)
 	{
 		x = Math.floorDiv(pos.x, LodUtil.REGION_WIDTH_IN_CHUNKS);
 		z = Math.floorDiv(pos.z, LodUtil.REGION_WIDTH_IN_CHUNKS);
 	}
-
-	/**
-	 * Returns the ChunkPos at the center of this region
-	 */
+	
+	/** Returns the ChunkPos at the center of this region */
 	public ChunkPos chunkPos()
 	{
-		return new ChunkPos((x * LodUtil.REGION_WIDTH_IN_CHUNKS) + LodUtil.REGION_WIDTH_IN_CHUNKS / 2, (z * LodUtil.REGION_WIDTH_IN_CHUNKS) + LodUtil.REGION_WIDTH_IN_CHUNKS / 2);
+		return new ChunkPos(
+				(x * LodUtil.REGION_WIDTH_IN_CHUNKS) + LodUtil.REGION_WIDTH_IN_CHUNKS / 2,
+				(z * LodUtil.REGION_WIDTH_IN_CHUNKS) + LodUtil.REGION_WIDTH_IN_CHUNKS / 2);
 	}
-
-	/**
-	 * Returns the BlockPos at the center of this region
-	 */
+	
+	/** Returns the BlockPos at the center of this region */
 	public BlockPos blockPos()
 	{
-		return chunkPos().getWorldPosition().offset(LodUtil.CHUNK_WIDTH / 2, 0, LodUtil.CHUNK_WIDTH / 2);
+		return chunkPos().getWorldPosition()
+				.offset(LodUtil.CHUNK_WIDTH / 2, 0, LodUtil.CHUNK_WIDTH / 2);
 	}
-
-
+	
+	
 	@Override
 	public String toString()
 	{
@@ -1,193 +0,0 @@
-package com.seibel.lod.objects;
-
-import com.seibel.lod.util.*;
-
-import javax.xml.crypto.Data;
-import java.util.Arrays;
-
-public class SingleLevelContainer implements LevelContainer
-{
-	public final byte detailLevel;
-	public final int size;
-
-	public final long[][] dataContainer;
-
-	public SingleLevelContainer(byte detailLevel)
-	{
-		this.detailLevel = detailLevel;
-		size = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
-		dataContainer = new long[size][size];
-	}
-
-	public void clear(int posX, int posZ)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		dataContainer[posX][posZ] = DataPointUtil.EMPTY_DATA;
-	}
-
-	public boolean addData(long data, int posX, int posZ, int index)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		dataContainer[posX][posZ] = data;
-		return true;
-	}
-
-	public boolean addSingleData(long newData, int posX, int posZ)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		dataContainer[posX][posZ] = newData;
-		return true;
-	}
-
-	public long getData(int posX, int posZ, int index)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		//Improve this using a thread map to long[]
-		return dataContainer[posX][posZ];
-	}
-
-	public long getSingleData(int posX, int posZ)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		//Improve this using a thread map to long[]
-		return dataContainer[posX][posZ];
-	}
-
-	public byte getDetailLevel()
-	{
-		return detailLevel;
-	}
-
-	public LevelContainer expand()
-	{
-		return new SingleLevelContainer((byte) (getDetailLevel() - 1));
-	}
-
-	public SingleLevelContainer(byte[] inputData)
-	{
-		int tempIndex;
-		int index = 0;
-		long newData;
-		detailLevel = inputData[index];
-		index++;
-		size = (int) Math.pow(2, LodUtil.REGION_DETAIL_LEVEL - detailLevel);
-		this.dataContainer = new long[size][size];
-		for (int x = 0; x < size; x++)
-		{
-			for (int z = 0; z < size; z++)
-			{
-				newData = 0;
-				if (inputData[index] == 0)
-					index++;
-				else if (inputData[index] == 3)
-				{
-					newData = 3;
-					index++;
-				} else if (index + 7 >= inputData.length)
-					break;
-				else
-				{
-					for (tempIndex = 0; tempIndex < 8; tempIndex++)
-						newData += (((long) inputData[index + tempIndex]) & 0xff) << (8 * tempIndex);
-					index = index + 8;
-				}
-				dataContainer[x][z] = newData;
-
-			}
-		}
-	}
-
-	public void updateData(LevelContainer lowerLevelContainer, int posX, int posZ)
-	{
-		//We reset the array
-		long[] dataToMerge = ThreadMapUtil.getSingleUpdateArray();
-
-		int childPosX;
-		int childPosZ;
-		long data;
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		for (int x = 0; x <= 1; x++)
-		{
-			for (int z = 0; z <= 1; z++)
-			{
-				childPosX = 2 * posX + x;
-				childPosZ = 2 * posZ + z;
-				dataToMerge[2 * x + z] = lowerLevelContainer.getSingleData(childPosX, childPosZ);
-			}
-		}
-		data = DataPointUtil.mergeSingleData(dataToMerge);
-		addSingleData(data, posX, posZ);
-	}
-
-	public int getMaxVerticalData()
-	{
-		return 1;
-	}
-
-	public boolean doesItExist(int posX, int posZ)
-	{
-		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
-		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		//Improve this using a thread map to long[]
-		return DataPointUtil.doesItExist(getSingleData(posX, posZ));
-	}
-
-	public byte[] toDataString()
-	{
-		int index = 0;
-		int tempIndex;
-		byte[] tempData = ThreadMapUtil.getSaveContainer();
-		if (tempData == null || tempData.length != (1 + (size * size * 8)))
-			tempData = new byte[1 + (size * size * 8)];
-		else
-			Arrays.fill(tempData, (byte) 0);
-		tempData[index] = detailLevel;
-		index++;
-		for (int x = 0; x < size; x++)
-		{
-			for (int z = 0; z < size; z++)
-			{
-				if (dataContainer[x][z] == 0)
-				{
-					tempData[index] = 0;
-					index++;
-				} else if (dataContainer[x][z] == 3)
-				{
-					tempData[index] = 3;
-					index++;
-				} else
-				{
-					for (tempIndex = 0; tempIndex < 8; tempIndex++)
-						tempData[index + tempIndex] = (byte) (dataContainer[x][z] >>> (8 * tempIndex));
-					index += 8;
-				}
-			}
-		}
-		return Arrays.copyOfRange(tempData, 0, index);
-	}
-
-	@Override
-	public String toString()
-	{
-		StringBuilder stringBuilder = new StringBuilder();
-		stringBuilder.append(detailLevel);
-		return stringBuilder.toString();
-	}
-
-
-	public int getMaxNumberOfLods()
-	{
-		return size * size * getMaxVerticalData();
-	}
-
-	public int getMaxMemoryUse()
-	{
-		return getMaxNumberOfLods() * 2; //2 byte
-	}
-}
@@ -1,18 +1,44 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.objects;

-import com.seibel.lod.util.*;
-
-import java.util.Arrays;
+import com.seibel.lod.util.DataPointUtil;
+import com.seibel.lod.util.DetailDistanceUtil;
+import com.seibel.lod.util.LevelPosUtil;
+import com.seibel.lod.util.LodUtil;
+import com.seibel.lod.util.ThreadMapUtil;

+/**
+ * 
+ * @author Leonardo Amato
+ * @version ??
+ */
 public class VerticalLevelContainer implements LevelContainer
 {
-
+	
 	public final byte detailLevel;
 	public final int size;
 	public final int maxVerticalData;
-
+	
 	public final long[] dataContainer;
-
+	
 	public VerticalLevelContainer(byte detailLevel)
 	{
 		this.detailLevel = detailLevel;
@@ -20,65 +46,90 @@ public class VerticalLevelContainer implements LevelContainer
 		maxVerticalData = DetailDistanceUtil.getMaxVerticalData(detailLevel);
 		dataContainer = new long[size * size * DetailDistanceUtil.getMaxVerticalData(detailLevel)];
 	}
-
+	
 	@Override
 	public byte getDetailLevel()
 	{
 		return detailLevel;
 	}
-
-	public void clear(int posX, int posZ){
-
+	
+	@Override
+	public void clear(int posX, int posZ)
+	{
+		
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		for(int verticalIndex = 0; verticalIndex < maxVerticalData; verticalIndex++){
-			dataContainer[posX*size*maxVerticalData + posZ*maxVerticalData + verticalIndex] = DataPointUtil.EMPTY_DATA;
+		for (int verticalIndex = 0; verticalIndex < maxVerticalData; verticalIndex++)
+		{
+			dataContainer[posX * size * maxVerticalData + posZ * maxVerticalData + verticalIndex] = DataPointUtil.EMPTY_DATA;
 		}
 	}
-
-	public boolean addData(long data, int posX, int posZ, int verticalIndex){
-
+	
+	@Override
+	public boolean addData(long data, int posX, int posZ, int verticalIndex)
+	{
+		
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		dataContainer[posX*size*maxVerticalData + posZ*maxVerticalData + verticalIndex] = data;
+		dataContainer[posX * size * maxVerticalData + posZ * maxVerticalData + verticalIndex] = data;
 		return true;
 	}
-
-	public boolean addSingleData(long data, int posX, int posZ){
+	
+	@Override
+	public boolean addVerticalData(long[] data, int posX, int posZ)
+	{
+		
+		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
+		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
+		for (int verticalIndex = 0; verticalIndex < maxVerticalData; verticalIndex++)
+			dataContainer[posX * size * maxVerticalData + posZ * maxVerticalData + verticalIndex] = data[verticalIndex];
+		return true;
+	}
+	
+	@Override
+	public boolean addSingleData(long data, int posX, int posZ)
+	{
 		return addData(data, posX, posZ, 0);
 	}
-
-	public long getData(int posX, int posZ, int verticalIndex){
+	
+	@Override
+	public long getData(int posX, int posZ, int verticalIndex)
+	{
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		return dataContainer[posX*size*maxVerticalData + posZ*maxVerticalData + verticalIndex];
+		return dataContainer[posX * size * maxVerticalData + posZ * maxVerticalData + verticalIndex];
 	}
-
-	public long getSingleData(int posX, int posZ){
-		return getData(posX,posZ,0);
+	
+	@Override
+	public long getSingleData(int posX, int posZ)
+	{
+		return getData(posX, posZ, 0);
 	}
-
-	public int getMaxVerticalData(){
+	
+	@Override
+	public int getMaxVerticalData()
+	{
 		return maxVerticalData;
 	}
-
-	public int getSize(){
+	
+	public int getSize()
+	{
 		return size;
 	}
-
-	public boolean doesItExist(int posX, int posZ){
+	
+	@Override
+	public boolean doesItExist(int posX, int posZ)
+	{
 		posX = LevelPosUtil.getRegionModule(detailLevel, posX);
 		posZ = LevelPosUtil.getRegionModule(detailLevel, posZ);
-		return DataPointUtil.doesItExist(getSingleData(posX,posZ));
+		return DataPointUtil.doesItExist(getSingleData(posX, posZ));
 	}
-
+	
 	public VerticalLevelContainer(byte[] inputData)
 	{
 		int tempIndex;
 		int index = 0;
-		int counter = -1;
 		long newData;
-		byte last = 0;
 		detailLevel = inputData[index];
 		index++;
 		maxVerticalData = inputData[index];
@@ -86,61 +137,29 @@ public class VerticalLevelContainer implements LevelContainer
 		size = (int) Math.pow(2, LodUtil.REGION_DETAIL_LEVEL - detailLevel);
 		int x = size * size * maxVerticalData;
 		this.dataContainer = new long[x];
-		for ( int i = 0; i < x; i++)
+		for (int i = 0; i < x; i++)
 		{
 			newData = 0;
-			if (counter > -1)
-			{
-				dataContainer[i] = last;
-				if (last == 3)
-				{ //skip rest of void chunk
-					for (tempIndex = 1; tempIndex < maxVerticalData; tempIndex++) {
-						dataContainer[i + tempIndex] = 0;
-					}
-					i += maxVerticalData - 1;
-				}
-				counter--;
-			} else if ((inputData[index] & 0x3) == 0 || (inputData[index] & 0x3) == 3)
-			{
-				last = (byte)(inputData[index] & 0x3);
-				//recover counter
-				counter = (inputData[index] & 0x7c) >>> 2;
-				tempIndex = 0;
-				while ((inputData[index] & 0x80) == 0x80)
-				{ //overflow bit is on
-					index++;
-					counter += (inputData[index] & 0x7f) << (5 + 7 * tempIndex);
-					tempIndex++;
-				}
-				index++;
-				//since loop expects from us to put some data in, we just make it rerun it with new counter;
-				i--;
-			} else if (index + 7 >= inputData.length)
-				break;
-			else {
-				for (tempIndex = 0; tempIndex < 8; tempIndex++)
-					newData += (((long) inputData[index + tempIndex]) & 0xff) << (8 * tempIndex);
-				index = index + 8;
-				dataContainer[i] = newData;
-			}
+			for (tempIndex = 0; tempIndex < 8; tempIndex++)
+				newData += (((long) inputData[index + tempIndex]) & 0xff) << (8 * tempIndex);
+			index += 8;
+			dataContainer[i] = newData;
 		}
 	}
-
-	public LevelContainer expand(){
+	
+	@Override
+	public LevelContainer expand()
+	{
 		return new VerticalLevelContainer((byte) (getDetailLevel() - 1));
 	}
-
+	
+	@Override
 	public void updateData(LevelContainer lowerLevelContainer, int posX, int posZ)
 	{
 		//We reset the array
-		long[] dataToMerge = ThreadMapUtil.getVerticalUpdateArray()[detailLevel];
-
-		if(dataToMerge == null || dataToMerge.length != 4*lowerLevelContainer.getMaxVerticalData())
-			dataToMerge = new long[4 * lowerLevelContainer.getMaxVerticalData()];
-		else
-			Arrays.fill(dataToMerge, DataPointUtil.EMPTY_DATA);
-
-		int lowerMaxVertical = dataToMerge.length/4;
+		long[] dataToMerge = ThreadMapUtil.getVerticalUpdateArray(detailLevel);
+		
+		int lowerMaxVertical = dataToMerge.length / 4;
 		int childPosX;
 		int childPosZ;
 		long[] data;
@@ -152,13 +171,13 @@ public class VerticalLevelContainer implements LevelContainer
 			{
 				childPosX = 2 * posX + x;
 				childPosZ = 2 * posZ + z;
-				for(int verticalIndex = 0; verticalIndex < lowerMaxVertical; verticalIndex++)
-					dataToMerge[(z*2+x)*lowerMaxVertical + verticalIndex] = lowerLevelContainer.getData(childPosX, childPosZ, verticalIndex);
+				for (int verticalIndex = 0; verticalIndex < lowerMaxVertical; verticalIndex++)
+					dataToMerge[(z * 2 + x) * lowerMaxVertical + verticalIndex] = lowerLevelContainer.getData(childPosX, childPosZ, verticalIndex);
 			}
 		}
 		data = DataPointUtil.mergeMultiData(dataToMerge, lowerMaxVertical, getMaxVerticalData());
-
-		for(int verticalIndex = 0; (verticalIndex < data.length) && (verticalIndex < maxVerticalData); verticalIndex++)
+		
+		for (int verticalIndex = 0; (verticalIndex < data.length) && (verticalIndex < maxVerticalData); verticalIndex++)
 		{
 			addData(data[verticalIndex],
 					posX,
@@ -166,62 +185,34 @@ public class VerticalLevelContainer implements LevelContainer
 					verticalIndex);
 		}
 	}
-
+	
+	@Override
 	public byte[] toDataString()
 	{
 		int index = 0;
-		int counter = -1;
-		byte last = -1;
 		int x = size * size * maxVerticalData;
 		int tempIndex;
-		byte[] tempData = ThreadMapUtil.getSaveContainer();
 		long current;
-		if(tempData == null || tempData.length != (2 + (x * 8)))
-			tempData = new byte[2 + (x * 8)];
-		else
-			Arrays.fill(tempData, (byte) 0);
-
+		
+		byte[] tempData = ThreadMapUtil.getSaveContainer(detailLevel);
+		
 		tempData[index] = detailLevel;
 		index++;
 		tempData[index] = (byte) maxVerticalData;
 		index++;
-
+		
 		for (int i = 0; i < x; i++)
 		{
 			current = dataContainer[i];
-			if ((current & 0b11) == 0 || (current & 0b11) == 3)
-			{
-				current &= 0b11; //clean any garbage data after those two bits
-				last = (byte) current;
-				if (current == 3) //skip rest of void chunk
-					i += maxVerticalData - 1;
-				counter++;
-			} else {
-				for (tempIndex = 0; tempIndex < 8; tempIndex++)
-					tempData[index + tempIndex] = (byte) (current >>> (8 * tempIndex));
-				index += 8;
-			}
-			if (last != -1 && ( i == x - 1 || last != ((dataContainer[i + 1]) & 0b11)))
-			{ //save compressed data if next is different or if we reached onf of the data
-				tempData[index] = (byte)(0x7f & ((counter << 2) + last)); //save 5 bits of counter and compressed block
-
-				tempIndex = 0;
-				while ((counter >>> (5 + 7 * tempIndex)) != 0) //there is more of that counter
-				{
-					tempData[index] = (byte)(tempData[index] | 0x80); //set overflow bit to true
-					index++; // after setting overflow bit w can actually index++
-					tempData[index] = (byte)(0x7f & (counter >>> (5 + 7 * tempIndex))); // save 7 bits of counter
-					tempIndex++;
-				}
-				index++;
-				last = -1;
-				counter = -1;
-			}
+			for (tempIndex = 0; tempIndex < 8; tempIndex++)
+				tempData[index + tempIndex] = (byte) (current >>> (8 * tempIndex));
+			index += 8;
 		}
-		return Arrays.copyOfRange(tempData, 0, index);
+		return tempData;
 	}
-
+	
 	@Override
+	@SuppressWarnings("unused")
 	public String toString()
 	{
 		/*
@@ -242,12 +233,10 @@ public class VerticalLevelContainer implements LevelContainer
 		 */
 		return " ";
 	}
-
-	public int getMaxNumberOfLods(){
-		return size*size*getMaxVerticalData();
-	}
-
-	public int getMaxMemoryUse(){
-		return getMaxNumberOfLods() * 2; //2 byte
+	
+	@Override
+	public int getMaxNumberOfLods()
+	{
+		return size * size * getMaxVerticalData();
 	}
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,6 +16,7 @@
 *    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.proxy;

 import org.apache.logging.log4j.LogManager;
@@ -22,9 +24,9 @@ import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;

 import com.mojang.blaze3d.matrix.MatrixStack;
-import com.seibel.lod.builders.LodBufferBuilder;
-import com.seibel.lod.builders.LodBuilder;
-import com.seibel.lod.builders.worldGeneration.LodNodeGenWorker;
+import com.seibel.lod.builders.bufferBuilding.LodBufferBuilder;
+import com.seibel.lod.builders.lodBuilding.LodBuilder;
+import com.seibel.lod.builders.worldGeneration.LodGenWorker;
 import com.seibel.lod.builders.worldGeneration.LodWorldGenerator;
 import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.DistanceGenerationMode;
@@ -40,7 +42,6 @@ import com.seibel.lod.wrappers.MinecraftWrapper;

 import net.minecraft.profiler.IProfiler;
 import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.world.DimensionType;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.world.BlockEvent;
@@ -51,35 +52,33 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 /**
 * This handles all events sent to the client,
 * and is the starting point for most of the mod.
- *
 * @author James_Seibel
- * @version 9-23-2021
+ * @version 10-23-2021
 */
 public class ClientProxy
 {
 	public static final Logger LOGGER = LogManager.getLogger("LOD");
 	
+	/**
+	 * there is some setup that should only happen once,
+	 * once this is true that setup has completed
+	 */
 	private boolean firstTimeSetupComplete = false;
-	public static boolean drawLods = true;
 	
-	private static LodWorld lodWorld = new LodWorld();
-	private static LodBuilder lodBuilder = new LodBuilder();
-	private static LodBufferBuilder lodBufferBuilder = new LodBufferBuilder();
+	private static final LodWorld lodWorld = new LodWorld();
+	private static final LodBuilder lodBuilder = new LodBuilder();
+	private static final LodBufferBuilder lodBufferBuilder = new LodBufferBuilder();
 	private static LodRenderer renderer = new LodRenderer(lodBufferBuilder);
-	private static LodWorldGenerator lodWorldGenerator = LodWorldGenerator.INSTANCE;
+	private static final LodWorldGenerator lodWorldGenerator = LodWorldGenerator.INSTANCE;
 	
 	private boolean configOverrideReminderPrinted = false;
 	
-	private MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	private final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
 	
 	
-	/**
-	 * This is used to determine if the LODs should be regenerated
-	 */
+	/** This is used to determine if the LODs should be regenerated */
 	public static int previousChunkRenderDistance = 0;
-	/**
-	 * This is used to determine if the LODs should be regenerated
-	 */
+	/** This is used to determine if the LODs should be regenerated */
 	public static int previousLodRenderDistance = 0;
 	
 	/**
@@ -87,7 +86,6 @@ public class ClientProxy
 	 * to the LOD view distance
 	 */
 	private boolean recalculateWidths = false;
-	private DimensionType currentDimension = null;
 	
 	public ClientProxy()
 	{
@@ -99,15 +97,11 @@ public class ClientProxy
 	// render event //
 	//==============//
 	
-	/**
-	 * Do any setup that is required to draw LODs
-	 * and then tell the LodRenderer to draw.
-	 * @param mcMatrixStack 
-	 */
+	/** Do any setup that is required to draw LODs and then tell the LodRenderer to draw. */
 	public void renderLods(MatrixStack mcMatrixStack, float partialTicks)
 	{
 		// comment out when creating a release
-		applyConfigOverrides();
+		// applyConfigOverrides();
 		
 		// clear any out of date objects
 		mc.clearFrameObjectCache();
@@ -116,30 +110,22 @@ public class ClientProxy
 		{
 			// only run the first time setup once
 			if (!firstTimeSetupComplete)
-			{
-				ThreadMapUtil.clearMaps();
 				firstFrameSetup();
-			}
 			
-			if(mc.getCurrentDimension() != currentDimension)
-			{
-				currentDimension = mc.getCurrentDimension();
-				reset();
-			}
 			
-			DetailDistanceUtil.updateSettings();
-			if (mc == null || mc.getPlayer() == null || !lodWorld.getIsWorldLoaded())
+			if (mc == null || mc.getPlayer() == null || lodWorld.getIsWorldNotLoaded())
 				return;
 			
 			LodDimension lodDim = lodWorld.getLodDimension(mc.getCurrentDimension());
 			if (lodDim == null)
 				return;
 			
+			DetailDistanceUtil.updateSettings();
 			viewDistanceChangedEvent();
 			playerMoveEvent(lodDim);
 			
-			lodDim.treeCutter((int) mc.getPlayer().getX(), (int) mc.getPlayer().getZ());
-			lodDim.treeGenerator((int) mc.getPlayer().getX(), (int) mc.getPlayer().getZ());
+			lodDim.cutRegionNodesAsync((int) mc.getPlayer().getX(), (int) mc.getPlayer().getZ());
+			lodDim.expandOrLoadRegionsAsync((int) mc.getPlayer().getX(), (int) mc.getPlayer().getZ());
 			
 			
 			// Note to self:
@@ -150,10 +136,7 @@ public class ClientProxy
 			profiler.pop(); // get out of "terrain"
 			profiler.push("LOD");
 			
-			if(drawLods)
-			{
-				renderer.drawLODs(lodDim, mcMatrixStack, partialTicks, mc.getProfiler());
-			}
+			renderer.drawLODs(lodDim, mcMatrixStack, partialTicks, mc.getProfiler());
 			
 			profiler.pop(); // end LOD
 			profiler.push("terrain"); // go back into "terrain"
@@ -162,7 +145,7 @@ public class ClientProxy
 			// these can't be set until after the buffers are built (in renderer.drawLODs)
 			// otherwise the buffers may be set to the wrong size, or not changed at all
 			previousChunkRenderDistance = mc.getRenderDistance();
-			previousLodRenderDistance = LodConfig.CLIENT.graphics.lodChunkRenderDistance.get();
+			previousLodRenderDistance = LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.get();
 		}
 		catch (Exception e)
 		{
@@ -171,42 +154,39 @@ public class ClientProxy
 		}
 	}
 	
-	
+	/** used in a development environment to change settings on the fly */
 	private void applyConfigOverrides()
 	{
 		// remind the developer(s) that the config override is active
 		if (!configOverrideReminderPrinted)
 		{
-			//mc.getPlayer().sendMessage(new StringTextComponent("Debug settings enabled!"), mc.getPlayer().getUUID());
+//			mc.getPlayer().sendMessage(new StringTextComponent("LOD experimental build 1.5.1"), mc.getPlayer().getUUID());
+//			mc.getPlayer().sendMessage(new StringTextComponent("Here be dragons!"), mc.getPlayer().getUUID());
 			
-			// this was changed just for the buggy pre-release, since the code was already here
-			mc.getPlayer().sendMessage(new StringTextComponent("Warning: LOD mod 1.5 buggy pre-release"), mc.getPlayer().getUUID());
-			mc.getPlayer().sendMessage(new StringTextComponent("Hic sunt dracones"), mc.getPlayer().getUUID()); // Here be dragons
+			mc.getPlayer().sendMessage(new StringTextComponent("Debug settings enabled!"), mc.getPlayer().getUUID());
 			configOverrideReminderPrinted = true;
 		}
-		
-		
+
 //		LodConfig.CLIENT.graphics.drawResolution.set(HorizontalResolution.BLOCK);
 //		LodConfig.CLIENT.worldGenerator.generationResolution.set(HorizontalResolution.BLOCK);
 		// requires a world restart?
-//		LodConfig.CLIENT.worldGenerator.lodQualityMode.set(VerticalQuality.MULTI_LOD);
-		
-//		LodConfig.CLIENT.graphics.fogDistance.set(FogDistance.FAR);
+//		LodConfig.CLIENT.worldGenerator.lodQualityMode.set(VerticalQuality.VOXEL);
+
+//		LodConfig.CLIENT.graphics.fogQualityOption.fogDistance.set(FogDistance.FAR);
 //		LodConfig.CLIENT.graphics.fogDrawOverride.set(FogDrawOverride.ALWAYS_DRAW_FOG_FANCY);
 //		LodConfig.CLIENT.graphics.shadingMode.set(ShadingMode.DARKEN_SIDES);
-//		LodConfig.CLIENT.graphics.brightnessMultiplier.set(1.0);
-//		LodConfig.CLIENT.graphics.saturationMultiplier.set(1.0);
+//		LodConfig.CLIENT.graphics.vanillaOverdraw.set(VanillaOverdraw.HALF);
+		
+//		LodConfig.CLIENT.graphics.advancedGraphicsOption.gpuUploadMethod.set(GpuUploadMethod.BUFFER_STORAGE);

 //		LodConfig.CLIENT.worldGenerator.distanceGenerationMode.set(DistanceGenerationMode.SURFACE);
-//		LodConfig.CLIENT.graphics.lodChunkRenderDistance.set(64);
+//		LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.set(128);
 //		LodConfig.CLIENT.worldGenerator.lodDistanceCalculatorType.set(DistanceCalculatorType.LINEAR);
 //		LodConfig.CLIENT.worldGenerator.allowUnstableFeatureGeneration.set(false);
-
-//		LodConfig.CLIENT.buffers.bufferRebuildPlayerMoveTimeout.set(2000); // 2000
-//		LodConfig.CLIENT.buffers.bufferRebuildChunkChangeTimeout.set(1000); // 1000
-//		LodConfig.CLIENT.buffers.bufferRebuildLodChangeTimeout.set(5000); // 5000
 		
-//		LodConfig.CLIENT.debugging.enableDebugKeybindings.set(true);
+//		LodConfig.CLIENT.buffers.rebuildTimes.set(BufferRebuildTimes.FREQUENT);
+		
+		LodConfig.CLIENT.advancedModOptions.debugging.enableDebugKeybindings.set(true);
 //		LodConfig.CLIENT.debugging.debugMode.set(DebugMode.SHOW_DETAIL);
 	}
 	
@@ -218,7 +198,7 @@ public class ClientProxy
 	@SubscribeEvent
 	public void serverTickEvent(TickEvent.ServerTickEvent event)
 	{
-		if (mc == null || mc.getPlayer() == null || !lodWorld.getIsWorldLoaded())
+		if (mc == null || mc.getPlayer() == null || lodWorld.getIsWorldNotLoaded())
 			return;
 		
 		LodDimension lodDim = lodWorld.getLodDimension(mc.getPlayer().level.dimensionType());
@@ -241,12 +221,17 @@ public class ClientProxy
 			lodWorld.saveAllDimensions();
 	}
 	
+	/** This is also called when a new dimension loads */
 	@SubscribeEvent
 	public void worldLoadEvent(WorldEvent.Load event)
 	{
 		DataPointUtil.worldHeight = event.getWorld().getHeight();
+		//LodNodeGenWorker.restartExecutorService();
+		//ThreadMapUtil.clearMaps();
+		
 		// the player just loaded a new world/dimension
 		lodWorld.selectWorld(LodUtil.getWorldID(event.getWorld()));
+		
 		// make sure the correct LODs are being rendered
 		// (if this isn't done the previous world's LODs may be drawn)
 		renderer.regenerateLODsNextFrame();
@@ -256,14 +241,19 @@ public class ClientProxy
 	public void worldUnloadEvent(WorldEvent.Unload event)
 	{
 		// the player just unloaded a world/dimension
+		ThreadMapUtil.clearMaps();
+		
+		
 		if (mc.getConnection().getLevel() == null)
 		{
+			// the player just left the server
+			
 			// if this isn't done unfinished tasks may be left in the queue
 			// preventing new LodChunks form being generated
-			LodNodeGenWorker.restartExecuterService();
+			//LodNodeGenWorker.restartExecutorService();
+			//ThreadMapUtil.clearMaps();
 			
 			LodWorldGenerator.INSTANCE.numberOfChunksWaitingToGenerate.set(0);
-			// the player has disconnected from a server
 			lodWorld.deselectWorld();
 			
 			
@@ -271,10 +261,11 @@ public class ClientProxy
 			// breaking when changing worlds.
 			renderer.destroyBuffers();
 			recalculateWidths = true;
+			renderer = new LodRenderer(lodBufferBuilder);
 			
 			
-			// make sure the nulled objects are freed.
-			// (this prevents a out of memory error when
+			// make sure the nilled objects are freed.
+			// (this prevents an out of memory error when
 			// changing worlds)
 			System.gc();
 		}
@@ -295,33 +286,34 @@ public class ClientProxy
 	}
 	
 	@SubscribeEvent
-	public void onKeyInput(InputEvent.KeyInputEvent event) 
+	public void onKeyInput(InputEvent.KeyInputEvent event)
 	{
-		if(LodConfig.CLIENT.debugging.enableDebugKeybindings.get()
+		if (LodConfig.CLIENT.advancedModOptions.debugging.enableDebugKeybindings.get()
 				&& event.getKey() == GLFW.GLFW_KEY_F4 && event.getAction() == GLFW.GLFW_PRESS)
 		{
-			LodConfig.CLIENT.debugging.debugMode.set(LodConfig.CLIENT.debugging.debugMode.get().getNext());
+			LodConfig.CLIENT.advancedModOptions.debugging.debugMode.set(LodConfig.CLIENT.advancedModOptions.debugging.debugMode.get().getNext());
 		}
 		
-		if(LodConfig.CLIENT.debugging.enableDebugKeybindings.get()
+		if (LodConfig.CLIENT.advancedModOptions.debugging.enableDebugKeybindings.get()
 				&& event.getKey() == GLFW.GLFW_KEY_F6 && event.getAction() == GLFW.GLFW_PRESS)
 		{
-			drawLods = !drawLods;
+			LodConfig.CLIENT.advancedModOptions.debugging.drawLods.set(!LodConfig.CLIENT.advancedModOptions.debugging.drawLods.get());
 		}
 	}
 	
+	
+	
+	
 	//============//
 	// LOD events //
 	//============//
 	
-	/**
-	 * Re-centers the given LodDimension if it needs to be.
-	 */
+	/** Re-centers the given LodDimension if it needs to be. */
 	private void playerMoveEvent(LodDimension lodDim)
 	{
 		// make sure the dimension is centered
 		RegionPos playerRegionPos = new RegionPos(mc.getPlayer().blockPosition());
-		RegionPos worldRegionOffset = new RegionPos(playerRegionPos.x - lodDim.getCenterX(), playerRegionPos.z - lodDim.getCenterZ());
+		RegionPos worldRegionOffset = new RegionPos(playerRegionPos.x - lodDim.getCenterRegionPosX(), playerRegionPos.z - lodDim.getCenterRegionPosZ());
 		if (worldRegionOffset.x != 0 || worldRegionOffset.z != 0)
 		{
 			lodWorld.saveAllDimensions();
@@ -331,15 +323,19 @@ public class ClientProxy
 	}
 	
 	
-	/**
-	 * Re-sizes all LodDimensions if they needs to be.
-	 */
+	/** Re-sizes all LodDimensions if they need to be. */
 	private void viewDistanceChangedEvent()
 	{
 		// calculate how wide the dimension(s) should be in regions
-		int chunksWide = LodConfig.CLIENT.graphics.lodChunkRenderDistance.get() * 2 + 1;
+		int chunksWide;
+		if (mc.getClientWorld().dimensionType().hasCeiling())
+			chunksWide = Math.min(LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.get(), LodUtil.CEILED_DIMENSION_MAX_RENDER_DISTANCE) * 2 + 1;
+		else
+			chunksWide = LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.get() * 2 + 1;
+		
 		int newWidth = (int) Math.ceil(chunksWide / (float) LodUtil.REGION_WIDTH_IN_CHUNKS);
-		newWidth = (newWidth % 2 == 0) ? (newWidth += 1) : (newWidth += 2); // make sure we have a odd number of regions
+		// make sure we have an odd number of regions
+		newWidth += (newWidth & 1) == 0 ? 1 : 2;
 		
 		// do the dimensions need to change in size?
 		if (lodBuilder.defaultDimensionWidthInRegions != newWidth || recalculateWidths)
@@ -358,27 +354,26 @@ public class ClientProxy
 	}
 	
 	
-	/**
-	 * This event is called once during the first frame Minecraft renders in the world.
-	 */
+	/** This event is called once during the first frame Minecraft renders in the world. */
 	public void firstFrameSetup()
 	{
-		// make sure the GlProxy is created before the LodBufferBuilder
+		// make sure the GlProxy is created before the LodBufferBuilder needs it
 		GlProxy.getInstance();
 		
-		
-		
 		firstTimeSetupComplete = true;
 	}
 	
-	
-	public static void reset()
+	/** this method reset some static data every time we change world */
+	private void resetMod()
 	{
-		renderer = new LodRenderer(lodBufferBuilder);
-		LodNodeGenWorker.resetGenerator();
 		ThreadMapUtil.clearMaps();
+		LodGenWorker.restartExecutorService();
+		
 	}
 	
+	
+	
+	
 	//================//
 	// public getters //
 	//================//
@@ -1,77 +1,136 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.proxy;

+import org.lwjgl.glfw.GLFW;
 import org.lwjgl.opengl.GL;
 import org.lwjgl.opengl.GLCapabilities;
-import org.lwjgl.opengl.WGL;

 import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.lod.ModInfo;
+import com.seibel.lod.enums.GlProxyContext;
+import com.seibel.lod.wrappers.MinecraftWrapper;

 /**
 * A singleton that holds references to different openGL contexts
 * and GPU capabilities.
- * 
+ *
 * <p>
 * Helpful OpenGL resources: <br><br>
- * 
+ * <p>
 * https://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-AsynchronousBufferTransfers.pdf <br>
 * https://learnopengl.com/Advanced-OpenGL/Advanced-Data <br>
 * https://gamedev.stackexchange.com/questions/91995/edit-vbo-data-or-create-a-new-one <br><br>
 * 
- * 
 * @author James Seibel
- * @version 9-15-2021
+ * @version 10-23-2021
 */
 public class GlProxy
 {
 	private static GlProxy instance = null;
 	
-	public final long deviceContext;
+	private static MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
 	
-	public long minecraftGlContext;
-	public GLCapabilities minecraftGlCapabilities;
+	/** Minecraft's GLFW window */
+	public final long minecraftGlContext;
+	/** Minecraft's GL context */
+	public final GLCapabilities minecraftGlCapabilities;
 	
-	public long lodBuilderGlContext;
-	public GLCapabilities lodBuilderGlCapabilities;
-	/** This is just used for debugging, hopefuly it can be removed once 
-	 * the context switching is more stable. */
-	public Thread lodBuilderOwnerThread = null;
+	/** the LodBuilder's GLFW window */
+	public final long lodBuilderGlContext;
+	/** the LodBuilder's GL context */
+	public final GLCapabilities lodBuilderGlCapabilities;
 	
 	/**
-	 * Does this computer's GPU support fancy fog?
+	 * This is just used for debugging, hopefully it can be removed once
+	 * the context switching is more stable.
 	 */
+	public Thread lodBuilderOwnerThread = null;
+	
+	/** Does this computer's GPU support fancy fog? */
 	public final boolean fancyFogAvailable;
 	
+	/** Requires OpenGL 4.5, and offers the best buffer uploading */
+	public final boolean bufferStorageSupported;
+	
+	/** Requires OpenGL 3.0 */
+	public final boolean mapBufferRangeSupported;
 	
 	
 	private GlProxy()
 	{
+		ClientProxy.LOGGER.error("Creating " + GlProxy.class.getSimpleName() + "... If this is the last message you see in the log there must have been a OpenGL error.");
+		
 		// getting Minecraft's context has to be done on the render thread,
 		// where the GL context is
 		if (!RenderSystem.isOnRenderThread())
 			throw new IllegalStateException(GlProxy.class.getSimpleName() + " was created outside the render thread!");
-		
-		
+				
 		
 		
 		//============================//
 		// create the builder context //
 		//============================//
 		
-		minecraftGlContext = WGL.wglGetCurrentContext();
+		// get Minecraft's context
+		minecraftGlContext = GLFW.glfwGetCurrentContext();
 		minecraftGlCapabilities = GL.getCapabilities();
-		deviceContext = WGL.wglGetCurrentDC();
 		
-		lodBuilderGlContext = WGL.wglCreateContext(deviceContext);
-		if (!WGL.wglShareLists(minecraftGlContext, lodBuilderGlContext))
-			throw new IllegalStateException("Unable to share lists between Minecraft and builder contexts.");
-		if (!WGL.wglMakeCurrent(deviceContext, lodBuilderGlContext))
-			throw new IllegalStateException("Unable to change OpenGL contexts! tried to change to [" + GlProxyContext.LOD_BUILDER.toString() + "] from [" + GlProxyContext.MINECRAFT.toString() + "]");
+		// create the LodBuilder's context
+		
+		// Hopefully this shouldn't cause any issues with other mods that need custom contexts
+		// (although the number that do should be relatively few)
+		GLFW.glfwWindowHint(GLFW.GLFW_VISIBLE, GLFW.GLFW_FALSE);
+		
+		// create an invisible window to hold the context
+		lodBuilderGlContext = GLFW.glfwCreateWindow(640, 480, "LOD window", 0L, minecraftGlContext);
+		GLFW.glfwMakeContextCurrent(lodBuilderGlContext);
 		lodBuilderGlCapabilities = GL.createCapabilities();
-		WGL.wglMakeCurrent(deviceContext, 0L);
-		
 		
 		// Since this is called on the render thread, make sure the Minecraft context is used in the end
-		WGL.wglMakeCurrent(deviceContext, minecraftGlContext);
+		GLFW.glfwMakeContextCurrent(minecraftGlContext);
+		GL.setCapabilities(minecraftGlCapabilities);
+		
+		
+		
+		
+		//==============================//
+		// determine the OpenGL version // 
+		//==============================//
+		
+		bufferStorageSupported = minecraftGlCapabilities.OpenGL45;
+		mapBufferRangeSupported = minecraftGlCapabilities.OpenGL30;
+		
+		if (!minecraftGlCapabilities.OpenGL15)
+		{
+			String errorMessage = ModInfo.READABLE_NAME + " was initializing " + GlProxy.class.getSimpleName() + " and discoverd this GPU doesn't support OpenGL 1.5 or greater.";
+			mc.crashMinecraft(errorMessage + " Sorry I couldn't tell you sooner :(", new UnsupportedOperationException("This GPU doesn't support OpenGL 1.5 or greater."));
+		}
+		
+		if (!bufferStorageSupported)
+		{
+			String fallBackVersion = mapBufferRangeSupported ? "3.0" : "1.5";  
+			
+			ClientProxy.LOGGER.error("This GPU doesn't support OpenGL 4.5, falling back to OpenGL " + fallBackVersion + ". This may cause stuttering and reduced performance.");			
+		}
+			
 		
 		
 		
@@ -82,20 +141,23 @@ public class GlProxy
 		
 		// see if this GPU can run fancy fog
 		fancyFogAvailable = GL.getCapabilities().GL_NV_fog_distance;
-
+		
 		if (!fancyFogAvailable)
-		{
 			ClientProxy.LOGGER.info("This GPU does not support GL_NV_fog_distance. This means that the fancy fog option will not be available.");
-		}
+		
+		
+		
+		
+		// GlProxy creation success
+		ClientProxy.LOGGER.error(GlProxy.class.getSimpleName() + " creation successful. OpenGL smiles upon you this day.");
 	}
 	
 	
+	
+	
 	/**
-	 * A simple wrapper function to make switching contexts easier
-	 * 
-	 * @throws IllegalStateException if unable to change to newContext. <br>
-	 * 								 This expection should never be thrown if 
-	 * 								 switching to GlProxyContext.NONE
+	 * A wrapper function to make switching contexts easier. <br>
+	 * Does nothing if the calling thread is already using newContext.
 	 */
 	public void setGlContext(GlProxyContext newContext)
 	{
@@ -108,81 +170,75 @@ public class GlProxy
 		
 		long contextPointer = 0L;
 		GLCapabilities newGlCapabilities = null;
-		switch(newContext)
+		
+		// get the pointer(s) for this context
+		switch (newContext)
 		{
 		case LOD_BUILDER:
 			contextPointer = lodBuilderGlContext;
 			newGlCapabilities = lodBuilderGlCapabilities;
 			break;
+		
 		case MINECRAFT:
 			contextPointer = minecraftGlContext;
 			newGlCapabilities = minecraftGlCapabilities;
 			break;
+		
+		default: // default should never happen, it is just here to make the compiler happy
 		case NONE:
-			contextPointer = 0L; // equivalent to null
-			newGlCapabilities = null;
+			// 0L is equivalent to null
 			break;
-			
-		default:
-			// should never happen, here to make the compiler happy
 		}
 		
-		if (!WGL.wglMakeCurrent(deviceContext, contextPointer))
-			throw new IllegalStateException("Unable to change OpenGL contexts! tried to change to [" + newContext.toString() + "] from [" + currentContext.toString() + "] on thread: [" + Thread.currentThread().getName() + "] lod builder owner thread: " + (lodBuilderOwnerThread != null ? lodBuilderOwnerThread.getName() : "null"));
-		
-		if (newContext == GlProxyContext.LOD_BUILDER)
-		{
-			lodBuilderOwnerThread = Thread.currentThread();
-		}
-		else if (newContext == GlProxyContext.NONE && currentContext == GlProxyContext.LOD_BUILDER)
-		{
-			lodBuilderOwnerThread = null;
-		}
 		
+		GLFW.glfwMakeContextCurrent(contextPointer);
 		GL.setCapabilities(newGlCapabilities);
+		
+		
+		
+		// used for debugging
+		if (newContext == GlProxyContext.LOD_BUILDER)
+			lodBuilderOwnerThread = Thread.currentThread();
+		else if (newContext == GlProxyContext.NONE && currentContext == GlProxyContext.LOD_BUILDER)
+			lodBuilderOwnerThread = null;
 	}
 	
-	/**
-	 * Returns this thread's OpenGL context.
-	 */
+	
+	
+	
+	
+	/** Returns this thread's OpenGL context. */
 	public GlProxyContext getGlContext()
 	{
-		long currentContext = WGL.wglGetCurrentContext();
-		if(currentContext == lodBuilderGlContext)
-		{
+		long currentContext = GLFW.glfwGetCurrentContext();
+		
+		
+		if (currentContext == lodBuilderGlContext)
 			return GlProxyContext.LOD_BUILDER;
-		}
-		else if(currentContext == minecraftGlContext)
-		{
+		else if (currentContext == minecraftGlContext)
 			return GlProxyContext.MINECRAFT;
-		}
-		else 
-		{
+		else if (currentContext == 0L)
 			return GlProxyContext.NONE;
-		}
+		else
+			// hopefully this shouldn't happen, but
+			// at least now we will be notified if it does happen
+			throw new IllegalStateException(Thread.currentThread().getName() + " has a unknown OpenGl context: [" + currentContext + "]. Minecraft context [" + minecraftGlContext + "], LodBuilder context [" + lodBuilderGlContext + "], no context [0].");
 	}
 	
-	/** Minecraft, Alpha, Beta, None */
-	public enum GlProxyContext
-	{
-		MINECRAFT,
-		LOD_BUILDER,
-		
-		/** used to un-bind threads */
-		NONE,
-	}
 	
 	public static GlProxy getInstance()
 	{
-		try
-		{
-			if (instance == null)
-				instance = new GlProxy();
-		}catch (Exception e)
-		{
-			e.printStackTrace();
-		}
+		if (instance == null)
+			instance = new GlProxy();
 		
 		return instance;
 	}
+	
+	
+	
+	
+	
+	
+	
+	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,12 +16,9 @@
 *    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.render;

-import com.seibel.lod.config.LodConfig;
-import com.seibel.lod.enums.LodTemplate;
-import com.seibel.lod.objects.LodRegion;
-import com.seibel.lod.util.DetailDistanceUtil;
 import com.seibel.lod.util.LodUtil;
 import com.seibel.lod.wrappers.MinecraftWrapper;

@@ -33,7 +31,7 @@ import net.minecraft.util.math.vector.Vector3d;
 * to be used in the rendering process.
 * 
 * @author James Seibel
- * @version 8-21-2021
+ * @version 10-19-2021
 */
 public class RenderUtil
 {
@@ -42,15 +40,15 @@ public class RenderUtil
 	
 	/**
 	 * Returns if the given ChunkPos is in the loaded area of the world.
-	 * @param centerCoordinate the center of the loaded world (probably the player's ChunkPos)
+	 * @param center the center of the loaded world (probably the player's ChunkPos)
 	 */
 	public static boolean isChunkPosInLoadedArea(ChunkPos pos, ChunkPos center)
 	{
-		return (pos.x >= center.x - mc.getRenderDistance() 
-				&& pos.x <= center.x + mc.getRenderDistance()) 
-				&& 
-				(pos.z >= center.z - mc.getRenderDistance() 
-				&& pos.z <= center.z + mc.getRenderDistance());
+		return (pos.x >= center.x - mc.getRenderDistance()
+				&& pos.x <= center.x + mc.getRenderDistance())
+				&&
+				(pos.z >= center.z - mc.getRenderDistance()
+						&& pos.z <= center.z + mc.getRenderDistance());
 	}
 	
 	/**
@@ -59,11 +57,11 @@ public class RenderUtil
 	 */
 	public static boolean isCoordinateInLoadedArea(int x, int z, int centerCoordinate)
 	{
-		return (x >= centerCoordinate - mc.getRenderDistance() 
-				&& x <= centerCoordinate + mc.getRenderDistance()) 
-				&& 
-				(z >= centerCoordinate - mc.getRenderDistance() 
-				&& z <= centerCoordinate + mc.getRenderDistance());
+		return (x >= centerCoordinate - mc.getRenderDistance()
+				&& x <= centerCoordinate + mc.getRenderDistance())
+				&&
+				(z >= centerCoordinate - mc.getRenderDistance()
+						&& z <= centerCoordinate + mc.getRenderDistance());
 	}
 	
 	
@@ -75,78 +73,51 @@ public class RenderUtil
 	{
 		int halfRadius = lodRadius / 2;
 		
-		return (i >= lodRadius - halfRadius 
-				&& i <= lodRadius + halfRadius) 
-				&& 
+		return (i >= lodRadius - halfRadius
+				&& i <= lodRadius + halfRadius)
+				&&
 				(j >= lodRadius - halfRadius
-				&& j <= lodRadius + halfRadius);
+						&& j <= lodRadius + halfRadius);
 	}
 	
 	
-	/**
-	 * Get how much buffer memory would be required for the given radius multiplier
-	 * 
-	 * issue #62
-	 * TODO check if this is actually returning the correct memory needed
-	 * it is possible (albeit unlikely) to have a buffer indexOutOfBounds exception
-	 * which is caused by the buffer not being big enough.
-	 */
-	public static int getBufferMemoryForRegion(LodRegion region)
-	{
-		// calculate the max amount of buffer memory needed (in bytes)
-		return region.getMinMemoryNeeded(LodConfig.CLIENT.graphics.lodTemplate.get());
-	}
-	
-	/**
-	 * Returns the maxViewDistanceMultiplier for the given LodTemplate
-	 * at the given LodDetail level.
-	 */
-	/*public static int getMaxRadiusMultiplierWithAvaliableMemory(LodTemplate lodTemplate, int detailLevel)
-	{
-		int maxNumberOfLods = LodRenderer.MAX_ALOCATEABLE_DIRECT_MEMORY / lodTemplate.getBufferMemoryForSingleLod();
-		int numbLodsWide = (int) Math.sqrt(maxNumberOfLods);
-		
-		return numbLodsWide / (2 * mc.getRenderDistance());
-	}*/
-	
-	
 	/**
 	 * Returns true if one of the region's 4 corners is in front
 	 * of the camera.
 	 */
 	public static boolean isRegionInViewFrustum(BlockPos playerBlockPos, Vector3d cameraDir, BlockPos vboCenterPos)
 	{
-    	// convert the vbo position into a direction vector
-    	// starting from the player's position
+		// convert the vbo position into a direction vector
+		// starting from the player's position
 		Vector3d vboVec = new Vector3d(vboCenterPos.getX(), 0, vboCenterPos.getZ());
 		Vector3d playerVec = new Vector3d(playerBlockPos.getX(), playerBlockPos.getY(), playerBlockPos.getZ());
 		Vector3d vboCenterVec = vboVec.subtract(playerVec);
 		
 		
-    	int halfRegionWidth = LodUtil.REGION_WIDTH / 2;
-    	
-    	// calculate the 4 corners
-    	Vector3d vboSeVec = new Vector3d(vboCenterVec.x + halfRegionWidth, vboCenterVec.y, vboCenterVec.z + halfRegionWidth);//.normalize();
-    	Vector3d vboSwVec = new Vector3d(vboCenterVec.x - halfRegionWidth, vboCenterVec.y, vboCenterVec.z + halfRegionWidth);//.normalize();
-    	Vector3d vboNwVec = new Vector3d(vboCenterVec.x - halfRegionWidth, vboCenterVec.y, vboCenterVec.z - halfRegionWidth);//.normalize();
-    	Vector3d vboNeVec = new Vector3d(vboCenterVec.x + halfRegionWidth, vboCenterVec.y, vboCenterVec.z - halfRegionWidth);//.normalize();
-    	
-    	// if any corner is visible, this region should be rendered
-    	return isNormalizedVectorInViewFrustum(vboSeVec, cameraDir) ||
-    			isNormalizedVectorInViewFrustum(vboSwVec, cameraDir) ||
-    			isNormalizedVectorInViewFrustum(vboNwVec, cameraDir) ||
-    			isNormalizedVectorInViewFrustum(vboNeVec, cameraDir);
+		int halfRegionWidth = LodUtil.REGION_WIDTH / 2;
+		
+		// calculate the 4 corners
+		Vector3d vboSeVec = new Vector3d(vboCenterVec.x + halfRegionWidth, vboCenterVec.y, vboCenterVec.z + halfRegionWidth);
+		Vector3d vboSwVec = new Vector3d(vboCenterVec.x - halfRegionWidth, vboCenterVec.y, vboCenterVec.z + halfRegionWidth);
+		Vector3d vboNwVec = new Vector3d(vboCenterVec.x - halfRegionWidth, vboCenterVec.y, vboCenterVec.z - halfRegionWidth);
+		Vector3d vboNeVec = new Vector3d(vboCenterVec.x + halfRegionWidth, vboCenterVec.y, vboCenterVec.z - halfRegionWidth);
+		
+		// if any corner is visible, this region should be rendered
+		return isNormalizedVectorInViewFrustum(vboSeVec, cameraDir) ||
+				isNormalizedVectorInViewFrustum(vboSwVec, cameraDir) ||
+				isNormalizedVectorInViewFrustum(vboNwVec, cameraDir) ||
+				isNormalizedVectorInViewFrustum(vboNeVec, cameraDir);
 	}
-    
+	
 	/**
 	 * Currently takes the dot product of the two vectors,
 	 * but in the future could do more complicated frustum culling tests.
 	 */
-    private static boolean isNormalizedVectorInViewFrustum(Vector3d objectVector, Vector3d cameraDir)
+	private static boolean isNormalizedVectorInViewFrustum(Vector3d objectVector, Vector3d cameraDir)
 	{
-    	// the -0.1 is to offer a slight buffer so we are
-    	// more likely to render LODs and thus, hopefully prevent
-    	// flickering or odd disappearences
-    	return objectVector.dot(cameraDir) > -0.1;
+		// the -0.1 is to offer a slight buffer, so we are
+		// more likely to render LODs and thus, hopefully prevent
+		// flickering or odd disappearances
+		return objectVector.dot(cameraDir) > -0.1;
 	}
 }
@@ -1,64 +1,94 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

-import java.awt.*;
+import java.awt.Color;

+import net.minecraft.client.renderer.texture.NativeImage;
+
+/**
+ * 
+ * @author Cola
+ * @author Leonardo Amato
+ * @version ??
+ */
 public class ColorUtil
 {
 	public static int rgbToInt(int red, int green, int blue)
 	{
 		return (0xFF << 24) | (red << 16) | (green << 8) | blue;
 	}
-
+	
 	public static int rgbToInt(int alpha, int red, int green, int blue)
 	{
 		return (alpha << 24) | (red << 16) | (green << 8) | blue;
 	}
-
+	
 	public static int getAlpha(int color)
 	{
 		return (color >> 24) & 0xFF;
 	}
-
+	
 	public static int getRed(int color)
 	{
 		return (color >> 16) & 0xFF;
 	}
-
+	
 	public static int getGreen(int color)
 	{
 		return (color >> 8) & 0xFF;
 	}
-
+	
 	public static int getBlue(int color)
 	{
 		return color & 0xFF;
 	}
-
+	
 	public static int applyShade(int color, int shade)
 	{
 		if (shade < 0)
-		{
 			return (getAlpha(color) << 24) | (Math.max(getRed(color) + shade, 0) << 16) | (Math.max(getGreen(color) + shade, 0) << 8) | Math.max(getBlue(color) + shade, 0);
-		} else
-		{
+		else
 			return (getAlpha(color) << 24) | (Math.min(getRed(color) + shade, 255) << 16) | (Math.min(getGreen(color) + shade, 255) << 8) | Math.min(getBlue(color) + shade, 255);
-		}
 	}
-
+	
 	public static int applyShade(int color, float shade)
 	{
 		if (shade < 1)
-		{
 			return (getAlpha(color) << 24) | ((int) Math.max(getRed(color) * shade, 0) << 16) | ((int) Math.max(getGreen(color) * shade, 0) << 8) | (int) Math.max(getBlue(color) * shade, 0);
-		} else
-		{
+		else
 			return (getAlpha(color) << 24) | ((int) Math.min(getRed(color) * shade, 255) << 16) | ((int) Math.min(getGreen(color) * shade, 255) << 8) | (int) Math.min(getBlue(color) * shade, 255);
-		}
 	}
-
-	/**
-	 * Edit the given color as a HSV (Hue Saturation Value) color.
-	 */
+	
+	/** This method apply the lightmap to the color to use */
+	public static int applyLightValue(int color, int skyLight, int blockLight, NativeImage lightMap)
+	{
+		int lightColor = lightMap.getPixelRGBA(blockLight, skyLight);
+		int red = ColorUtil.getBlue(lightColor);
+		int green = ColorUtil.getGreen(lightColor);
+		int blue = ColorUtil.getRed(lightColor);
+		
+		return ColorUtil.multiplyRGBcolors(color, ColorUtil.rgbToInt(red, green, blue));
+	}
+	
+	/** Edit the given color as an HSV (Hue Saturation Value) color */
 	public static int applySaturationAndBrightnessMultipliers(int color, float saturationMultiplier, float brightnessMultiplier)
 	{
 		float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null);
@@ -67,48 +97,19 @@ public class ColorUtil
 				LodUtil.clamp(0.0f, hsv[1] * saturationMultiplier, 1.0f),
 				LodUtil.clamp(0.0f, hsv[2] * brightnessMultiplier, 1.0f)).getRGB();
 	}
-
-	/**
-	 * Edit the given color as a HSV (Hue Saturation Value) color.
-	 */
-	public static int changeBrightness(int color, float brightness)
-	{
-		float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null);
-		return Color.getHSBColor(
-				hsv[0], // hue
-				hsv[1],
-				brightness).getRGB();
-	}
-
-	/**
-	 * Edit the given color as a HSV (Hue Saturation Value) color.
-	 */
-	public static int changeBrightnessValue(int color, int brightnessColor)
-	{
-		float[] hsv = Color.RGBtoHSB(getRed(color), getGreen(color), getBlue(color), null);
-		float brightness = Color.RGBtoHSB(getRed(brightnessColor), getGreen(brightnessColor), getBlue(brightnessColor), null)[2];
-		return Color.getHSBColor(
-				hsv[0], // hue
-				hsv[1],
-				brightness).getRGB();
-	}
+	
+	/** Multiply 2 RGB colors */
 	public static int multiplyRGBcolors(int color1, int color2)
 	{
-		/**TODO FIX the alpha*/
-		return 0xFF000000 | (((getRed(color1) * getRed(color2)) << 8) & 0xFF0000) | ((getGreen(color1) * getGreen(color2)) & 0xFF00) | (((getBlue(color1) * getBlue(color2)) >> 8) & 0xFF);
+		return ((getAlpha(color1) * getAlpha(color2) / 255) << 24) | ((getRed(color1) * getRed(color2) / 255) << 16) | ((getGreen(color1) * getGreen(color2) / 255) << 8) | (getBlue(color1) * getBlue(color2) / 255);
 	}
-
-
+	
+	@SuppressWarnings("unused")
 	public static String toString(int color)
 	{
-		StringBuilder s = new StringBuilder();
-		s.append(Integer.toHexString(getAlpha(color)));
-		s.append(" ");
-		s.append(Integer.toHexString(getRed(color)));
-		s.append(" ");
-		s.append(Integer.toHexString(getGreen(color)));
-		s.append(" ");
-		s.append(Integer.toHexString(getBlue(color)));
-		return s.toString();
+		return Integer.toHexString(getAlpha(color)) + " " +
+				Integer.toHexString(getRed(color)) + " " +
+				Integer.toHexString(getGreen(color)) + " " +
+				Integer.toHexString(getBlue(color));
 	}
 }
@@ -1,11 +1,35 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

-import java.util.Arrays;
+import static com.seibel.lod.builders.bufferBuilding.LodBufferBuilder.skyLightPlayer;

 import com.seibel.lod.enums.DistanceGenerationMode;

 import net.minecraft.client.renderer.texture.NativeImage;

+/**
+ * 
+ * @author Leonardo Amato
+ * @version ??
+ */
 public class DataPointUtil
 {
 	/*
@@ -24,57 +48,62 @@ public class DataPointUtil
 	|bl |bl |bl |bl |sl |sl |sl |sl |

 	|l  |l  |f  |g  |g  |g  |v  |e  |
-
-
+	
+	
 	 */
+	
+	// Reminder: bytes have range of [-128, 127].
+	// When converting to or from an int a 128 should be added or removed.
+	// If there is a bug with color then it's probably caused by this.
+	
 	//To be used in the future for negative value
 	//public final static int MIN_DEPTH = -64;
 	//public final static int MIN_HEIGHT = -64;
 	public final static int EMPTY_DATA = 0;
 	public static int worldHeight = 256;
-
+	
 	public final static int ALPHA_DOWNSIZE_SHIFT = 4;
-
+	
 	//public final static int BLUE_COLOR_SHIFT = 0;
 	//public final static int GREEN_COLOR_SHIFT = 8;
 	//public final static int RED_COLOR_SHIFT = 16;
 	//public final static int ALPHA_COLOR_SHIFT = 24;
-
+	
 	public final static int BLUE_SHIFT = 36;
 	public final static int GREEN_SHIFT = BLUE_SHIFT + 8;
 	public final static int RED_SHIFT = BLUE_SHIFT + 16;
 	public final static int ALPHA_SHIFT = BLUE_SHIFT + 24;
-
+	
 	public final static int COLOR_SHIFT = 36;
-
+	
 	public final static int HEIGHT_SHIFT = 26;
 	public final static int DEPTH_SHIFT = 16;
 	public final static int BLOCK_LIGHT_SHIFT = 12;
 	public final static int SKY_LIGHT_SHIFT = 8;
 	//public final static int LIGHTS_SHIFT = SKY_LIGHT_SHIFT;
 	//public final static int VERTICAL_INDEX_SHIFT = 6;
-	//public final static int FLAG_SHIFT = 5;
+	public final static int FLAG_SHIFT = 5;
 	public final static int GEN_TYPE_SHIFT = 2;
 	public final static int VOID_SHIFT = 1;
 	public final static int EXISTENCE_SHIFT = 0;
-
+	
 	public final static long ALPHA_MASK = 0b1111;
 	public final static long RED_MASK = 0b1111_1111;
 	public final static long GREEN_MASK = 0b1111_1111;
 	public final static long BLUE_MASK = 0b1111_1111;
-	//public final static long COLOR_MASK = 0b11111111_11111111_11111111;
+	public final static long COLOR_MASK = 0b11111111_11111111_11111111;
 	public final static long HEIGHT_MASK = 0b11_1111_1111;
 	public final static long DEPTH_MASK = 0b11_1111_1111;
 	//public final static long LIGHTS_MASK = 0b1111_1111;
 	public final static long BLOCK_LIGHT_MASK = 0b1111;
 	public final static long SKY_LIGHT_MASK = 0b1111;
 	//public final static long VERTICAL_INDEX_MASK = 0b11;
-	//public final static long FLAG_MASK = 0b1;
+	public final static long FLAG_MASK = 0b1;
 	public final static long GEN_TYPE_MASK = 0b111;
 	public final static long VOID_MASK = 1;
 	public final static long EXISTENCE_MASK = 1;
-
-
+	
+	
 	public static long createVoidDataPoint(int generationMode)
 	{
 		long dataPoint = 0;
@@ -83,21 +112,21 @@ public class DataPointUtil
 		dataPoint += EXISTENCE_MASK << EXISTENCE_SHIFT;
 		return dataPoint;
 	}
-
-	public static long createDataPoint(int height, int depth, int color, int lightSky, int lightBlock, int generationMode)
+	
+	public static long createDataPoint(int height, int depth, int color, int lightSky, int lightBlock, int generationMode, boolean flag)
 	{
 		return createDataPoint(
 				ColorUtil.getAlpha(color),
 				ColorUtil.getRed(color),
 				ColorUtil.getGreen(color),
 				ColorUtil.getBlue(color),
-				height, depth, lightSky, lightBlock, generationMode);
+				height, depth, lightSky, lightBlock, generationMode, flag);
 	}
-
-	public static long createDataPoint(int alpha, int red, int green, int blue, int height, int depth, int lightSky, int lightBlock, int generationMode)
+	
+	public static long createDataPoint(int alpha, int red, int green, int blue, int height, int depth, int lightSky, int lightBlock, int generationMode, boolean flag)
 	{
 		long dataPoint = 0;
-		dataPoint += ((alpha >>> ALPHA_DOWNSIZE_SHIFT) & ALPHA_MASK) << ALPHA_SHIFT;
+		dataPoint += (long) (alpha >>> ALPHA_DOWNSIZE_SHIFT) << ALPHA_SHIFT;
 		dataPoint += (red & RED_MASK) << RED_SHIFT;
 		dataPoint += (green & GREEN_MASK) << GREEN_SHIFT;
 		dataPoint += (blue & BLUE_MASK) << BLUE_SHIFT;
@@ -106,74 +135,87 @@ public class DataPointUtil
 		dataPoint += (lightBlock & BLOCK_LIGHT_MASK) << BLOCK_LIGHT_SHIFT;
 		dataPoint += (lightSky & SKY_LIGHT_MASK) << SKY_LIGHT_SHIFT;
 		dataPoint += (generationMode & GEN_TYPE_MASK) << GEN_TYPE_SHIFT;
+		if (flag) dataPoint += FLAG_MASK << FLAG_SHIFT;
 		dataPoint += EXISTENCE_MASK << EXISTENCE_SHIFT;
+		
 		return dataPoint;
 	}
-
+	
 	public static short getHeight(long dataPoint)
 	{
 		return (short) ((dataPoint >>> HEIGHT_SHIFT) & HEIGHT_MASK);
 	}
-
+	
 	public static short getDepth(long dataPoint)
 	{
-
 		return (short) ((dataPoint >>> DEPTH_SHIFT) & DEPTH_MASK);
 	}
-
+	
 	public static short getAlpha(long dataPoint)
 	{
-		return (short) (((dataPoint >>> ALPHA_SHIFT) & ALPHA_MASK) << ALPHA_DOWNSIZE_SHIFT);
+		return (short) ((((dataPoint >>> ALPHA_SHIFT) & ALPHA_MASK) << ALPHA_DOWNSIZE_SHIFT) | 0b1111);
 	}
-
+	
 	public static short getRed(long dataPoint)
 	{
 		return (short) ((dataPoint >>> RED_SHIFT) & RED_MASK);
 	}
-
+	
 	public static short getGreen(long dataPoint)
 	{
 		return (short) ((dataPoint >>> GREEN_SHIFT) & GREEN_MASK);
 	}
-
+	
 	public static short getBlue(long dataPoint)
 	{
 		return (short) ((dataPoint >>> BLUE_SHIFT) & BLUE_MASK);
 	}
-
+	
 	public static int getLightSky(long dataPoint)
 	{
 		return (int) ((dataPoint >>> SKY_LIGHT_SHIFT) & SKY_LIGHT_MASK);
 	}
-
+	
+	public static int getLightSkyAlt(long dataPoint)
+	{
+		if (skyLightPlayer == 0 && ((dataPoint >>> FLAG_SHIFT) & FLAG_MASK) == 1)
+			return 0;
+		else
+			return (int) ((dataPoint >>> SKY_LIGHT_SHIFT) & SKY_LIGHT_MASK);
+	}
+	
 	public static int getLightBlock(long dataPoint)
 	{
 		return (int) ((dataPoint >>> BLOCK_LIGHT_SHIFT) & BLOCK_LIGHT_MASK);
 	}
-
+	
+	public static boolean getFlag(long dataPoint)
+	{
+		return ((dataPoint >>> FLAG_SHIFT) & FLAG_MASK) == 1;
+	}
+	
 	public static byte getGenerationMode(long dataPoint)
 	{
 		return (byte) ((dataPoint >>> GEN_TYPE_SHIFT) & GEN_TYPE_MASK);
 	}
-
-
-	public static boolean isItVoid(long dataPoint)
+	
+	
+	public static boolean isVoid(long dataPoint)
 	{
 		return (((dataPoint >>> VOID_SHIFT) & VOID_MASK) == 1);
 	}
-
+	
 	public static boolean doesItExist(long dataPoint)
 	{
 		return (((dataPoint >>> EXISTENCE_SHIFT) & EXISTENCE_MASK) == 1);
 	}
-
+	
 	public static int getColor(long dataPoint)
 	{
-		//int color = getBlue(dataPoint) << BLUE_COLOR_SHIFT;
-		//color += getRed(dataPoint) << BLUE_COLOR_SHIFT;
-		return (int) (dataPoint >>> COLOR_SHIFT);
+		return (int) (((dataPoint >>> COLOR_SHIFT) & COLOR_MASK) | (/*((dataPoint >>> (ALPHA_SHIFT - ALPHA_DOWNSIZE_SHIFT)) | 0b1111)*/255 << 24));
 	}
-
+	
+	/** This method apply the lightmap to the color to use */
 	public static int getLightColor(long dataPoint, NativeImage lightMap)
 	{
 		int lightBlock = getLightBlock(dataPoint);
@@ -182,207 +224,224 @@ public class DataPointUtil
 		int red = ColorUtil.getBlue(color);
 		int green = ColorUtil.getGreen(color);
 		int blue = ColorUtil.getRed(color);
-
+		
 		return ColorUtil.multiplyRGBcolors(getColor(dataPoint), ColorUtil.rgbToInt(red, green, blue));
 	}
-
+	
+	/** This is used to convert a dataPoint to string (useful for the print function) */
+	@SuppressWarnings("unused")
 	public static String toString(long dataPoint)
 	{
-		StringBuilder s = new StringBuilder();
-		s.append(getHeight(dataPoint));
-		s.append(" ");
-		s.append(getDepth(dataPoint));
-		s.append(" ");
-		s.append(getAlpha(dataPoint));
-		s.append(" ");
-		s.append(getRed(dataPoint));
-		s.append(" ");
-		s.append(getBlue(dataPoint));
-		s.append(" ");
-		s.append(getGreen(dataPoint));
-		s.append(" ");
-		s.append(getLightBlock(dataPoint));
-		s.append(" ");
-		s.append(getLightSky(dataPoint));
-		s.append(" ");
-		s.append(getGenerationMode(dataPoint));
-		s.append(" ");
-		s.append(isItVoid(dataPoint));
-		s.append(" ");
-		s.append(doesItExist(dataPoint));
-		s.append('\n');
-		return s.toString();
+		return getHeight(dataPoint) + " " +
+				getDepth(dataPoint) + " " +
+				getAlpha(dataPoint) + " " +
+				getRed(dataPoint) + " " +
+				getBlue(dataPoint) + " " +
+				getGreen(dataPoint) + " " +
+				getLightBlock(dataPoint) + " " +
+				getLightSky(dataPoint) + " " +
+				getGenerationMode(dataPoint) + " " +
+				isVoid(dataPoint) + " " +
+				doesItExist(dataPoint) + '\n';
 	}
-
-	public static long mergeSingleData(long[] dataToMerge)
+	
+	public static void shrinkArray(short[] array, int packetSize, int start, int length, int arraySize)
 	{
-		int numberOfChildren = 0;
-
-		int tempAlpha = 0;
-		int tempRed = 0;
-		int tempGreen = 0;
-		int tempBlue = 0;
-		int tempHeight = Integer.MIN_VALUE;
-		int tempDepth = Integer.MAX_VALUE;
-		int tempLightBlock = 0;
-		int tempLightSky = 0;
-		byte tempGenMode = DistanceGenerationMode.SERVER.complexity;
-		boolean allEmpty = true;
-		boolean allVoid = true;
-		for (long data : dataToMerge)
+		start *= packetSize;
+		length *= packetSize;
+		arraySize *= packetSize;
+		for (int i = 0; i < arraySize - start; i++)
 		{
-			if (DataPointUtil.doesItExist(data))
-			{
-				allEmpty = false;
-				if (!(DataPointUtil.isItVoid(data)))
-				{
-					numberOfChildren++;
-					allVoid = false;
-					tempAlpha += DataPointUtil.getAlpha(data);
-					tempRed += DataPointUtil.getRed(data);
-					tempGreen += DataPointUtil.getGreen(data);
-					tempBlue += DataPointUtil.getBlue(data);
-					tempHeight = Math.max(tempHeight, DataPointUtil.getHeight(data));
-					tempDepth = Math.min(tempDepth, DataPointUtil.getDepth(data));
-					tempLightBlock += DataPointUtil.getLightBlock(data);
-					tempLightSky += DataPointUtil.getLightSky(data);
-				}
-				tempGenMode = (byte) Math.min(tempGenMode, DataPointUtil.getGenerationMode(data));
-			} else
-			{
-				tempGenMode = (byte) Math.min(tempGenMode, DistanceGenerationMode.NONE.complexity);
-			}
-		}
-
-		if (allEmpty)
-		{
-			//no child has been initialized
-			return DataPointUtil.EMPTY_DATA;
-		} else if (allVoid)
-		{
-			//all the children are void
-			return DataPointUtil.createVoidDataPoint(tempGenMode);
-		} else
-		{
-			//we have at least 1 child
-			tempAlpha = tempAlpha / numberOfChildren;
-			tempRed = tempRed / numberOfChildren;
-			tempGreen = tempGreen / numberOfChildren;
-			tempBlue = tempBlue / numberOfChildren;
-			tempLightBlock = tempLightBlock / numberOfChildren;
-			tempLightSky = tempLightSky / numberOfChildren;
-			return DataPointUtil.createDataPoint(tempAlpha, tempRed, tempGreen, tempBlue, tempHeight, tempDepth, tempLightSky, tempLightBlock, tempGenMode);
+			array[start + i] = array[start + length + i];
+			//remove comment to not leave garbage at the end
+			//array[start + packetSize + i] = 0;
 		}
 	}
-
+	
+	public static void extendArray(short[] array, int packetSize, int start, int length, int arraySize)
+	{
+		start *= packetSize;
+		length *= packetSize;
+		arraySize *= packetSize;
+		for (int i = arraySize - start - 1; i >= 0; i--)
+		{
+			array[start + length + i] = array[start + i];
+			array[start + i] = 0;
+		}
+	}
+	
+	/**
+	 * This method merge column of multiple data together
+	 * @param dataToMerge one or more columns of data
+	 * @param inputVerticalData vertical size of an input data
+	 * @param maxVerticalData max vertical size of the merged data
+	 * @return one column of correctly parsed data
+	 */
 	public static long[] mergeMultiData(long[] dataToMerge, int inputVerticalData, int maxVerticalData)
 	{
 		int size = dataToMerge.length / inputVerticalData;
-
-		//We initialise the arrays that are going to be used
-		short[] projection = ThreadMapUtil.getProjectionShort();
-		short[] heightAndDepth = ThreadMapUtil.getHeightAndDepth();
-		long[] singleDataToMerge = ThreadMapUtil.getSingleAddDataToMerge();
-		long[] dataPoint = ThreadMapUtil.verticalDataArray();
-
-		if (projection == null || projection.length != (worldHeight) / 16 + 1)
-			projection = new short[(worldHeight) / 16 + 1];
-		else
-			Arrays.fill(projection, (short) 0);
-
-		if (heightAndDepth == null || heightAndDepth.length != (worldHeight + 1) * 2)
-			heightAndDepth = new short[(worldHeight + 1) * 2];
-		else
-			Arrays.fill(heightAndDepth, (short) 0);
-
-		if (singleDataToMerge == null || singleDataToMerge.length != size)
-			singleDataToMerge = new long[size];
-		else
-			Arrays.fill(singleDataToMerge, EMPTY_DATA);
-
-		if (dataPoint == null || dataPoint.length != worldHeight + 1)
-			dataPoint = new long[worldHeight + 1];
-		else
-			Arrays.fill(dataPoint, EMPTY_DATA);
-
+		
+		// We initialize the arrays that are going to be used
+		short[] heightAndDepth = ThreadMapUtil.getHeightAndDepth((worldHeight + 1) * 2);
+		long[] dataPoint = ThreadMapUtil.getVerticalDataArray(DetailDistanceUtil.getMaxVerticalData(0));
+		
+		
 		int genMode = DistanceGenerationMode.SERVER.complexity;
 		boolean allEmpty = true;
 		boolean allVoid = true;
+		boolean allDefault;
 		long singleData;
-
-
+		
+		
 		short depth;
 		short height;
-
+		int count = 0;
+		int i;
+		int ii;
+		int dataIndex;
 		//We collect the indexes of the data, ordered by the depth
 		for (int index = 0; index < size; index++)
 		{
-			for (int dataIndex = 0; dataIndex < inputVerticalData; dataIndex++)
+			for (dataIndex = 0; dataIndex < inputVerticalData; dataIndex++)
 			{
 				singleData = dataToMerge[index * inputVerticalData + dataIndex];
 				if (doesItExist(singleData))
 				{
 					genMode = Math.min(genMode, getGenerationMode(singleData));
 					allEmpty = false;
-					if (!isItVoid(singleData))
+					if (!isVoid(singleData))
 					{
 						allVoid = false;
 						depth = getDepth(singleData);
 						height = getHeight(singleData);
-						for (int y = depth; y <= height; y++)
-							projection[y / 16] |= 1 << (y & 0xf);
+						
+						int botPos = -1;
+						int topPos = -1;
+						//values fall in between and possibly require extension of array
+						boolean botExtend = false;
+						boolean topExtend = false;
+						for (i = 0; i < count; i++)
+						{
+							if (depth <= heightAndDepth[i * 2] && depth >= heightAndDepth[i * 2 + 1])
+							{
+								botPos = i;
+								break;
+							}
+							else if (depth < heightAndDepth[i * 2 + 1] && ((i + 1 < count && depth > heightAndDepth[(i + 1) * 2]) || i + 1 == count))
+							{
+								botPos = i;
+								botExtend = true;
+								break;
+							}
+						}
+						for (i = 0; i < count; i++)
+						{
+							if (height <= heightAndDepth[i * 2] && height >= heightAndDepth[i * 2 + 1])
+							{
+								topPos = i;
+								break;
+							}
+							else if (height < heightAndDepth[i * 2 + 1] && ((i + 1 < count && height > heightAndDepth[(i + 1) * 2]) || i + 1 == count))
+							{
+								topPos = i;
+								topExtend = true;
+								break;
+							}
+						}
+						if (topPos == -1)
+						{
+							if (botPos == -1)
+							{
+								//whole block falls above
+								extendArray(heightAndDepth, 2, 0, 1, count);
+								heightAndDepth[0] = height;
+								heightAndDepth[1] = depth;
+								count++;
+							}
+							else if (!botExtend)
+							{
+								//only top falls above extending it there, while bottom is inside existing
+								shrinkArray(heightAndDepth, 2, 0, botPos, count);
+								heightAndDepth[0] = height;
+								count -= botPos;
+							}
+							else
+							{
+								//top falls between some blocks, extending those as well
+								shrinkArray(heightAndDepth, 2, 0, botPos, count);
+								heightAndDepth[0] = height;
+								heightAndDepth[1] = depth;
+								count -= botPos;
+							}
+						}
+						else if (!topExtend)
+						{
+							if (!botExtend)
+								//both top and bottom are within some exiting blocks, possibly merging them
+								heightAndDepth[topPos * 2 + 1] = heightAndDepth[botPos * 2 + 1];
+							else
+								//top falls between some blocks, extending it there
+								heightAndDepth[topPos * 2 + 1] = depth;
+							shrinkArray(heightAndDepth, 2, topPos + 1, botPos - topPos, count);
+							count -= botPos - topPos;
+						}
+						else
+						{
+							if (!botExtend)
+							{
+								//only top is within some exiting block, extending it
+								topPos++; //to make it easier
+								heightAndDepth[topPos * 2] = height;
+								heightAndDepth[topPos * 2 + 1] = heightAndDepth[botPos * 2 + 1];
+								shrinkArray(heightAndDepth, 2, topPos + 1, botPos - topPos, count);
+								count -= botPos - topPos;
+							}
+							else
+							{
+								//both top and bottom are outside existing blocks
+								shrinkArray(heightAndDepth, 2, topPos + 1, botPos - topPos, count);
+								count -= botPos - topPos;
+								extendArray(heightAndDepth, 2, topPos + 1, 1, count);
+								count++;
+								heightAndDepth[topPos * 2 + 2] = height;
+								heightAndDepth[topPos * 2 + 3] = depth;
+							}
+						}
 					}
 				}
+				else
+					break;
 			}
 		}
+		
 		//We check if there is any data that's not empty or void
 		if (allEmpty)
-		{
 			return dataPoint;
-		}
 		if (allVoid)
 		{
 			dataPoint[0] = createVoidDataPoint(genMode);
 			return dataPoint;
 		}
-		//We extract the merged data
-		int count = 0;
-		int i = 0;
-		int ii = 0;
-		while (i < projection.length)
+		
+		
+		
+		//we cut the 1 block gaps
+		/*int j;
+		for (i = 0; i < count - 1; i++)
 		{
-			while (i < projection.length && projection[i] == 0) i++;
-			if (i == projection.length)
-				break; //we reached end of WORLD_HEIGHT and it's nothing more here
-			while (ii < 15 && ((projection[i] >>> ii) & 1) == 0) ii++;
-			if (ii >= 15 && ((projection[i] >>> ii) & 1) == 0) //there is nothing more in this chunk
+			if (heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2] == 1)
 			{
-				ii = 0;
-				i++;
-				continue;
-			}
-			depth = (short) (i * 16 + ii);
-
-			while (ii < 15 && ((projection[i] >>> ii) & 1) == 1) ii++;
-			if (ii >= 15 && ((projection[i] >>> ii) & 1) == 1) //if end is not in this chunk
-			{
-				ii = 0;
-				i++;
-				while (i < projection.length && ~(projection[i]) == 0) i++; //check for big solid blocks
-				if (i == projection.length) //solid to WORLD_HEIGHT
+				heightAndDepth[i * 2 + 1] = heightAndDepth[(i + 1) * 2 + 1];
+				for (j = i + 1; j < count - 1; j++)
 				{
-					heightAndDepth[count * 2] = depth;
-					heightAndDepth[count * 2 + 1] = (short) (worldHeight - 1);
-					break;
+					heightAndDepth[j * 2] = heightAndDepth[(j + 1) * 2];
+					heightAndDepth[j * 2 + 1] = heightAndDepth[(j + 1) * 2 + 1];
 				}
-				while ((((projection[i] >>> ii) & 1) == 1)) ii++;
+				count--;
+				i--;
 			}
-			height = (short) (i * 16 + ii - 1);
-			heightAndDepth[count * 2] = depth;
-			heightAndDepth[count * 2 + 1] = height;
-			count++;
-		}
-
+		}*/
+		
 		//we limit the vertical portion to maxVerticalData
 		int j = 0;
 		while (count > maxVerticalData)
@@ -390,9 +449,9 @@ public class DataPointUtil
 			ii = worldHeight;
 			for (i = 0; i < count - 1; i++)
 			{
-				if (heightAndDepth[(i + 1) * 2] - heightAndDepth[i * 2 + 1] < ii)
+				if (heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2] < ii)
 				{
-					ii = heightAndDepth[(i + 1) * 2] - heightAndDepth[i * 2 + 1];
+					ii = heightAndDepth[i * 2 + 1] - heightAndDepth[(i + 1) * 2];
 					j = i;
 				}
 			}
@@ -402,47 +461,94 @@ public class DataPointUtil
 				heightAndDepth[i * 2] = heightAndDepth[(i + 1) * 2];
 				heightAndDepth[i * 2 + 1] = heightAndDepth[(i + 1) * 2 + 1];
 			}
-			//System.arraycopy(heightAndDepth,j + 1, heightAndDepth, j,count - j - 1);
+			//System.arraycopy(heightAndDepth, j + 1, heightAndDepth, j, count - j - 1);
 			count--;
 		}
 		//As standard the vertical lods are ordered from top to bottom
-		for (j = 0; j < count; j++)
+		for (j = count - 1; j >= 0; j--)
 		{
-			depth = heightAndDepth[j * 2];
-			height = heightAndDepth[j * 2 + 1];
+			height = heightAndDepth[j * 2];
+			depth = heightAndDepth[j * 2 + 1];
+			
 			if ((depth == 0 && height == 0) || j >= heightAndDepth.length / 2)
 				break;
-			for (int k = 0; k < size; k++)
-			{
-				singleDataToMerge[k] = 0;
-			}
+			
+			int numberOfChildren = 0;
+			int tempAlpha = 0;
+			int tempRed = 0;
+			int tempGreen = 0;
+			int tempBlue = 0;
+			int tempLightBlock = 0;
+			int tempLightSky = 0;
+			byte tempGenMode = DistanceGenerationMode.SERVER.complexity;
+			allEmpty = true;
+			allVoid = true;
+			allDefault = true;
+			long data = 0;
+			
 			for (int index = 0; index < size; index++)
 			{
-				for (int dataIndex = 0; dataIndex < inputVerticalData; dataIndex++)
+				for (dataIndex = 0; dataIndex < inputVerticalData; dataIndex++)
 				{
 					singleData = dataToMerge[index * inputVerticalData + dataIndex];
-					if (doesItExist(singleData) && !isItVoid(singleData))
+					if (doesItExist(singleData) && !isVoid(singleData))
 					{
+						
 						if ((depth <= getDepth(singleData) && getDepth(singleData) <= height)
-								    || (depth <= getHeight(singleData) && getHeight(singleData) <= height))
+								|| (depth <= getHeight(singleData) && getHeight(singleData) <= height))
 						{
-							if (getHeight(singleData) > getHeight(singleDataToMerge[index]))
-							{
-								singleDataToMerge[index] = singleData;
-							}
+							if (getHeight(singleData) > getHeight(data))
+								data = singleData;
 						}
 					}
+					else
+						break;
 				}
+				if (!doesItExist(data))
+				{
+					singleData = dataToMerge[index * inputVerticalData];
+					data = createVoidDataPoint(getGenerationMode(singleData));
+				}
+				
+				if (doesItExist(data))
+				{
+					allEmpty = false;
+					if (!isVoid(data))
+					{
+						numberOfChildren++;
+						allVoid = false;
+						tempAlpha += getAlpha(data);
+						tempRed += getRed(data);
+						tempGreen += getGreen(data);
+						tempBlue += getBlue(data);
+						tempLightBlock += getLightBlock(data);
+						tempLightSky += getLightSky(data);
+						if (!getFlag(data)) allDefault = false;
+					}
+					tempGenMode = (byte) Math.min(tempGenMode, getGenerationMode(data));
+				}
+				else
+					tempGenMode = (byte) Math.min(tempGenMode, DistanceGenerationMode.NONE.complexity);
+			}
+			
+			if (allEmpty)
+				//no child has been initialized
+				dataPoint[j] = EMPTY_DATA;
+			else if (allVoid)
+				//all the children are void
+				dataPoint[j] = createVoidDataPoint(tempGenMode);
+			else
+			{
+				//we have at least 1 child
+				tempAlpha = tempAlpha / numberOfChildren;
+				tempRed = tempRed / numberOfChildren;
+				tempGreen = tempGreen / numberOfChildren;
+				tempBlue = tempBlue / numberOfChildren;
+				tempLightBlock = tempLightBlock / numberOfChildren;
+				tempLightSky = tempLightSky / numberOfChildren;
+				dataPoint[j] = createDataPoint(tempAlpha, tempRed, tempGreen, tempBlue, height, depth, tempLightSky, tempLightBlock, tempGenMode, allDefault);
 			}
-			long data = mergeSingleData(singleDataToMerge);
-
-			dataPoint[count - j - 1] = createDataPoint(height, depth, getColor(data), getLightSky(data), getLightBlock(data), getGenerationMode(data));
 		}
 		return dataPoint;
 	}
-
-	public static long[] compress(long[] data, byte detailLevel)
-	{
-		return null;
-	}
 }
@@ -1,37 +1,49 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

 import com.seibel.lod.config.LodConfig;
 import com.seibel.lod.enums.DistanceGenerationMode;
+import com.seibel.lod.enums.HorizontalQuality;
 import com.seibel.lod.enums.HorizontalResolution;
+import com.seibel.lod.wrappers.MinecraftWrapper;

+/**
+ * 
+ * @author Leonardo Amato
+ * @version ??
+ */
 public class DetailDistanceUtil
 {
-	private static double genMultiplier = 1.0;
-	private static double treeGenMultiplier = 1.0;
-	private static double treeCutMultiplier = 1.0;
-	private static int minGenDetail = LodConfig.CLIENT.worldGenerator.generationResolution.get().detailLevel;
-	private static int minDrawDetail = Math.max(LodConfig.CLIENT.graphics.drawResolution.get().detailLevel,LodConfig.CLIENT.worldGenerator.generationResolution.get().detailLevel);
-	private static int maxDetail = LodUtil.REGION_DETAIL_LEVEL + 1;
-	private static int minDistance = 0;
-	private static int maxDistance = LodConfig.CLIENT.graphics.lodChunkRenderDistance.get() * 16 * 2;
-	private static int base = 2;
-	private static double logBase = Math.log(2);
-
-	private static int[] maxVerticalData = {
-			4,
-			4,
-			4,
-			2,
-			2,
-			1,
-			1,
-			1,
-			1,
-			1,
-			1};
-
-
-	private static HorizontalResolution[] lodGenDetails = {
+	private static final double genMultiplier = 1.0;
+	private static final double treeGenMultiplier = 1.0;
+	private static final double treeCutMultiplier = 1.0;
+	private static int minGenDetail = LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel;
+	private static int minDrawDetail = Math.max(LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel, LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel);
+	private static final int maxDetail = LodUtil.REGION_DETAIL_LEVEL + 1;
+	private static final int minDistance = 0;
+	private static int minDetailDistance = (int) (MinecraftWrapper.INSTANCE.getRenderDistance()*16 * 1.42f);
+	private static int maxDistance = LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.get() * 16 * 2;
+	
+	
+	private static final HorizontalResolution[] lodGenDetails = {
 			HorizontalResolution.BLOCK,
 			HorizontalResolution.TWO_BLOCKS,
 			HorizontalResolution.FOUR_BLOCKS,
@@ -42,127 +54,137 @@ public class DetailDistanceUtil
 			HorizontalResolution.CHUNK,
 			HorizontalResolution.CHUNK,
 			HorizontalResolution.CHUNK,
-			HorizontalResolution.CHUNK};
-
-
-
-	public static void updateSettings(){
-		minGenDetail = LodConfig.CLIENT.worldGenerator.generationResolution.get().detailLevel;
-		minDrawDetail = Math.max(LodConfig.CLIENT.graphics.drawResolution.get().detailLevel,LodConfig.CLIENT.worldGenerator.generationResolution.get().detailLevel);
-		maxDistance = LodConfig.CLIENT.graphics.lodChunkRenderDistance.get() * 16 * 2;
+			HorizontalResolution.CHUNK };
+	
+	
+	
+	public static void updateSettings()
+	{
+		minDetailDistance = (int) (MinecraftWrapper.INSTANCE.getRenderDistance()*16 * 1.42f);
+		minGenDetail = LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel;
+		minDrawDetail = Math.max(LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel, LodConfig.CLIENT.graphics.qualityOption.drawResolution.get().detailLevel);
+		maxDistance = LodConfig.CLIENT.graphics.qualityOption.lodChunkRenderDistance.get() * 16 * 8;
 	}
-
+	
 	public static int baseDistanceFunction(int detail)
 	{
-		int distanceUnit = LodConfig.CLIENT.graphics.horizontalQuality.get().distanceUnit;
 		if (detail <= minGenDetail)
 			return minDistance;
-		if (detail == maxDetail)
+		if (detail >= maxDetail)
 			return maxDistance;
-		if (detail == maxDetail + 1)
-			return maxDistance;
-		switch (LodConfig.CLIENT.worldGenerator.lodDistanceCalculatorType.get())
+		
+		int distanceUnit = LodConfig.CLIENT.graphics.qualityOption.horizontalScale.get().distanceUnit;
+		if (LodConfig.CLIENT.graphics.qualityOption.horizontalQuality.get() == HorizontalQuality.LOWEST)
+			return (detail * distanceUnit);
+		else
 		{
-			case LINEAR:;
-				return (detail * distanceUnit);
-			default:
-			case QUADRATIC:
-				return (int) (Math.pow(base, detail) * distanceUnit);
+			double base = LodConfig.CLIENT.graphics.qualityOption.horizontalQuality.get().quadraticBase;
+			return (int) (Math.pow(base, detail) * distanceUnit);
 		}
 	}
-
-	public static byte baseInverseFunction(int distance, int minDetail)
+	
+	public static int getDrawDistanceFromDetail(int detail)
 	{
-		int distanceUnit = LodConfig.CLIENT.graphics.horizontalQuality.get().distanceUnit;
-		byte detail = 0;
-		if (distance == 0)
-			detail = (byte) minDetail;
-		if (distance > maxDistance)
-			detail = (byte) (maxDetail-1);
-		switch (LodConfig.CLIENT.worldGenerator.lodDistanceCalculatorType.get())
-		{
-			case LINEAR:
-				detail = (byte) Math.floorDiv(distance, distanceUnit);
-				break;
-			case QUADRATIC:
-				detail = (byte) (Math.log(Math.floorDiv(distance, distanceUnit))/logBase);
-				break;
-		}
-		return (byte) Math.min(detail, LodUtil.REGION_DETAIL_LEVEL);
+		return baseDistanceFunction(detail);
 	}
-
+	
+	public static byte baseInverseFunction(int distance, int minDetail, boolean useRenderMinDistance)
+	{
+		int detail;
+		if (distance == 0)
+			return (byte) minDetail;
+		if (distance < minDetailDistance && useRenderMinDistance)
+			return (byte) minDetail;
+		int distanceUnit = LodConfig.CLIENT.graphics.qualityOption.horizontalScale.get().distanceUnit;
+		if (LodConfig.CLIENT.graphics.qualityOption.horizontalQuality.get() == HorizontalQuality.LOWEST)
+			detail = (byte) Math.floorDiv(distance, distanceUnit);
+		else
+		{
+			double base = LodConfig.CLIENT.graphics.qualityOption.horizontalQuality.get().quadraticBase;
+			double logBase = Math.log(base);
+			detail = (byte) (Math.log(Math.floorDiv(distance, distanceUnit)) / logBase);
+		}
+		return (byte) LodUtil.clamp(minDetail, detail, maxDetail - 1);
+	}
+	
 	public static byte getDrawDetailFromDistance(int distance)
 	{
-		return baseInverseFunction(distance, minDrawDetail);
+		return baseInverseFunction(distance, minDrawDetail, false);
 	}
-
+	
 	public static byte getGenerationDetailFromDistance(int distance)
 	{
-		return baseInverseFunction((int) (distance * genMultiplier), minGenDetail);
+		return baseInverseFunction((int) (distance * genMultiplier), minGenDetail, true);
 	}
-
+	
 	public static byte getTreeCutDetailFromDistance(int distance)
 	{
-		return baseInverseFunction((int) (distance * treeCutMultiplier), minGenDetail);
+		
+		return baseInverseFunction((int) (distance * treeCutMultiplier), minGenDetail, true);
 	}
-
-
+	
+	
 	public static byte getTreeGenDetailFromDistance(int distance)
 	{
-		return baseInverseFunction((int) (distance * treeGenMultiplier), minGenDetail);
+		
+		return baseInverseFunction((int) (distance * treeGenMultiplier), minGenDetail, true);
 	}
-
+	
 	public static DistanceGenerationMode getDistanceGenerationMode(int detail)
 	{
 		return LodConfig.CLIENT.worldGenerator.distanceGenerationMode.get();
 	}
-
+	
 	public static byte getLodDrawDetail(int detail)
 	{
 		if (detail < minDrawDetail)
 		{
-			if(LodConfig.CLIENT.graphics.alwaysDrawAtMaxQuality.get())
+			if (LodConfig.CLIENT.graphics.advancedGraphicsOption.alwaysDrawAtMaxQuality.get())
 				return getLodGenDetail(minDrawDetail).detailLevel;
 			else
 				return (byte) minDrawDetail;
-		} else
+		}
+		else
 		{
-			if(LodConfig.CLIENT.graphics.alwaysDrawAtMaxQuality.get())
+			if (LodConfig.CLIENT.graphics.advancedGraphicsOption.alwaysDrawAtMaxQuality.get())
 				return getLodGenDetail(detail).detailLevel;
 			else
 				return (byte) detail;
 		}
 	}
-
+	
 	public static HorizontalResolution getLodGenDetail(int detail)
 	{
 		if (detail < minGenDetail)
 		{
 			return lodGenDetails[minGenDetail];
-		} else
+		}
+		else
 		{
 			return lodGenDetails[detail];
 		}
 	}
-
-
+	
+	
 	public static byte getCutLodDetail(int detail)
 	{
 		if (detail < minGenDetail)
 		{
 			return lodGenDetails[minGenDetail].detailLevel;
-		} else if (detail == maxDetail)
+		}
+		else if (detail == maxDetail)
 		{
 			return LodUtil.REGION_DETAIL_LEVEL;
-		} else
+		}
+		else
 		{
 			return lodGenDetails[detail].detailLevel;
 		}
 	}
-
+	
 	public static int getMaxVerticalData(int detail)
 	{
-		return maxVerticalData[LodUtil.clamp(minGenDetail, detail, LodUtil.REGION_DETAIL_LEVEL)];
+		return LodConfig.CLIENT.graphics.qualityOption.verticalQuality.get().maxVerticalData[LodUtil.clamp(minGenDetail, detail, LodUtil.REGION_DETAIL_LEVEL)];
 	}
-
+	
 }
@@ -1,12 +1,36 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

+/**
+ * 
+ * @author Leonardo Amato
+ * @version ??
+ */
 public class LevelPosUtil
 {
 	public static int[] convert(int[] levelPos, byte newDetailLevel)
 	{
 		return convert(getDetailLevel(levelPos), getPosX(levelPos), getPosZ(levelPos), newDetailLevel);
 	}
-
+	
 	public static int[] convert(byte detailLevel, int posX, int posZ, byte newDetailLevel)
 	{
 		int width;
@@ -17,7 +41,8 @@ public class LevelPosUtil
 					newDetailLevel,
 					Math.floorDiv(posX, width),
 					Math.floorDiv(posZ, width));
-		} else
+		}
+		else
 		{
 			width = 1 << (detailLevel - newDetailLevel);
 			return createLevelPos(
@@ -26,12 +51,12 @@ public class LevelPosUtil
 					posZ * width);
 		}
 	}
-
+	
 	public static int[] createLevelPos(byte detailLevel, int posX, int posZ)
 	{
-		return new int[]{detailLevel, posX, posZ};
+		return new int[] { detailLevel, posX, posZ };
 	}
-
+	
 	public static int convert(byte detailLevel, int pos, byte newDetailLevel)
 	{
 		int width;
@@ -39,48 +64,49 @@ public class LevelPosUtil
 		{
 			width = 1 << (newDetailLevel - detailLevel);
 			return Math.floorDiv(pos, width);
-		} else
+		}
+		else
 		{
 			width = 1 << (detailLevel - newDetailLevel);
 			return pos * width;
 		}
 	}
-
+	
 	public static int getRegion(byte detailLevel, int pos)
 	{
 		return Math.floorDiv(pos, 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel));
 	}
-
+	
 	public static int getRegionModule(byte detailLevel, int pos)
 	{
 		return Math.floorMod(pos, 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel));
 	}
-
+	
 	public static byte getDetailLevel(int[] levelPos)
 	{
 		return (byte) levelPos[0];
 	}
-
+	
 	public static int getPosX(int[] levelPos)
 	{
 		return levelPos[1];
 	}
-
+	
 	public static int getPosZ(int[] levelPos)
 	{
 		return levelPos[2];
 	}
-
+	
 	public static int getDistance(int[] levelPos)
 	{
 		return levelPos[3];
 	}
-
+	
 	public static int[] getRegionModule(int[] levelPos)
 	{
 		return getRegionModule(getDetailLevel(levelPos), getPosX(levelPos), getPosZ(levelPos));
 	}
-
+	
 	public static int[] getRegionModule(byte detailLevel, int posX, int posZ)
 	{
 		int width = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
@@ -89,7 +115,7 @@ public class LevelPosUtil
 				Math.floorMod(posX, width),
 				Math.floorMod(posZ, width));
 	}
-
+	
 	public static int[] applyOffset(int[] levelPos, int xOffset, int zOffset)
 	{
 		return createLevelPos(
@@ -97,7 +123,7 @@ public class LevelPosUtil
 				getPosX(levelPos) + xOffset,
 				getPosZ(levelPos) + zOffset);
 	}
-
+	
 	public static int[] applyLevelOffset(int[] levelPos, byte detailOffset, int xOffset, int zOffset)
 	{
 		return createLevelPos(
@@ -105,87 +131,79 @@ public class LevelPosUtil
 				getPosX(levelPos) + xOffset * (1 << detailOffset),
 				getPosZ(levelPos) + zOffset * (1 << detailOffset));
 	}
-
+	
 	public static int getRegionPosX(int[] levelPos)
 	{
 		int width = 1 << (LodUtil.REGION_DETAIL_LEVEL - getDetailLevel(levelPos));
 		return Math.floorDiv(getPosX(levelPos), width);
 	}
-
+	
 	public static int getRegionPosZ(int[] levelPos)
 	{
 		int width = 1 << (LodUtil.REGION_DETAIL_LEVEL - getDetailLevel(levelPos));
 		return Math.floorDiv(getPosZ(levelPos), width);
 	}
-
+	
 	public static int getChunkPos(byte detailLevel, int pos)
 	{
-		return convert(detailLevel,pos, LodUtil.CHUNK_DETAIL_LEVEL);
+		return convert(detailLevel, pos, LodUtil.CHUNK_DETAIL_LEVEL);
 	}
-
-
+	
+	
 	public static int maxDistance(byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ)
 	{
 		int width = 1 << detailLevel;
-
+		
 		int startPosX = posX * width;
 		int startPosZ = posZ * width;
 		int endPosX = startPosX + width;
 		int endPosZ = startPosZ + width;
-
+		
 		int maxDistance = (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - startPosZ, 2));
 		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
 		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - startPosZ, 2)));
 		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
-
+		
 		return maxDistance;
 	}
-
+	
 	public static int maxDistance(byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ, int xRegion, int zRegion)
 	{
-		int width = 1 << detailLevel;
-
-		int startPosX = xRegion * 512 + posX * width;
-		int startPosZ = zRegion * 512 + posZ * width;
-		int endPosX = startPosX + width;
-		int endPosZ = startPosZ + width;
-
-		int maxDistance = (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - startPosZ, 2));
-		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
-		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - startPosZ, 2)));
-		maxDistance = Math.max(maxDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
-
-		return maxDistance;
+		int width = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
+		int newPosX = xRegion * width + posX;
+		int newPosZ = zRegion * width + posZ;
+		return maxDistance(detailLevel, newPosX, newPosZ, playerPosX, playerPosZ);
 	}
-
-
+	
+	
 	public static int minDistance(byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ)
 	{
 		int width = 1 << detailLevel;
-
+		
 		int startPosX = posX * width;
 		int startPosZ = posZ * width;
 		int endPosX = startPosX + width;
 		int endPosZ = startPosZ + width;
-
+		
 		boolean inXArea = playerPosX >= startPosX && playerPosX <= endPosX;
 		boolean inZArea = playerPosZ >= startPosZ && playerPosZ <= endPosZ;
 		if (inXArea && inZArea)
-		{
 			return 0;
-		} else if (inXArea)
+		else if (inXArea)
 		{
 			return Math.min(
 					Math.abs(playerPosZ - startPosZ),
 					Math.abs(playerPosZ - endPosZ)
 			);
-		} else if (inZArea)
+		}
+		else if (inZArea)
 		{
 			return Math.min(
 					Math.abs(playerPosX - startPosX),
 					Math.abs(playerPosX - endPosX)
 			);
-		} else
+		}
+		else
 		{
 			int minDistance = (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - startPosZ, 2));
 			minDistance = Math.min(minDistance, (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
@@ -194,51 +212,23 @@ public class LevelPosUtil
 			return minDistance;
 		}
 	}
-
+	
 	public static int minDistance(byte detailLevel, int posX, int posZ, int playerPosX, int playerPosZ, int xRegion, int zRegion)
 	{
-		int width = 1 << detailLevel;
-
-		int startPosX = xRegion * 512 + posX * width;
-		int startPosZ = zRegion * 512 + posZ * width;
-		int endPosX = startPosX + width;
-		int endPosZ = startPosZ + width;
-
-		boolean inXArea = playerPosX >= startPosX && playerPosX <= endPosX;
-		boolean inZArea = playerPosZ >= startPosZ && playerPosZ <= endPosZ;
-		if (inXArea && inZArea)
-		{
-			return 0;
-		} else if (inXArea)
-		{
-			return Math.min(
-					Math.abs(playerPosZ - startPosZ),
-					Math.abs(playerPosZ - endPosZ)
-			);
-		} else if (inZArea)
-		{
-			return Math.min(
-					Math.abs(playerPosX - startPosX),
-					Math.abs(playerPosX - endPosX)
-			);
-		} else
-		{
-			int minDistance = (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - startPosZ, 2));
-			minDistance = Math.min(minDistance, (int) Math.sqrt(Math.pow(playerPosX - startPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
-			minDistance = Math.min(minDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - startPosZ, 2)));
-			minDistance = Math.min(minDistance, (int) Math.sqrt(Math.pow(playerPosX - endPosX, 2) + Math.pow(playerPosZ - endPosZ, 2)));
-			return minDistance;
-		}
+		int width = 1 << (LodUtil.REGION_DETAIL_LEVEL - detailLevel);
+		int newPosX = xRegion * width + posX;
+		int newPosZ = zRegion * width + posZ;
+		return minDistance(detailLevel, newPosX, newPosZ, playerPosX, playerPosZ);
 	}
-
+	
 	public static int compareDistance(int firstDistance, int secondDistance)
 	{
 		return Integer.compare(
 				firstDistance,
 				secondDistance);
 	}
-
-
+	
+	
 	public static int compareLevelAndDistance(byte firstDetail, int firstDistance, byte secondDetail, int secondDistance)
 	{
 		int compareResult = Integer.compare(
@@ -252,11 +242,15 @@ public class LevelPosUtil
 		}
 		return compareResult;
 	}
-
+	
+	@SuppressWarnings("unused")
 	public static String toString(int[] levelPos)
 	{
-		return (getDetailLevel(levelPos) + " " + getPosX(levelPos) + " " + getPosZ(levelPos));
+		return (getDetailLevel(levelPos) + " "
+				+ getPosX(levelPos) + " "
+				+ getPosZ(levelPos));
 	}
+	
 	public static String toString(byte detailLevel, int posX, int posZ)
 	{
 		return (detailLevel + " " + posX + " " + posZ);
@@ -1,3 +1,22 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

 import java.util.concurrent.ThreadFactory;
@@ -5,13 +24,12 @@ import java.util.concurrent.ThreadFactory;
 /**
 * Just a simple ThreadFactory to name ExecutorService
 * threads, which can be helpful when debugging.
- * 
 * @author James Seibel
 * @version 8-15-2021
 */
 public class LodThreadFactory implements ThreadFactory
 {
-	public String threadName;
+	public final String threadName;
 	
 	
 	public LodThreadFactory(String newThreadName)
@@ -22,7 +40,7 @@ public class LodThreadFactory implements ThreadFactory
 	@Override
 	public Thread newThread(Runnable r)
 	{
-            return new Thread(r, threadName);
+		return new Thread(r, threadName);
 	}
 	
 }
@@ -1,5 +1,6 @@
 /*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
 *
 *    Copyright (C) 2020  James Seibel
 *
@@ -15,12 +16,17 @@
 *    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.util;

 import java.awt.Color;
 import java.io.File;
 import java.util.HashSet;

+import com.seibel.lod.builders.bufferBuilding.lodTemplates.Box;
+import com.seibel.lod.config.LodConfig;
+import com.seibel.lod.enums.HorizontalResolution;
+import com.seibel.lod.enums.VanillaOverdraw;
 import com.seibel.lod.objects.LodDimension;
 import com.seibel.lod.objects.RegionPos;
 import com.seibel.lod.wrappers.MinecraftWrapper;
@@ -28,7 +34,10 @@ import com.seibel.lod.wrappers.MinecraftWrapper;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.chunk.ChunkRenderDispatcher.CompiledChunk;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.client.renderer.vertex.VertexFormat;
 import net.minecraft.server.integrated.IntegratedServer;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.DimensionType;
@@ -43,84 +52,120 @@ import net.minecraft.world.server.ServerWorld;
 * This class holds methods and constants that may be used in multiple places.
 * 
 * @author James Seibel
- * @version 9-7-2021
+ * @version 10-20-2021
 */
 public class LodUtil
 {
-	private static MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	private static final MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+	
+	/**
+	 * Vanilla render distances less than or equal to this will not allow partial
+	 * overdraw. The VanillaOverdraw will either be ALWAYS or NEVER.
+	 */
+	public static final int MINIMUM_RENDER_DISTANCE_FOR_PARTIAL_OVERDRAW = 4;
+	
+	/**
+	 * Vanilla render distances less than or equal to this will cause the overdraw to
+	 * run at a smaller fraction of the vanilla render distance.
+	 */
+	public static final int MINIMUM_RENDER_DISTANCE_FOR_FAR_OVERDRAW = 11;
 	
 	
-	/** alpha used when drawing chunks in debug mode */
+	
+	
+	/** The maximum number of LODs that can be rendered vertically */
+	public static final int MAX_NUMBER_OF_VERTICAL_LODS = 32;
+	
+	/**
+	 * alpha used when drawing chunks in debug mode
+	 */
 	public static final int DEBUG_ALPHA = 255; // 0 - 255
 	public static final Color COLOR_DEBUG_BLACK = new Color(0, 0, 0, DEBUG_ALPHA);
 	public static final Color COLOR_DEBUG_WHITE = new Color(255, 255, 255, DEBUG_ALPHA);
-	public static final Color COLOR_INVISIBLE = new Color(0,0,0,0);
+	public static final Color COLOR_INVISIBLE = new Color(0, 0, 0, 0);
+	
+	public static final int CEILED_DIMENSION_MAX_RENDER_DISTANCE = 64; // 0 - 255
 	
-	/** a gray-purple color */
-	public static final int MYCELIUM_COLOR_INT = LodUtil.colorToInt(Color.decode("#6E6166"));
-	/** TODO, add a better way to override material colors
-	 * and/or add a method to generate colors based on texture
-	 * issue #64 */
-	public static final int STONE_COLOR_INT = LodUtil.colorToInt(new Color(150, 150, 150));
-	public static final int NETHERRACK_COLOR_INT = LodUtil.colorToInt(new Color(95, 38, 38));
-	public static final int WARPED_NYLIUM_COLOR_INT = LodUtil.colorToInt(new Color(34, 94, 85));
-	public static final int CRIMSON_NYLIUM_COLOR_INT = LodUtil.colorToInt(new Color(126, 27, 27));
-
 	/**
 	 * In order of nearest to farthest: <br>
 	 * Red, Orange, Yellow, Green, Cyan, Blue, Magenta, white, gray, black
 	 */
-	public static final Color DEBUG_DETAIL_LEVEL_COLORS[] = new Color[] { Color.RED, Color.ORANGE, Color.YELLOW, Color.GREEN, Color.CYAN, Color.BLUE, Color.MAGENTA, Color.WHITE, Color.GRAY, Color.BLACK };
+	public static final Color[] DEBUG_DETAIL_LEVEL_COLORS = new Color[] { Color.RED, Color.ORANGE, Color.YELLOW, Color.GREEN, Color.CYAN, Color.BLUE, Color.MAGENTA, Color.WHITE, Color.GRAY, Color.BLACK };
 	
 	
+	public static final byte DETAIL_OPTIONS = 10;
+	
 	/** 512 blocks wide */
-	public static final byte REGION_DETAIL_LEVEL = 9;
+	public static final byte REGION_DETAIL_LEVEL = DETAIL_OPTIONS - 1;
 	/** 16 blocks wide */
 	public static final byte CHUNK_DETAIL_LEVEL = 4;
 	/** 1 block wide */
 	public static final byte BLOCK_DETAIL_LEVEL = 0;
-
-
-	public static final byte DETAIL_OPTIONS = 10;
-
+	
 	public static final short MAX_VERTICAL_DATA = 4;
-
-	/** measured in Blocks <br>
-	 * detail level 9 */
-	public static final short REGION_WIDTH = 512;
-	/** measured in Blocks <br>
-	 * detail level 4 */
+	
+	/**
+	 * measured in Blocks <br>
+	 * detail level max - 1
+	 */
+	public static final short REGION_WIDTH = 1 << REGION_DETAIL_LEVEL;
+	/**
+	 * measured in Blocks <br>
+	 * detail level 4
+	 */
 	public static final short CHUNK_WIDTH = 16;
-	/** measured in Blocks <br> 
-	 * detail level 0 */
+	/**
+	 * measured in Blocks <br>
+	 * detail level 0
+	 */
 	public static final short BLOCK_WIDTH = 1;
 	
 	
 	/** number of chunks wide */
-	public static final int REGION_WIDTH_IN_CHUNKS = 32;
+	public static final int REGION_WIDTH_IN_CHUNKS = REGION_WIDTH / CHUNK_WIDTH;
 	
 	
-	/** If we ever need to use a heightmap for any reason, use this one. */
+	/**
+	 * If we ever need to use a heightmap for any reason, use this one.
+	 */
 	public static final Heightmap.Type DEFAULT_HEIGHTMAP = Heightmap.Type.WORLD_SURFACE_WG;
 	
-	/** This regex finds any characters that are invalid for use in a windows 
-	 * (and by extension mac and linux) file path */
-	public static final String INVALID_FILE_CHARACTERS_REGEX = "[\\\\\\/:*?\\\"<>|]";
+	/**
+	 * This regex finds any characters that are invalid for use in a windows
+	 * (and by extension mac and linux) file path
+	 */
+	public static final String INVALID_FILE_CHARACTERS_REGEX = "[\\\\/:*?\"<>|]";
+	
+	/**
+	 * 64 MB by default is the maximum amount of memory that
+	 * can be directly allocated. <br><br>
+	 * <p>
+	 * I know there are commands to change that amount
+	 * (specifically "-XX:MaxDirectMemorySize"), but
+	 * I have no idea how to access that amount. <br>
+	 * So I guess this will be the hard limit for now. <br><br>
+	 * <p>
+	 * https://stackoverflow.com/questions/50499238/bytebuffer-allocatedirect-and-xmx
+	 */
+	public static final int MAX_ALLOCATABLE_DIRECT_MEMORY = 64 * 1024 * 1024;
+	
+	
+	public static final VertexFormat LOD_VERTEX_FORMAT = DefaultVertexFormats.POSITION_COLOR;
+	
 	
 	
 	
 	
 	/**
 	 * Gets the first valid ServerWorld.
-	 * 
 	 * @return null if there are no ServerWorlds
 	 */
 	public static ServerWorld getFirstValidServerWorld()
 	{
-		if (mc.hasSingleplayerServer())
+		if (mc.hasSinglePlayerServer())
 			return null;
 		
-		Iterable<ServerWorld> worlds = mc.getSingleplayerServer().getAllLevels();
+		Iterable<ServerWorld> worlds = mc.getSinglePlayerServer().getAllLevels();
 		
 		for (ServerWorld world : worlds)
 			return world;
@@ -130,12 +175,11 @@ public class LodUtil
 	
 	/**
 	 * Gets the ServerWorld for the relevant dimension.
-	 * 
 	 * @return null if there is no ServerWorld for the given dimension
 	 */
 	public static ServerWorld getServerWorldFromDimension(DimensionType dimension)
 	{
-		IntegratedServer server = mc.getSingleplayerServer();
+		IntegratedServer server = mc.getSinglePlayerServer();
 		if (server == null)
 			return null;
 		
@@ -144,7 +188,7 @@ public class LodUtil
 		
 		for (ServerWorld world : worlds)
 		{
-			if(world.dimensionType() == dimension)
+			if (world.dimensionType() == dimension)
 			{
 				returnWorld = world;
 				break;
@@ -154,9 +198,7 @@ public class LodUtil
 		return returnWorld;
 	}
 	
-	/**
-	 * Convert a 2D absolute position into a quad tree relative position. 
-	 */
+	/** Convert a 2D absolute position into a quad tree relative position. */
 	public static RegionPos convertGenericPosToRegionPos(int x, int z, int detailLevel)
 	{
 		int relativePosX = Math.floorDiv(x, (int) Math.pow(2, LodUtil.REGION_DETAIL_LEVEL - detailLevel));
@@ -165,15 +207,12 @@ public class LodUtil
 		return new RegionPos(relativePosX, relativePosZ);
 	}
 	
-	/**
-	 * Convert a 2D absolute position into a quad tree relative position.
-	 */
-	public static int convertLevelPos(int pos, int currectDetailLevel, int targetDetailLevel)
+	/** Convert a 2D absolute position into a quad tree relative position. */
+	public static int convertLevelPos(int pos, int currentDetailLevel, int targetDetailLevel)
 	{
-		int newPos = Math.floorDiv(pos, (int) Math.pow(2, targetDetailLevel - currectDetailLevel));
-		
-		return newPos;
+		return Math.floorDiv(pos, (int) Math.pow(2, targetDetailLevel - currentDetailLevel));
 	}
+	
 	/**
 	 * Return whether the given chunk
 	 * has any data in it.
@@ -182,9 +221,9 @@ public class LodUtil
 	{
 		ChunkSection[] blockStorage = chunk.getSections();
 		
-		for(ChunkSection section : blockStorage)
+		for (ChunkSection section : blockStorage)
 		{
-			if(section != null && !section.isEmpty())
+			if (section != null && !section.isEmpty())
 			{
 				return true;
 			}
@@ -194,7 +233,6 @@ public class LodUtil
 	}
 	
 	
-	
 	/**
 	 * If on single player this will return the name of the user's
 	 * world, if in multiplayer it will return the server name, IP,
@@ -202,7 +240,7 @@ public class LodUtil
 	 */
 	public static String getWorldID(IWorld world)
 	{
-		if(mc.hasSingleplayerServer())
+		if (mc.hasSinglePlayerServer())
 		{
 			// chop off the dimension ID as it is not needed/wanted
 			String dimId = getDimensionIDFromWorld(world);
@@ -220,10 +258,9 @@ public class LodUtil
 	}
 	
 	
-	
 	/**
 	 * If on single player this will return the name of the user's
-	 * world and the dimensional save folder, if in multiplayer 
+	 * world and the dimensional save folder, if in multiplayer
 	 * it will return the server name, ip, game version, and dimension.<br>
 	 * <br>
 	 * This can be used to determine where to save files for a given
@@ -231,17 +268,17 @@ public class LodUtil
 	 */
 	public static String getDimensionIDFromWorld(IWorld world)
 	{
-		if(mc.hasSingleplayerServer())
+		if (mc.hasSinglePlayerServer())
 		{
 			// this will return the world save location
 			// and the dimension folder
 			
 			ServerWorld serverWorld = LodUtil.getServerWorldFromDimension(world.dimensionType());
-			if(serverWorld == null)
+			if (serverWorld == null)
 				throw new NullPointerException("getDimensionIDFromWorld wasn't able to get the ServerWorld for the dimension " + world.dimensionType().effectsLocation().getPath());
 			
 			ServerChunkProvider provider = serverWorld.getChunkSource();
-			if(provider == null)
+			if (provider == null)
 				throw new NullPointerException("getDimensionIDFromWorld wasn't able to get the ServerChunkProvider for the dimension " + world.dimensionType().effectsLocation().getPath());
 			
 			return provider.dataStorage.dataFolder.toString();
@@ -252,40 +289,31 @@ public class LodUtil
 		}
 	}
 	
-	/**
-	 * returns the server name, IP and game version.
-	 */
+	/** returns the server name, IP and game version. */
 	public static String getServerId()
 	{
 		ServerData server = mc.getCurrentServer();
-		
 		String serverName = server.name.replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
 		String serverIp = server.ip.replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
 		String serverMcVersion = server.version.getString().replaceAll(INVALID_FILE_CHARACTERS_REGEX, "");
 		
-		String serverId =  serverName + ", IP " + serverIp + ", GameVersion " + serverMcVersion;
-		
-		return serverId; 
+		return serverName + ", IP " + serverIp + ", GameVersion " + serverMcVersion;
 	}
 	
 	
-	/**
-	 * Convert a BlockColors int into a Color object.
-	 */
+	/** Convert a BlockColors int into a Color object */
 	public static Color intToColor(int num)
 	{
 		int filter = 0b11111111;
 		
-		int red = (num >> 16 ) & filter;
-		int green = (num >> 8 ) & filter;
+		int red = (num >> 16) & filter;
+		int green = (num >> 8) & filter;
 		int blue = num & filter;
 		
 		return new Color(red, green, blue);
 	}
 	
-	/**
-	 * Convert a Color into a BlockColors object.
-	 */
+	/** Convert a Color into a BlockColors object. */
 	public static int colorToInt(Color color)
 	{
 		return color.getRGB();
@@ -319,68 +347,125 @@ public class LodUtil
 		return Math.min(max, Math.max(value, min));
 	}
 	
-	
-	
-	 /**
-     * Get a HashSet of all ChunkPos within the normal render distance
-     * that should not be rendered.
-     */
-	 public static HashSet<ChunkPos> getNearbyLodChunkPosToSkip(LodDimension lodDim, BlockPos playerPos)
-	 {
-		 int chunkRenderDist = mc.getRenderDistance();
-		 ChunkPos centerChunk = new ChunkPos(playerPos);
-
-		 // skip chunks that are already going to be rendered by Minecraft
-		 HashSet<ChunkPos> posToSkip = getRenderedChunks();
-
-		 // go through each chunk within the normal view distance
-		 for (int x = centerChunk.x - chunkRenderDist; x < centerChunk.x + chunkRenderDist; x++)
-		 {
-			 for (int z = centerChunk.z - chunkRenderDist; z < centerChunk.z + chunkRenderDist; z++)
-			 {
-				 if (!lodDim.doesDataExist(LodUtil.CHUNK_DETAIL_LEVEL, x, z))
-					 continue;
-
-				 long data = lodDim.getSingleData(LodUtil.CHUNK_DETAIL_LEVEL, x, z);
-
-				 short lodAverageHeight = DataPointUtil.getHeight(data);
-
-				 if (playerPos.getY() <= lodAverageHeight)
-				 {
-					 // don't draw Lod's that are taller than the player
-					 // to prevent LODs being drawn on top of the player
-					 posToSkip.add(new ChunkPos(x, z));
-				 }
-			 }
-		 }
-
-		 return posToSkip;
-	 }
-
-
 	/**
-     * This method returns the ChunkPos of all chunks that Minecraft
-     * is going to render this frame. <br><br>
-     * <p>
-     * Note: This isn't perfect. It will return some chunks that are outside
-     * the clipping plane. (For example, if you are high above the ground some chunks
-     * will be incorrectly added, even though they are outside render range).
-     */
+	 * Get a HashSet of all ChunkPos within the normal render distance
+	 * that should not be rendered.
+	 */
+	public static HashSet<ChunkPos> getNearbyLodChunkPosToSkip(LodDimension lodDim, BlockPos playerPos)
+	{
+		int chunkRenderDist = mc.getRenderDistance();
+		ChunkPos centerChunk = new ChunkPos(playerPos);
+		
+		int skipRadius;
+		VanillaOverdraw overdraw = LodConfig.CLIENT.graphics.advancedGraphicsOption.vanillaOverdraw.get();
+		HorizontalResolution drawRes = LodConfig.CLIENT.graphics.qualityOption.drawResolution.get();
+		
+		// apply distance based rules for dynamic overdraw
+		if (overdraw == VanillaOverdraw.DYNAMIC
+				&& chunkRenderDist <= MINIMUM_RENDER_DISTANCE_FOR_PARTIAL_OVERDRAW)
+		{
+			// The vanilla render distance isn't far enough 
+			// for partial skipping to make sense...
+			if (!lodDim.dimension.hasCeiling() && (drawRes == HorizontalResolution.BLOCK))
+			{
+				// ...and the dimension is open, so we don't have to worry about
+				// LODs rendering on top of the player,
+				// and the user is using a high horizontal resolution,
+				// so the overdraw shouldn't be noticeable
+				overdraw = VanillaOverdraw.ALWAYS;
+			}
+			else
+			{
+				// ...but we are underground, so we don't want
+				// LODs rendering on top of the player,
+				// Or the user is using a LOW horizontal resolution
+				// and overdraw would be very noticeable.
+				overdraw = VanillaOverdraw.NEVER;
+			}
+		}
+		
+		
+		// determine the skipping type based
+		// on the overdraw type
+		switch (overdraw)
+		{
+		case ALWAYS:
+			// don't skip any positions
+			return new HashSet<>();
+		
+		case DYNAMIC:
+			
+			if (chunkRenderDist > MINIMUM_RENDER_DISTANCE_FOR_PARTIAL_OVERDRAW 
+				&& chunkRenderDist <= MINIMUM_RENDER_DISTANCE_FOR_FAR_OVERDRAW)
+			{
+				// This is a small render distance (but greater than the minimum partial
+				// distance), skip positions that are greater than 2/3 the render distance
+				skipRadius = (int) Math.ceil(chunkRenderDist * (2.0/3.0));
+			}
+			else
+			{
+				// This is a large render distance. Skip positions that are greater than
+				// 4/5ths the render distance
+				skipRadius = (int) Math.ceil(chunkRenderDist * (4.0 / 5.0));
+			}
+			break;
+		
+		default:
+		case BORDER:
+		case NEVER:
+			// skip chunks in render distance that are rendered
+			// by vanilla minecraft
+			skipRadius = 0;
+			break;
+		}
+		
+		
+		// get the chunks that are going to be rendered by Minecraft
+		HashSet<ChunkPos> posToSkip = getRenderedChunks();
+		
+		
+		// remove everything outside the skipRadius,
+		// if the skipRadius is being used
+		if (skipRadius != 0)
+		{
+			for (int x = centerChunk.x - chunkRenderDist; x < centerChunk.x + chunkRenderDist; x++)
+			{
+				for (int z = centerChunk.z - chunkRenderDist; z < centerChunk.z + chunkRenderDist; z++)
+				{
+					if (x <= centerChunk.x - skipRadius || x >= centerChunk.x + skipRadius
+							|| z <= centerChunk.z - skipRadius || z >= centerChunk.z + skipRadius)
+						posToSkip.remove(new ChunkPos(x, z));
+					
+				}
+			}
+		}
+		return posToSkip;
+	}
+	
+	
+	/**
+	 * This method returns the ChunkPos of all chunks that Minecraft
+	 * is going to render this frame. <br><br>
+	 * <p>
+	 * Note: This isn't perfect. It will return some chunks that are outside
+	 * the clipping plane. (For example, if you are high above the ground some chunks
+	 * will be incorrectly added, even though they are outside render range).
+	 */
 	public static HashSet<ChunkPos> getRenderedChunks()
 	{
 		HashSet<ChunkPos> loadedPos = new HashSet<>();
 		
-		// Wow those are some long names!
+		// Wow, those are some long names!
 		
 		// go through every RenderInfo to get the compiled chunks
 		WorldRenderer renderer = mc.getLevelRenderer();
-		for (WorldRenderer.LocalRenderInformationContainer worldrenderer$localrenderinformationcontainer : renderer.renderChunks)
+		for (WorldRenderer.LocalRenderInformationContainer worldRenderer$LocalRenderInformationContainer : renderer.renderChunks)
 		{
-			CompiledChunk compiledChunk = worldrenderer$localrenderinformationcontainer.chunk.getCompiledChunk();
+			CompiledChunk compiledChunk = worldRenderer$LocalRenderInformationContainer.chunk.getCompiledChunk();
 			if (!compiledChunk.hasNoRenderableLayers())
 			{
 				// add the ChunkPos for every rendered chunk
-				BlockPos bpos = worldrenderer$localrenderinformationcontainer.chunk.getOrigin();
+				BlockPos bpos = worldRenderer$LocalRenderInformationContainer.chunk.getOrigin();
 				
 				loadedPos.add(new ChunkPos(bpos));
 			}
@@ -390,5 +475,38 @@ public class LodUtil
 		return loadedPos;
 	}
 	
-	
+	/**
+	 * This method find if a given chunk is a border chunk of the renderable ones
+	 * @param vanillaRenderedChunks matrix of the vanilla rendered chunks
+	 * @param x relative (to the matrix) x chunk to check
+	 * @param z relative (to the matrix) z chunk to check
+	 * @return true if and only if the chunk is a border of the renderable chunks
+	 */
+	public static boolean isBorderChunk(boolean[][] vanillaRenderedChunks, int x, int z)
+	{
+		if (x < 0 || z < 0 || x >= vanillaRenderedChunks.length || z >= vanillaRenderedChunks[0].length)
+			return false;
+		int tempX;
+		int tempZ;
+		for (Direction direction : Box.ADJ_DIRECTIONS)
+		{
+			tempX = x + Box.DIRECTION_NORMAL_MAP.get(direction).getX();
+			tempZ = z + Box.DIRECTION_NORMAL_MAP.get(direction).getZ();
+			if (!(tempX < 0 || tempZ < 0 || tempX >= vanillaRenderedChunks.length || tempZ >= vanillaRenderedChunks[0].length))
+			{
+				if (!vanillaRenderedChunks[tempX][tempZ])
+				{
+					return true;
+				}
+			}
+			else
+			{
+				if (vanillaRenderedChunks[x][z])
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 }
@@ -1,43 +0,0 @@
-/*
- *    This file is part of the LOD Mod, licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  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.util;
-
-/**
- * This holds meta information about the mod.
- * 
- * @author James Seibel
- * @version 04-16-2020
- */
-public class Reference
-{
-	/** the mod's identifier  */
-	public static final String MOD_ID = "lod";
-	/** the mod's name */
-	public static final String NAME = "LOD Mod";
-	/** the mod's version */
-	public static final String VERSION = "1.0";
-	/** the version of minecraft this mod is built for */
-	public static final String ACCEPTED_VERSIONS = "[1.16.4]";
-	
-	/** where the client proxy class is */
-	public static final String CLIENT_PROXY_CLASS = "com.backsun.lod.proxy.ClientProxy";
-	/** where the  common proxy class is*/
-	public static final String COMMON_PROXY_CLASS = "com.backsun.lod.proxy.CommonProxy";
-	
-	
-}
@@ -1,106 +1,217 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.util;

+import static com.seibel.lod.util.LodUtil.DETAIL_OPTIONS;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

+import com.seibel.lod.builders.bufferBuilding.lodTemplates.Box;
+
+import net.minecraft.util.Direction;
+
+/**
+ * Holds data used by specific threads so
+ * the data doesn't have to be recreated every
+ * time it is needed.
+ * 
+ * @author Leonardo Amato
+ * @version 9-25-2021
+ */
 public class ThreadMapUtil
 {
 	public static final ConcurrentMap<String, long[]> threadSingleUpdateMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, long[][]> threadBuilderArrayMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, long[][]> threadBuilderVerticalArrayMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, long[]> threadVerticalAddDataMap = new ConcurrentHashMap<>();
-	public static final ConcurrentMap<String, byte[]> saveContainer = new ConcurrentHashMap<>();
-	public static final ConcurrentMap<String, short[]> projectionShortMap = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<String, byte[][]> saveContainer = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<String, short[]> projectionArrayMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, short[]> heightAndDepthMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, long[]> singleDataToMergeMap = new ConcurrentHashMap<>();
 	public static final ConcurrentMap<String, long[][]> verticalUpdate = new ConcurrentHashMap<>();
-
-	public static long[] getSingleUpdateArray()
+	
+	
+	//________________________//
+	// used in BufferBuilder  //
+	//________________________//
+	
+	public static final ConcurrentMap<String, boolean[]> adjShadeDisabled = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<String, Map<Direction, long[]>> adjDataMap = new ConcurrentHashMap<>();
+	public static final ConcurrentMap<String, Box> boxMap = new ConcurrentHashMap<>();
+	
+	/** returns the array NOT cleared every time */
+	public static boolean[] getAdjShadeDisabledArray()
 	{
-		if (!threadSingleUpdateMap.containsKey(Thread.currentThread().getName()) || (threadSingleUpdateMap.get(Thread.currentThread().getName()) == null))
+		if (!adjShadeDisabled.containsKey(Thread.currentThread().getName())
+				|| (adjShadeDisabled.get(Thread.currentThread().getName()) == null))
 		{
-			threadSingleUpdateMap.put(Thread.currentThread().getName(), new long[4]);
+			adjShadeDisabled.put(Thread.currentThread().getName(), new boolean[Box.DIRECTIONS.length]);
 		}
-		return threadSingleUpdateMap.get(Thread.currentThread().getName());
+		Arrays.fill(adjShadeDisabled.get(Thread.currentThread().getName()), false);
+		return adjShadeDisabled.get(Thread.currentThread().getName());
 	}
-
-	public static long[][] getBuilderArray()
+	
+	/** returns the array NOT cleared every time */
+	public static Map<Direction, long[]> getAdjDataArray(int verticalData)
 	{
-		if (!threadBuilderArrayMap.containsKey(Thread.currentThread().getName()) || (threadBuilderArrayMap.get(Thread.currentThread().getName()) == null))
+		if (!adjDataMap.containsKey(Thread.currentThread().getName())
+				|| (adjDataMap.get(Thread.currentThread().getName()) == null)
+				|| (adjDataMap.get(Thread.currentThread().getName()).get(Direction.NORTH) == null)
+				|| (adjDataMap.get(Thread.currentThread().getName()).get(Direction.NORTH).length != verticalData))
 		{
-			long[][] array = new long[5][];
-			threadBuilderArrayMap.put(Thread.currentThread().getName(), array);
+			adjDataMap.put(Thread.currentThread().getName(), new HashMap<Direction, long[]>());
+			adjDataMap.get(Thread.currentThread().getName()).put(Direction.UP, new long[1]);
+			adjDataMap.get(Thread.currentThread().getName()).put(Direction.DOWN, new long[1]);
+			for (Direction direction : Box.ADJ_DIRECTIONS)
+				adjDataMap.get(Thread.currentThread().getName()).put(direction, new long[verticalData]);
 		}
-		return threadBuilderArrayMap.get(Thread.currentThread().getName());
+		else
+		{
+			
+			for (Direction direction : Box.ADJ_DIRECTIONS)
+				Arrays.fill(adjDataMap.get(Thread.currentThread().getName()).get(direction), DataPointUtil.EMPTY_DATA);
+		}
+		return adjDataMap.get(Thread.currentThread().getName());
 	}
-
-	public static long[][] getBuilderVerticalArray()
+	
+	public static Box getBox()
+	{
+		if (!boxMap.containsKey(Thread.currentThread().getName())
+				|| (boxMap.get(Thread.currentThread().getName()) == null))
+		{
+			boxMap.put(Thread.currentThread().getName(), new Box());
+		}
+		boxMap.get(Thread.currentThread().getName()).reset();
+		return boxMap.get(Thread.currentThread().getName());
+	}
+	
+	//________________________//
+	// used in DataPointUtil  //
+	// mergeVerticalData      //
+	//________________________//
+	
+	
+	//________________________//
+	// used in DataPointUtil  //
+	// mergeSingleData        //
+	//________________________//
+	
+	
+	
+	/** returns the array filled with 0's */
+	public static long[] getBuilderVerticalArray(int detailLevel)
 	{
 		if (!threadBuilderVerticalArrayMap.containsKey(Thread.currentThread().getName()) || (threadBuilderVerticalArrayMap.get(Thread.currentThread().getName()) == null))
 		{
 			long[][] array = new long[5][];
+			int size = 1;
+			for (int i = 0; i < 5; i++)
+			{
+				array[i] = new long[size * size * DataPointUtil.worldHeight + 1];
+				size = size << 1;
+			}
 			threadBuilderVerticalArrayMap.put(Thread.currentThread().getName(), array);
 		}
-		return threadBuilderVerticalArrayMap.get(Thread.currentThread().getName());
+		Arrays.fill(threadBuilderVerticalArrayMap.get(Thread.currentThread().getName())[detailLevel], 0);
+		return threadBuilderVerticalArrayMap.get(Thread.currentThread().getName())[detailLevel];
 	}
-
-	public static long[] verticalDataArray()
+	
+	/** returns the array NOT cleared every time */
+	public static byte[] getSaveContainer(int detailLevel)
+	{
+		if (!saveContainer.containsKey(Thread.currentThread().getName()) || (saveContainer.get(Thread.currentThread().getName()) == null))
+		{
+			byte[][] array = new byte[DETAIL_OPTIONS][];
+			int size = 1;
+			for (int i = DETAIL_OPTIONS - 1; i >= 0; i--)
+			{
+				array[i] = new byte[2 + 8 * size * size * DetailDistanceUtil.getMaxVerticalData(i)];
+				size = size << 1;
+			}
+			saveContainer.put(Thread.currentThread().getName(), array);
+		}
+		//Arrays.fill(threadBuilderVerticalArrayMap.get(Thread.currentThread().getName())[detailLevel], 0);
+		return saveContainer.get(Thread.currentThread().getName())[detailLevel];
+	}
+	
+	
+	/** returns the array filled with 0's */
+	public static long[] getVerticalDataArray(int arrayLength)
 	{
 		if (!threadVerticalAddDataMap.containsKey(Thread.currentThread().getName()) || (threadVerticalAddDataMap.get(Thread.currentThread().getName()) == null))
 		{
-			threadVerticalAddDataMap.put(Thread.currentThread().getName(), new long[0]);
+			threadVerticalAddDataMap.put(Thread.currentThread().getName(), new long[arrayLength]);
+		}
+		else
+		{
+			Arrays.fill(threadVerticalAddDataMap.get(Thread.currentThread().getName()), 0);
 		}
 		return threadVerticalAddDataMap.get(Thread.currentThread().getName());
 	}
-
-	public static short[] getProjectionShort(){
-		if(!projectionShortMap.containsKey(Thread.currentThread().getName()) || (projectionShortMap.get(Thread.currentThread().getName()) == null))
+	
+	
+	
+	/** returns the array NOT cleared every time */
+	public static short[] getHeightAndDepth(int arrayLength)
+	{
+		if (!heightAndDepthMap.containsKey(Thread.currentThread().getName()) || (heightAndDepthMap.get(Thread.currentThread().getName()) == null))
 		{
-			projectionShortMap.put(Thread.currentThread().getName(), new short[0]);
-		}
-		return projectionShortMap.get(Thread.currentThread().getName());
-	}
-
-	public static short[] getHeightAndDepth(){
-		if(!heightAndDepthMap.containsKey(Thread.currentThread().getName()) || (heightAndDepthMap.get(Thread.currentThread().getName()) == null))
-		{
-			heightAndDepthMap.put(Thread.currentThread().getName(), new short[0]);
+			heightAndDepthMap.put(Thread.currentThread().getName(), new short[arrayLength]);
 		}
 		return heightAndDepthMap.get(Thread.currentThread().getName());
 	}
-
-	public static byte[] getSaveContainer(){
-		if(!saveContainer.containsKey(Thread.currentThread().getName()) || (saveContainer.get(Thread.currentThread().getName()) == null))
+	
+	
+	/** returns the array filled with 0's */
+	public static long[] getVerticalUpdateArray(int detailLevel)
+	{
+		if (!verticalUpdate.containsKey(Thread.currentThread().getName()) || (verticalUpdate.get(Thread.currentThread().getName()) == null))
 		{
-			saveContainer.put(Thread.currentThread().getName(), new byte[0]);
-		}
-		return saveContainer.get(Thread.currentThread().getName());
-	}
-
-	public static long[][] getVerticalUpdateArray(){
-		if(!verticalUpdate.containsKey(Thread.currentThread().getName()) || (verticalUpdate.get(Thread.currentThread().getName()) == null))
-		{
-			long[][] array = new long[10][];
+			long[][] array = new long[DETAIL_OPTIONS][];
+			for (int i = 1; i < DETAIL_OPTIONS; i++)
+				array[i] = new long[DetailDistanceUtil.getMaxVerticalData(i - 1) * 4];
 			verticalUpdate.put(Thread.currentThread().getName(), array);
 		}
-		return verticalUpdate.get(Thread.currentThread().getName());
-	}
-
-	public static long[] getSingleAddDataToMerge(){
-		if(!singleDataToMergeMap.containsKey(Thread.currentThread().getName()) || (singleDataToMergeMap.get(Thread.currentThread().getName()) == null))
+		else
 		{
-			singleDataToMergeMap.put(Thread.currentThread().getName(), new long[0]);
+			Arrays.fill(verticalUpdate.get(Thread.currentThread().getName())[detailLevel], 0);
 		}
-		return singleDataToMergeMap.get(Thread.currentThread().getName());
+		return verticalUpdate.get(Thread.currentThread().getName())[detailLevel];
 	}
-
-	public static void clearMaps(){
+	
+	/** clears all arrays so they will have to be rebuilt */
+	public static void clearMaps()
+	{
+		adjShadeDisabled.clear();
+		adjDataMap.clear();
+		boxMap.clear();
 		threadSingleUpdateMap.clear();
 		threadBuilderArrayMap.clear();
 		threadBuilderVerticalArrayMap.clear();
 		threadVerticalAddDataMap.clear();
 		saveContainer.clear();
-		projectionShortMap.clear();
+		projectionArrayMap.clear();
 		heightAndDepthMap.clear();
 		singleDataToMergeMap.clear();
 		verticalUpdate.clear();
@@ -1,8 +1,29 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  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.wrappers;

 import java.awt.Color;
 import java.io.File;

+import com.seibel.lod.ModInfo;
+import com.seibel.lod.proxy.ClientProxy;
 import com.seibel.lod.util.LodUtil;

 import net.minecraft.client.GameSettings;
@@ -17,6 +38,7 @@ import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.model.ModelManager;
 import net.minecraft.client.renderer.texture.NativeImage;
 import net.minecraft.client.world.ClientWorld;
+import net.minecraft.crash.CrashReport;
 import net.minecraft.entity.Entity;
 import net.minecraft.profiler.IProfiler;
 import net.minecraft.server.integrated.IntegratedServer;
@@ -32,12 +54,14 @@ import net.minecraft.world.DimensionType;
 */
 public class MinecraftWrapper
 {
-	public static MinecraftWrapper INSTANCE = new MinecraftWrapper();
+	public static final MinecraftWrapper INSTANCE = new MinecraftWrapper();
 	
-	private Minecraft mc = Minecraft.getInstance();
+	private final Minecraft mc = Minecraft.getInstance();
 	
-	/** The lightmap for the current:
-	 * Time, dimension, brightness setting, etc. */
+	/**
+	 * The lightmap for the current:
+	 * Time, dimension, brightness setting, etc.
+	 */
 	private NativeImage lightMap = null;
 	
 	private MinecraftWrapper()
@@ -54,10 +78,10 @@ public class MinecraftWrapper
 	/**
 	 * 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>
-	 * 
-	 * Lightmaps and other time sensitive objects fall in this category. <br> <br>
-	 * 
-	 * This doesn't effect OpenGL objects in any way.
+	 * <p>
+	 * LightMaps and other time sensitive objects fall in this category. <br> <br>
+	 * <p>
+	 * This doesn't affect OpenGL objects in any way.
 	 */
 	public void clearFrameObjectCache()
 	{
@@ -75,7 +99,7 @@ public class MinecraftWrapper
 		return mc.level.getShade(Direction.UP, true);
 	}
 	
-	public boolean hasSingleplayerServer()
+	public boolean hasSinglePlayerServer()
 	{
 		return mc.hasSingleplayerServer();
 	}
@@ -90,7 +114,7 @@ public class MinecraftWrapper
 		return LodUtil.getDimensionIDFromWorld(mc.level);
 	}
 	
-	/** 
+	/**
 	 * This texture changes every frame
 	 */
 	public NativeImage getCurrentLightMap()
@@ -99,32 +123,14 @@ public class MinecraftWrapper
 		if (lightMap == null)
 		{
 			LightTexture tex = mc.gameRenderer.lightTexture();
-			NativeImage lightPixels = tex.lightPixels;
-			lightMap = lightPixels;
+			lightMap = tex.lightPixels;
 		}
-		
-//		// hotswap this to true, then back to false to write a file
-//		// (and not write a file every frame)
-//		if (false)
-//		{
-//			try
-//			{
-//				// obviously change the filepath to somewhere on your PC
-//				lightPixels.writeToFile(new File("C:\\Users\\James Seibel\\Desktop\\image.png"));
-//			}
-//			catch(Exception e)
-//			{
-//				e.printStackTrace();
-//			}
-//		}
-		
 		return lightMap;
 	}
 	
 	/**
 	 * Returns the color int at the given pixel coordinates
 	 * from the current lightmap.
-	 * 
 	 * @param u x location in texture space
 	 * @param v z location in texture space
 	 */
@@ -132,7 +138,7 @@ public class MinecraftWrapper
 	{
 		if (lightMap == null)
 		{
-			// make sure the lightMap is up to date
+			// make sure the lightMap is up-to-date
 			getCurrentLightMap();
 		}
 		
@@ -142,7 +148,6 @@ public class MinecraftWrapper
 	/**
 	 * Returns the Color at the given pixel coordinates
 	 * from the current lightmap.
-	 * 
 	 * @param u x location in texture space
 	 * @param v z location in texture space
 	 */
@@ -167,7 +172,7 @@ public class MinecraftWrapper
 	{
 		return mc.options;
 	}
-
+	
 	public ModelManager getModelManager()
 	{
 		return mc.getModelManager();
@@ -175,9 +180,9 @@ public class MinecraftWrapper
 	
 	public ClientWorld getClientWorld()
 	{
-		return  mc.level;
+		return mc.level;
 	}
-
+	
 	/** Measured in chunks */
 	public int getRenderDistance()
 	{
@@ -219,7 +224,7 @@ public class MinecraftWrapper
 		return mc.level.getSkyDarken(partialTicks);
 	}
 	
-	public IntegratedServer getSingleplayerServer()
+	public IntegratedServer getSinglePlayerServer()
 	{
 		return mc.getSingleplayerServer();
 	}
@@ -233,4 +238,20 @@ public class MinecraftWrapper
 	{
 		return mc.levelRenderer;
 	}
+	
+	
+	/**
+	 * Crashes Minecraft, displaying the given errorMessage <br> <br>
+	 * In the following format: <br>
+	 * 
+	 * The game crashed whilst <strong>errorMessage</strong>  <br>
+	 * Error: <strong>java.lang.ExceptionClass: exceptionErrorMessage</strong>  <br>
+	 * Exit Code: -1  <br>
+	 */
+	public void crashMinecraft(String errorMessage, Throwable exception)
+	{
+		ClientProxy.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
+		CrashReport report = new CrashReport(errorMessage, exception);
+		Minecraft.crash(report);
+	}
 }
@@ -24,10 +24,10 @@ modId="lod" #mandatory
 #// The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
 #//${file.jarVersion} will substitute the value of the Implementation-Version as read from the mod's JAR file metadata
 #// see the associated build.gradle script for how to populate this completely automatically during a build
-version="a1.5.0-pre" #mandatory
+version="a1.5.1" #mandatory

 #// A display name for the mod
-displayName="LOD" #mandatory
+displayName="Distant Horizons" #mandatory

 #// A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
 #//updateJSONURL="https://change.me.example.invalid/updates.json" #optional