From ae5ebdbfe2623a59d4ef5904ea5e50d67913f437 Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Sun, 15 Jun 2025 19:39:41 +1200
Subject: [PATCH 1/6] configure spotless+checkstyle

---
 .idea/codeStyles/Project.xml                  |   9 +-
 CubicChunksCore                               |   2 +-
 build.gradle                                  |  25 ++
 buildSrc/build.gradle                         |   3 +
 .../gradle/FixAnnotationsFormatterStep.java   |  28 ++
 config/checkstyle/checkstyle.xml              | 177 +++-----
 config/checkstyle/suppressions.xml            |  27 +-
 config/eclipse_formatter.xml                  | 404 ++++++++++++++++++
 8 files changed, 527 insertions(+), 148 deletions(-)
 create mode 100644 buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
 create mode 100644 config/eclipse_formatter.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index c4f04e83..08f5920f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,7 +1,7 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <option name="LINE_SEPARATOR" value="&#10;" />
-    <option name="RIGHT_MARGIN" value="190" />
+    <option name="RIGHT_MARGIN" value="150" />
     <option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="false" />
     <option name="FORMATTER_TAGS_ENABLED" value="true" />
     <GroovyCodeStyleSettings>
@@ -30,14 +30,7 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2147483647" />
       <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
         <value>
-          <package name="io.github.opencubicchunks.cubicchunks.utils.Coords" withSubpackages="false" static="true" />
           <package name="org.objectweb.asm.Opcodes" withSubpackages="false" static="true" />
-          <package name="io.github.opencubicchunks.cubicchunks.chunk.util.Utils" withSubpackages="false" static="true" />
-          <package name="io.github.opencubicchunks.cubicchunks.utils.Utils" withSubpackages="false" static="true" />
-          <package name="io.github.opencubicchunks.cubicchunks.utils.Bits" withSubpackages="false" static="true" />
-          <package name="io.github.opencubicchunks.cubicchunks.utils.AddressTools" withSubpackages="false" static="true" />
-          <package name="io.github.opencubicchunks.cubicchunks.utils.MathUtil" withSubpackages="false" static="true" />
-          <package name="java.util.Math" withSubpackages="false" static="true" />
         </value>
       </option>
       <option name="IMPORT_LAYOUT_TABLE">
diff --git a/CubicChunksCore b/CubicChunksCore
index 22d70c27..75a1100c 160000
--- a/CubicChunksCore
+++ b/CubicChunksCore
@@ -1 +1 @@
-Subproject commit 22d70c2747b7cc96fb6aba19cb5654c0835c4017
+Subproject commit 75a1100c8a6d47f02bde8515d4a7de207f04be36
diff --git a/build.gradle b/build.gradle
index 0fc6e700..1db3107e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,3 +1,4 @@
+import io.github.opencubicchunks.gradle.FixAnnotationsFormatterStep
 import io.github.opencubicchunks.gradle.GeneratePackageInfo
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat
 
@@ -11,6 +12,8 @@ plugins {
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
+    id("com.diffplug.spotless") version "7.0.4"
+    id "checkstyle"
     id 'net.neoforged.moddev' version '2.0.90'
     id("io.github.opencubicchunks.javaheaders").version("1.2.8")
     id("io.github.opencubicchunks.gradle.mcGitVersion")
@@ -380,6 +383,28 @@ test {
 //    dependsOn longRunTest
 //}
 
+spotless {
+    java {
+        // Specified explicitly to ignore CubicChunksCore and src_old
+        target(
+                "src/*/java/**/*.java",
+                "buildSrc/src/*/java/**/*.java"
+        )
+
+        eclipse().configFile('config/eclipse_formatter.xml')
+        // Eclipse JDT puts all annotations on their own lines; we merge some of them back onto the same line as their target.
+        addStep(new FixAnnotationsFormatterStep())
+
+        importOrder("\\#", "java", "javax", "")
+        removeUnusedImports()
+    }
+}
+
+tasks.withType(Checkstyle) {
+    // Auto-formatting might fix some Checkstyle violations, so don't run Checkstyle unless spotlessCheck passes
+    dependsOn spotlessCheck
+}
+
 publishing {
     publications {
         register('mavenJava', MavenPublication) {
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 01577b94..93227a26 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -22,4 +22,7 @@ dependencies {
 
     implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
     implementation "org.ajoberstar.grgit:grgit-core:5.3.0"
+
+    implementation "com.diffplug.spotless:spotless-lib:3.1.2"
+    implementation "com.diffplug.spotless:spotless-lib-extra:3.1.2"
 }
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
new file mode 100644
index 00000000..b2b3b8e9
--- /dev/null
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
@@ -0,0 +1,28 @@
+package io.github.opencubicchunks.gradle;
+
+import java.io.File;
+
+import com.diffplug.spotless.FormatterStep;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class FixAnnotationsFormatterStep implements FormatterStep {
+    @Override public String getName() {
+        return "cc_fix_annotations";
+    }
+
+    private static final String[] ANNOTATIONS = { "@Shadow", "@Final", "@Mutable", "@Public", "@Override", "@Nullable", "@NotNull", };
+
+    @Override public @Nullable String format(String s, @NotNull File file) {
+        var outputString = s;
+        for (var annotation : ANNOTATIONS) {
+            // Remove newlines after the listed annotations
+            outputString = outputString.replaceAll(annotation + "\\n\\h*", annotation + " ");
+        }
+        return outputString;
+    }
+
+    @Override public void close() {
+
+    }
+}
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index da2fc4ba..a1b03391 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -21,60 +21,24 @@
     <property name="severity" value="error"/>
 
     <property name="fileExtensions" value="java, json"/>
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <module name="LineLength">
-        <property name="id" value="LineLengthCode"/>
-        <property name="max" value="190"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        <message key="maxLineLen" value="Code line is longer than {0,number,integer} characters (found {1,number,integer})."/>
-    </module>
-
-    <module name="LineLength">
-        <property name="id" value="LineLengthComment"/>
-        <property name="max" value="190"/>
-        <property name="ignorePattern" value="^[ \t]*([a-zA-Z0-9\{\}\+\|\&amp;\&quot;@\(\)&gt;&lt;\.]|//)|@link|@see"/>
-        <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
-        <message key="maxLineLen" value="Comment line is longer than {0,number,integer} characters (found {1,number,integer})."/>
-    </module>
-
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-    </module>
 
     <module name="SuppressWarningsFilter"/>
 
     <module name="TreeWalker">
         <module name="SuppressWarningsHolder"/>
 
-        <!-- Annotations -->
-
-        <module name="AnnotationLocation">
-            <property name="allowSamelineMultipleAnnotations" value="true"/>
-        </module>
-        <module name="MissingDeprecated"/>
-        <module name="MissingOverride"/>
-
         <!-- Block checks -->
 
         <module name="AvoidNestedBlocks">
             <property name="allowInSwitchCase" value="true"/>
         </module>
-        <module name="EmptyBlock"/>
-        <module name="EmptyCatchBlock"/>
-        <module name="LeftCurly"/>
-        <module name="NeedBraces">
-            <property name="allowSingleLineStatement" value="true"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlySame"/>
-            <property name="tokens" value="LITERAL_TRY, LITERAL_CATCH, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_DO"/>
-        </module>
-        <module name="RightCurly">
-            <property name="id" value="RightCurlyAlone"/>
-            <property name="option" value="alone"/>
-            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, STATIC_INIT, INSTANCE_INIT"/>
+        <module name="EmptyBlock">
+            <!-- Allow blocks with only comments, for cases where there's a to-do comment -->
+            <!-- TODO probably disallow comment-only blocks once we're further into development (P2? P3?) -->
+            <property name="option" value="text"/>
         </module>
+        <module name="EmptyCatchBlock"/>
+        <module name="NeedBraces"/>
 
         <!-- Code design -->
 
@@ -82,51 +46,63 @@
         <module name="InterfaceIsType"/>
         <module name="MutableException"/>
         <module name="OneTopLevelClass"/>
+<!--        <module name="AnonInnerLength"/>--> <!-- TODO Could consider this one, but there are some vanilla anonymous classes we copy that are pretty long - though maybe that's a case for DASM-copying them? -->
 
         <!-- Coding -->
 
-        <!-- <module name="AvoidDoubleBraceInitializationCheck"/> not available in our version? -->
-        <!-- <module name="AvoidNoArgumentSuperConstructorCall"/> not available in our version? -->
+        <module name="AvoidDoubleBraceInitialization"/>
+        <module name="AvoidNoArgumentSuperConstructorCall"/>
+<!--        <module name="ConstructorsDeclarationGrouping"/>--> <!-- TODO not available for current checkstyle version -->
         <module name="CovariantEquals"/>
-        <module name="DeclarationOrder"/>
+<!--        <module name="DeclarationOrder"/>--> <!-- Disabled since we often try to mimic vanilla class member order -->
         <module name="DefaultComesLast"/>
         <module name="EmptyStatement"/>
         <module name="EqualsHashCode"/>
         <module name="FallThrough"/>
         <!-- <module name="FinalLocalVariable"/> maybe in the future? -->
-        <module name="HiddenField">
-            <property name="ignoreConstructorParameter" value="true"/>
-            <property name="ignoreSetter" value="true"/>
-            <property name="setterCanReturnItsClass" value="true"/>
-            <property name="ignoreAbstractMethods" value="true"/>
-        </module>
+        <!-- TODO could enable HiddenField, but it seems to be inconvenient far more often than it's actually helpful -->
+<!--        <module name="HiddenField">-->
+<!--            <property name="ignoreConstructorParameter" value="true"/>-->
+<!--            <property name="ignoreSetter" value="true"/>-->
+<!--            <property name="setterCanReturnItsClass" value="true"/>-->
+<!--            <property name="ignoreAbstractMethods" value="true"/>-->
+<!--        </module>-->
+        <module name="HideUtilityClassConstructor"/>
         <!-- <module name="IllegalCatch"/> maybe in the future with some suppression for ReportedException code? -->
         <module name="IllegalThrows"/>
         <!-- <module name="IllegalType"/> in the future? -->
         <module name="InnerAssignment"/>
-        <!-- <module name="MagicNumber"/> TODO: investigate whether it's feasible to use this -->
+        <module name="MagicNumber">
+            <property name="ignoreAnnotation" value="true"/>
+        </module>
+        <module name="MissingSwitchDefault"/>
         <module name="ModifiedControlVariable"/>
+        <module name="ModifierOrder"/>
         <module name="MultipleStringLiterals">
-            <!-- This may need more special cases, add more if necessary. TODO: reduce max allowed duplicates -->
-            <property name="allowedDuplicates" value="5"/>
-            <property name="ignoreStringsRegexp" value="(Not implemented|For later implementation)"/>
+            <property name="allowedDuplicates" value="3"/>
+            <!-- For now we just ignore single characters. This may need more special cases, add more if necessary. -->
+            <property name="ignoreStringsRegexp" value="."/>
         </module>
         <module name="NestedForDepth">
             <!-- Worldgen code has 2 x 3d nested loops in it, set that as max -->
             <property name="max" value="6"/>
         </module>
-        <!-- <module name="NestedIfDepth"/> TODO: enable this -->
+        <!-- <module name="NestedIfDepth"/> TODO: enable this? -->
         <module name="NestedTryDepth"/>
+        <module name="NoClone"/>
         <module name="NoFinalizer"/>
+        <!-- Does OneStatementPerLine ever get hit with auto-formatting? probably not? still good to have -->
         <module name="OneStatementPerLine"/>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="PackageDeclaration"/>
-        <!-- <module name="ParameterAssignment"/> in the future? -->
+        <module name="ParameterAssignment"/>
         <!-- <module name="RequireThis"/> TODO: consider the possibility of using this -->
+<!--        <module name="SealedShouldHavePermitsList"/>--> <!-- TODO not available for current checkstyle version -->
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
         <module name="StringLiteralEquality"/>
-        <!-- <module name="UnnecessaryParentheses"/> TODO fix all of them and enable this, note: (a + b) + c is not considered unnecessary -->
+<!--        <module name="UnnecessaryNullCheckWithInstanceOf"/>--> <!-- TODO not available for current checkstyle version -->
+        <module name="UnnecessarySemicolonAfterOuterTypeDeclaration"/>
         <module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
         <module name="UnnecessarySemicolonInEnumeration"/>
         <module name="UnnecessarySemicolonInTryWithResources"/>
@@ -134,34 +110,22 @@
 
         <!-- Imports -->
 
+        <!-- Rely on auto-formatting for imports, except for these - not sure if auto-format handles RedundantImport. -->
         <module name="AvoidStarImport">
-            <property name="excludes" value="io.github.opencubicchunks.cubicchunks.utils.Coords,
-            io.github.opencubicchunks.cubicchunks.utils.Utils,
-            io.github.opencubicchunks.cubicchunks.utils.Utils,
-            io.github.opencubicchunks.cubicchunks.utils.Bits,
-            io.github.opencubicchunks.cubicchunks.utils.AddressTools,
-            io.github.opencubicchunks.cubicchunks.utils.MathUtil,
-            java.util.Math,
-            org.objectweb.asm.Opcodes"/>
+            <!-- Can probably add other excludes as necessary -->
+            <property name="excludes" value="org.objectweb.asm.Opcodes"/>
         </module>
         <module name="IllegalImport">
             <property name="illegalPkgs" value="java.awt, javax.swing, sun, jdk.internal"/>
         </module>
-        <module name="ImportOrder">
-            <property name="option" value="top"/>
-            <property name="groups" value="/^java\./,javax"/>
-            <property name="separated" value="true"/>
-            <property name="sortStaticImportsAlphabetically" value="true"/>
-        </module>
         <module name="RedundantImport"/>
-        <module name="UnusedImports"/>
 
         <!-- TODO: javadoc checkstyle -->
 
         <!-- Metrics -->
 
         <module name="CyclomaticComplexity"/>
-        <!-- <module name="JavaNCSS"/> TODO fix and enable -->
+        <module name="JavaNCSS"/>
         <module name="NPathComplexity">
             <property name="max" value="512"/>
         </module>
@@ -170,65 +134,34 @@
 
         <module name="ArrayTypeStyle"/>
         <module name="AvoidEscapedUnicodeCharacters"/>
-        <!-- <module name="CommentsIndentation"/> TODO: this breaks when intellij allows // at the beginning of th line. Any workaround? -->
-        <!-- <module name="Indentation"/> TODO: Doesn't match intellij for lambdas. Any workaround? -->
         <module name="OuterTypeFilename"/>
         <module name="UpperEll"/>
+        <!-- Prevent wrapping in package declarations and imports - probably unnecessary? -->
+        <module name="NoLineWrap"/>
 
         <!-- Modifiers -->
 
         <module name="RedundantModifier"/>
 
         <!-- Naming -->
+        <!-- TODO should enforce naming eventually - a lot of edge cases - cc_, Outer$Inner, dasm redirect containers, etc. -->
 
-        <module name="ConstantName"/>
-        <!-- <module name="LambdaParameterName"/> TODO: fix later (p_XXXXXX_X_) -->
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName"/>
-        <module name="MethodName"/>
-        <module name="PackageName"/>
-        <!-- <module name="ParameterName"/> TODO: fix later (p_XXXXXX_X_) -->
-        <module name="StaticVariableName"/>
-        <module name="TypeName"/>
-
-        <!-- Whitespace -->
-
-        <module name="EmptyForInitializerPad"/>
-        <module name="EmptyForIteratorPad"/>
-        <!--
-        Can't match intellij settings, maybe use SuppressionXpathFilter to filter out interfaces?
-        <module name="EmptyLineSeparator">
-            <property name="allowNoEmptyLineBetweenFields" value="true"/>
+<!--        <module name="ConstantName"/>-->
+        <module name="LambdaParameterName">
+            <!-- For now we just prevent trailing underscores but allow `_`, to catch autogenerated parchment param names -->
+            <property name="format" value="^(?:_|.*[^_])$"/>
         </module>
-        -->
-        <module name="GenericWhitespace"/>
-        <module name="NoLineWrap"/>
-        <module name="NoWhitespaceAfter">
-            <property name="tokens" value="AT, INC, DEC, UNARY_MINUS, UNARY_PLUS, BNOT, LNOT, DOT, ARRAY_DECLARATOR, INDEX_OP"/> <!-- defaults except array init -->
-        </module>
-        <module name="NoWhitespaceBefore"/>
-        <!-- <module name="OperatorWrap"/> TODO: consider enforcing newline before operators when wrapping lines -->
-        <module name="ParenPad"/>
-        <!-- <module name="SeparatorWrap"/> TODO: consider enforcing specific rules for wrapping on separators -->
-        <module name="SingleSpaceSeparator"/>
-        <module name="TypecastParenPad"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="allowEmptyLambdas" value="true"/>
-            <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN,
-                BOR, BOR_ASSIGN, BSR, BSR_ASSIGN,
-                BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
-                DO_WHILE, EQUAL, GE, GT, LAMBDA, LAND, LCURLY,
-                LE, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE,
-                LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
-                LITERAL_RETURN, LITERAL_SWITCH, LITERAL_TRY,
-                LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN,
-                MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN,
-                QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR,
-                SR_ASSIGN, STAR, STAR_ASSIGN, LITERAL_ASSERT,
-                TYPE_EXTENSION_AND"/> <!-- defaults except syncuronized -->
+<!--        <module name="LocalFinalVariableName"/>-->
+<!--        <module name="LocalVariableName"/>-->
+<!--        <module name="MemberName"/>-->
+<!--        <module name="MethodName"/>-->
+        <module name="PackageName"/>
+        <module name="ParameterName">
+            <!-- For now we just prevent trailing underscores but allow `_`, to catch autogenerated parchment param names -->
+            <property name="format" value="^(?:_|.*[^_])$"/>
         </module>
+<!--        <module name="StaticVariableName"/>-->
+<!--        <module name="TypeName"/>-->
     </module>
 
     <module name="SuppressionFilter">
diff --git a/config/checkstyle/suppressions.xml b/config/checkstyle/suppressions.xml
index 7d3016f6..f7a0498d 100644
--- a/config/checkstyle/suppressions.xml
+++ b/config/checkstyle/suppressions.xml
@@ -8,38 +8,31 @@
     <!-- suppress for time measurement code -->
     <suppress checks="InnerAssignment" files="DebugVisualization.java|Int3HashSet.java"/>
     <!-- class transformers will often repeat the same class name string literal -->
-    <suppress checks="MultipleStringLiterals" files=".*Transformer\.java|SavedTickAccess|CubeTaskPriorityQueueSorter"/>
-    <!-- implementations of ChunkAccess, getHeight for heightmap and world height are semantically not overloads but have the same name -->
-    <suppress checks="OverloadMethodsDeclarationOrder"
-              files="SectionSizeCubeAccessWrapper.java|LevelCube.java|ProtoCube.java|ImposterProtoCube.java|NoiseAndSurfaceBuilderHelper.java|CubeWorldGenRegion.java"/>
+    <suppress checks="MultipleStringLiterals" files=".*Transformer\.java"/>
     <!-- mixins may have multiple inject methods with the same name, it's better to group them by their functionality -->
     <suppress checks="OverloadMethodsDeclarationOrder" files=".*Mixin.*\.java"/>
     <!-- TODO: DebugVulkan doesn't work yet anyway, and this requires some refactoring -->
     <suppress checks="CyclomaticComplexity" files="DebugVulkan.java"/>
     <!-- nested loops for iterating over cubes and chunks -->
     <suppress checks="CyclomaticComplexity" files="CloPos.java"/>
-    <!-- Mixins don't count for now until ASM is done -->
-    <suppress checks="CyclomaticComplexity" files=".*Mixin.*\.java"/>
-    <!-- we are not fixing setBlockState -->
-    <suppress checks="CyclomaticComplexity" files="LevelCube.java|ProtoCube.java"/>
     <!-- TODO: These probably need refactoring -->
-    <suppress checks="CyclomaticComplexity" files="CubicLevelLoadingScreen.java|CubeSerializer.java|DebugVisualization.java|SurfaceTrackerNodesTest.java|HeightmapStorageTest.java"/>
-    <!-- TODO: DebugVulkan doesn't work yet anyway, and this requires some refactoring -->
-    <suppress checks="NPathComplexity" files="DebugVulkan.java"/>
-    <!-- Mixins don't count for now until ASM is done -->
-    <suppress checks="NPathComplexity" files=".*Mixin.*\.java"/>
-    <!-- TODO These need refactoring -->
-    <suppress checks="NPathComplexity" files="LevelCube.java|ProtoCube.java|CubeSerializer.java"/>
+    <suppress checks="CyclomaticComplexity" files="SurfaceTrackerNodesTest.java|HeightmapStorageTest.java"/>
     <!-- Mixins need shadows and sometimes may want soft implements with special characters in prefix -->
     <suppress checks="MemberName" files=".*Mixin.*\.java|.*Access.*\.java"/>
     <suppress checks="MethodName" files=".*Mixin.*\.java|.*Access.*\.java"/>
     <suppress checks="StaticVariableName" files=".*Mixin.*\.java"/>
     <!-- Mixins may have an underscore to separate target from functionality -->
     <suppress checks="TypeName" files=".*Mixin.*\.java"/>
-    <suppress checks="DeclarationOrder" files="MixinNaturalSpawner.java|Int3HashSet.java|MixinDistanceManager.java|CubicDistanceManager.java"/>
+    <suppress checks="DeclarationOrder" files="Int3HashSet.java"/>
     <suppress checks="HiddenField" files="Int3HashSet.java"/>
     <suppress checks="NoFinalizer" files="Int3HashSet.java"/>
     <suppress checks="EmptyForIteratorPad" files="Int3HashSet.java|Int3HashSetTest.java"/>
     <suppress checks="ModifiedControlVariable" files="Int3HashSetTest.java"/>
-    <suppress checks="StaticVariableName" files="CubeTaskPriorityQueue.java"/>
+
+    <!-- Be less strict in tests -->
+    <suppress checks="MagicNumber" files=".*src/test/.*"/>
+    <suppress checks="InnerTypeLast" files=".*src/test/.*"/>
+    <!-- TODO suppressing complexity checks in tests probably still isn't ideal -->
+    <suppress checks="CyclomaticComplexity" files=".*src/test/.*"/>
+    <suppress checks="JavaNCSS" files=".*src/test/.*"/>
 </suppressions>
\ No newline at end of file
diff --git a/config/eclipse_formatter.xml b/config/eclipse_formatter.xml
new file mode 100644
index 00000000..32cc5c17
--- /dev/null
+++ b/config/eclipse_formatter.xml
@@ -0,0 +1,404 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<profiles version="23">
+    <profile kind="CodeFormatterProfile" name="CubicChunks" version="23">
+        <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="true"/>
+        <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="false"/>
+        <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_if_empty"/>
+        <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_if_empty"/>
+        <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_if_empty"/>
+        <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="end_of_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="false"/>
+        <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="true"/>
+        <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="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
+        <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_if_empty"/>
+        <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.insert_space_before_comma_in_permitted_types" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_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="end_of_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="false"/>
+        <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="separate_lines_if_wrapped"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <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="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not 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="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="do not 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.alignment_for_permitted_types_in_type_declaration" value="16"/>
+        <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.comment.javadoc_do_not_separate_block_tags" value="false"/>
+        <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="end_of_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="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="true"/>
+        <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.brace_position_for_block_in_case_after_arrow" value="end_of_line"/>
+        <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="false"/>
+        <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="separate_lines_if_wrapped"/>
+        <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.keep_switch_body_block_on_one_line" value="one_line_if_empty"/>
+        <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="end_of_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.alignment_for_expressions_in_switch_case_with_arrow" value="16"/>
+        <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="150"/>
+        <setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_if_empty"/>
+        <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_if_empty"/>
+        <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="end_of_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_if_empty"/>
+        <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_if_empty"/>
+        <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="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_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="do not 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="true"/>
+        <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="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_arrows_in_switch_on_columns" value="false"/>
+        <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="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_if_empty"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="16"/>
+        <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="end_of_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="true"/>
+        <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.join_line_comments" value="false"/>
+        <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_if_empty"/>
+        <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="1"/>
+        <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="end_of_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.alignment_for_switch_case_with_arrow" value="20"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_if_empty"/>
+        <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_if_empty"/>
+        <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="16"/>
+        <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="true"/>
+        <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_after_comma_in_permitted_types" value="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_if_empty"/>
+        <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="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_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="0"/>
+        <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="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="150"/>
+        <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>

From 1fae42a2850263273a3b6072c88d06b979d6d41e Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Sun, 15 Jun 2025 19:39:50 +1200
Subject: [PATCH 2/6] update README

---
 README.md | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 68673a9d..8a0fe062 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 ## Not yet usable or functional, don't try.
 
-Rewrite of the previous rewrite, targeting NeoForge/MC 1.20.4. 
+Rewrite of the previous rewrite, targeting NeoForge/MC 1.21.5. 
 
 This Minecraft mod extends Minecraft height and depth to be nearly infinite (at least a million blocks).
 
@@ -10,7 +10,7 @@ For the most up-to-date information about this mod and its related mods, as well
 
 ### Cubic Chunks (CC) - Links:
 
-Github - [Cubic Chunks - 1.20.4 and above](https://github.com/OpenCubicChunks/CubicChunks3)  
+Github - [Cubic Chunks - 1.21.5 and above](https://github.com/OpenCubicChunks/CubicChunks3)  
 Github - [Cubic Chunks - 1.12.2 and lower](https://github.com/OpenCubicChunks/CubicChunks)
 
 ### Cloning the repository
@@ -37,12 +37,6 @@ Configure commits to be ignored for git blame:
 git config blame.ignoreRevsFile .git-blame-ignore-revs
 ```
 
-### Running the game
-
-If running with IntelliJ, ensure that `io.github.opencubicchunks.[folder name].main` is selected, not `[folder name].main`:
-
-![image](https://github.com/OpenCubicChunks/CubicChunks2/assets/18627001/0d88d6b5-0944-44f1-9461-fc90daef5766)
-
 ### Contributing
 
 #### PR Guidelines
@@ -55,11 +49,12 @@ If running with IntelliJ, ensure that `io.github.opencubicchunks.[folder name].m
 	- If a mixin is "untestable" its test class should have a comment explaining *why* it's untestable. 
 		- Optionally a to-do (project task? issue?) suggesting integration tests when possible.
 	- All non-trivial mixins _**must**_ have a comment explaining their purpose.
-	- _**Must**_ pass checkstyle.
-	- _**Must**_ build.
-	- All tests _**must**_ pass (no regressions).
 	-  //todo Investigate code coverage for mixin tests ([jacoco?](https://docs.gradle.org/current/userguide/jacoco_plugin.html) [other link maybe it's bad](https://igorski.co/generating-junit-test-coverage-using-gradle-and-jacoco/)) .
 - Any non-mixin class _**must**_ have tests associated with it.
 	- The tests should reasonably cover all expected usage of the class (its external api).
 	- Any method(s) that can be reasonably unit tested _**must**_ be.
+- Anything annotated with `@SuppressWarnings` _**must**_ have either a TODO comment, or a comment explaining why the warning is suppressed.
+- _**Must**_ pass spotless check and checkstyle. Spotless formats automatically if you run `./gradlew spotlessApply`; checkstyle violations must be fixed manually.
+- _**Must**_ build.
+- All tests _**must**_ pass (no regressions).
 (TODO more contributing docs)

From e5920e747601b56619d649f3316b7561f804e616 Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Sun, 15 Jun 2025 19:53:11 +1200
Subject: [PATCH 3/6] apply spotless

---
 .../gradle/GeneratePackageInfo.java           |  17 +-
 .../opencubicchunks/gradle/McGitVersion.java  |  26 +-
 .../gradle/McGitVersionExtension.java         |   2 +-
 .../opencubicchunks/gradle/MixinAutoGen.java  |   2 +-
 .../gradle/MixinGenExtension.java             |  24 +-
 .../github/opencubicchunks/gradle/Utils.java  |   5 +-
 .../cubicchunks/CubicChunks.java              |   4 +-
 .../client/multiplayer/ClientCubeCache.java   |  35 ++-
 .../client/renderer/cube/RenderCube.java      |   2 +
 .../renderer/cube/RenderCubeRegion.java       |  24 +-
 .../cubicchunks/config/CommonConfig.java      |  11 +-
 .../cubicchunks/config/ServerConfig.java      |  80 +++---
 .../cubicchunks/mixin/ASMConfigPlugin.java    |  48 ++--
 .../client/SectionRenderDispatcherAccess.java |   3 +-
 .../mixin/access/client/ViewAreaAccess.java   |   4 +-
 .../mixin/access/common/ChunkMapAccess.java   |   3 +-
 .../access/common/DistanceManagerAccess.java  |   3 +-
 .../common/GenerationChunkHolderAccess.java   |   3 +-
 ...ctionOcclusionGraph$GraphEventsAccess.java |   3 +-
 .../multiplayer/MixinClientChunkCache.java    |  56 ++--
 .../MixinClientCubeCache$Storage.java         |   3 +-
 .../client/multiplayer/MixinClientLevel.java  |   1 -
 .../client/renderer/MixinLevelRenderer.java   |   3 +-
 ...xinSectionOcclusionGraph$GraphStorage.java |   6 +-
 .../renderer/MixinSectionOcclusionGraph.java  |  31 ++-
 .../core/client/renderer/MixinViewArea.java   |  20 +-
 .../chunk/MixinRenderRegionCache.java         |  24 +-
 ...SectionRenderDispatcher$RenderSection.java |  22 +-
 .../client/renderer/cube/MixinRenderCube.java |   3 +-
 .../cube/MixinRenderRegionCacheCubeInfo.java  |   3 +-
 .../core/common/core/MixinSectionPos.java     |   2 +
 .../MixinCCCommonHooks.java                   |   3 +-
 .../MixinCCEventHooks.java                    |   3 +-
 .../common/server/MixinMinecraftServer.java   |  26 +-
 .../level/MixinChunkGenerationTask.java       |  45 ++--
 .../common/server/level/MixinChunkHolder.java |  46 ++--
 .../level/MixinChunkMap$TrackedEntity.java    |  12 +-
 .../common/server/level/MixinChunkMap.java    | 248 +++++++++++-------
 .../level/MixinChunkTaskDispatcher.java       |   3 +-
 .../level/MixinChunkTaskPriorityQueue.java    |   3 +-
 .../server/level/MixinChunkTracker.java       |  48 ++--
 .../MixinCloTrackingView$Positioneed.java     |   3 +-
 .../server/level/MixinCloTrackingView.java    |   3 +-
 .../common/server/level/MixinCubeLevel.java   |   3 +-
 .../server/level/MixinDistanceManager.java    |  20 +-
 .../level/MixinGenerationChunkHolder.java     |  47 ++--
 .../server/level/MixinPlayerRespawnLogic.java |   3 +-
 .../level/MixinPlayerTicketTracker.java       |  14 +-
 .../server/level/MixinServerChunkCache.java   | 103 +++++---
 .../common/server/level/MixinServerLevel.java |  26 +-
 .../server/level/MixinServerPlayer.java       |   6 +-
 .../level/MixinSimulationChunkTracker.java    |   3 +-
 .../MixinLoggerChunkProgressListener.java     |   6 +-
 .../MixinProcessorChunkProgressListener.java  |   6 +-
 .../MixinStoringChunkProgressListener.java    |   6 +-
 .../network/MixinPlayerChunkSender.java       |  24 +-
 .../core/common/world/entity/MixinEntity.java |  15 +-
 .../world/level/MixinBlockCollisions.java     |  18 +-
 .../core/common/world/level/MixinCubePos.java |   9 +-
 .../core/common/world/level/MixinLevel.java   | 114 ++++----
 .../world/level/MixinLevelHeightAccessor.java |   2 +
 .../world/level/MixinTicketStorage.java       |  19 +-
 .../world/level/chunk/MixinChunkAccess.java   |   7 +-
 .../world/level/chunk/MixinChunkSource.java   |  10 +-
 .../world/level/chunk/MixinLevelChunk.java    |   3 +-
 .../world/level/chunk/MixinProtoChunk.java    |   3 +-
 .../chunk/status/MixinCCChunkStatusTasks.java |   3 +-
 .../chunk/status/MixinChunkStatusTasks.java   |  36 ++-
 .../chunk/storage/MixinChunkStorage.java      |  10 +-
 .../world/level/cube/MixinCubeAccess.java     |   3 +-
 .../world/level/cube/MixinEmptyLevelCube.java |   3 +-
 .../level/cube/MixinImposterProtoCube.java    |   3 +-
 ...ixinLevelCube$BoundTickingBlockEntity.java |   3 +-
 ...e$RebindableTickingBlockEntityWrapper.java |   3 +-
 .../world/level/cube/MixinLevelCube.java      |   8 +-
 .../world/level/cube/MixinProtoCube.java      |   6 +-
 .../cube/status/MixinCubePyramid$Builder.java |   3 +-
 .../level/cube/status/MixinCubePyramid.java   |   3 +-
 .../cube/status/MixinCubeStatusTasks.java     |   9 +-
 .../cube/status/MixinCubeStep$Builder.java    |   3 +-
 .../level/cube/status/MixinCubeStep.java      |   3 +-
 .../level/lighting/MixinLevelLightEngine.java |   7 +-
 .../dasmsets/ChunkInCubicContextSet.java      |   3 +-
 .../mixin/dasmsets/ChunkToCloSet.java         | 151 +++++------
 .../mixin/dasmsets/ChunkToCubeSet.java        | 117 ++++-----
 .../cubicchunks/mixin/dasmsets/ForgeSet.java  |   3 +-
 .../cubicchunks/mixin/dasmsets/GlobalSet.java |  28 +-
 .../CCCommonHooks.java                        |   1 -
 .../CCEventHooks.java                         |   5 +-
 .../CCClientboundForgetLevelCloPacket.java    |  11 +-
 .../CCClientboundLevelChunkPacket.java        |  14 +-
 .../CCClientboundLevelCubePacketData.java     |   6 +-
 ...CCClientboundLevelCubeWithLightPacket.java |  18 +-
 ...CCClientboundSetCubeCacheCenterPacket.java |  12 +-
 .../cubicchunks/network/CCNetworkHandler.java |  12 +-
 .../cubicchunks/package-info.java             |   2 +-
 .../cubicchunks/server/level/CloHolder.java   |   3 +-
 .../server/level/CloTrackingView.java         |  73 +++---
 .../cubicchunks/server/level/CubeLevel.java   |   9 +-
 .../server/level/ServerCubeCache.java         |   5 +-
 .../cubicchunks/util/StaticCache3D.java       |  10 +-
 .../cubicchunks/world/level/CubicLevel.java   |   1 +
 .../world/level/CubicLevelAccessor.java       |   3 +-
 .../world/level/CubicLevelReader.java         |   6 +-
 .../chunk/status/CCChunkStatusTasks.java      |  45 ++--
 .../world/level/chunklike/CloAccess.java      |   7 +-
 .../world/level/chunklike/LevelClo.java       |  27 +-
 .../world/level/chunklike/ProtoClo.java       |  22 +-
 .../world/level/cube/CubeAccess.java          | 205 ++++-----------
 .../world/level/cube/LevelCube.java           |  95 ++-----
 .../world/level/cube/ProtoCube.java           | 158 +++--------
 .../level/cube/status/CubeStatusTasks.java    |  52 ++--
 .../world/level/cube/status/CubeStep.java     |  23 +-
 .../level/IntegrationTestCubicChunkMap.java   | 107 +++-----
 .../level/IntegrationTestServerCubeCache.java |  83 +++---
 .../ClientChunkCache$StorageTestAccess.java   |   3 +-
 .../ClientChunkCacheTestAccess.java           |  13 +-
 .../server/level/ChunkMapTestAccess.java      |   6 +-
 .../server/level/ChunkTrackerTestAccess.java  |   6 +-
 .../GenerationChunkHolderTestAccess.java      |   3 +-
 .../cubicchunks/test/LongRunTest.java         |   3 +-
 .../multiplayer/TestClientCubeCache.java      |  19 +-
 .../renderer/cube/TestRenderCubeRegion.java   |  19 +-
 .../test/misc/TestVanillaCubicParity.java     | 188 +++++--------
 ...CCClientboundLevelCubeWithLightPacket.java |   4 +-
 .../test/server/TestMinecraftServer.java      |  28 +-
 .../server/level/TestCloGenerationTask.java   |   6 +-
 .../test/server/level/TestCloHolder.java      |   3 +-
 .../server/level/TestCloTrackingView.java     |  11 +-
 .../test/server/level/TestCubicChunkMap.java  |   3 +-
 .../server/level/TestCubicChunkTracker.java   |  83 +++---
 .../server/level/TestCubicClientLevel.java    |   4 +-
 .../level/TestCubicDistanceManager.java       | 117 +++++----
 .../server/level/TestCubicServerLevel.java    |  17 +-
 .../server/level/TestPlayerRespawnLogic.java  |   1 -
 .../test/world/entity/TestEntity.java         |  26 +-
 .../test/world/level/TestBlockCollisions.java |  32 ++-
 .../test/world/level/TestCubicLevel.java      | 114 ++++----
 .../world/level/TestCubicLevelReader.java     |  20 +-
 .../test/world/level/cube/TestCubeAccess.java |  21 +-
 .../test/world/level/cube/TestLevelCube.java  |  21 +-
 .../test/world/level/cube/TestProtoCube.java  |  20 +-
 .../testutils/CloseableReference.java         |  18 +-
 .../cubicchunks/testutils/Misc.java           |  36 +--
 144 files changed, 1815 insertions(+), 1836 deletions(-)

diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/GeneratePackageInfo.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/GeneratePackageInfo.java
index d2e58fe7..8576c5df 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/GeneratePackageInfo.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/GeneratePackageInfo.java
@@ -18,13 +18,13 @@ public class GeneratePackageInfo {
     public static void generateFiles(SourceSet sourceSet) throws IOException {
         Map<Path, Path> packages = getPackages(sourceSet.getAllJava());
         String code = """
-            @ParametersAreNonnullByDefault
-            @MethodsReturnNonnullByDefault
-            package __PACKAGE__;
-                        
-            import javax.annotation.ParametersAreNonnullByDefault;
-                        
-            import io.github.opencubicchunks.cc_core.annotation.MethodsReturnNonnullByDefault;""";
+                @ParametersAreNonnullByDefault
+                @MethodsReturnNonnullByDefault
+                package __PACKAGE__;
+
+                import javax.annotation.ParametersAreNonnullByDefault;
+
+                import io.github.opencubicchunks.cc_core.annotation.MethodsReturnNonnullByDefault;""";
         for (Path pkg : packages.keySet()) {
             Path absolutePath = packages.get(pkg);
             Path file = absolutePath.resolve("package-info.java");
@@ -45,7 +45,8 @@ private static Map<Path, Path> getPackages(SourceDirectorySet allJava) throws IO
         for (File it : allJava) {
             Path javaClass = it.getCanonicalFile().toPath();
             if (javaClass.toString().contains("mixin/test")) {
-                // junit will try to load package-info files (when scanning for tests) causing mixin to throw as classes in mixin packages must not be loaded.
+                // junit will try to load package-info files (when scanning for tests) causing mixin to throw as classes in mixin packages must not be
+                // loaded.
                 continue;
             }
             for (Path srcPath : srcPaths) {
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersion.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersion.java
index ca8fd117..8f13df70 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersion.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersion.java
@@ -85,8 +85,8 @@ private GitVersionInfo manualDescribe(Project project, Git git, Map<String, Stri
                 shortestVersion = version;
                 shortestCommit = commit;
             } else if (commitCount == shortest) {
-                project.getLogger().warn("Potentially ambiguous version detection: The same amount of commits since " +
-                        commit + "(version=" + version + ") as since " + shortestCommit + " (version=" + shortestVersion + ")");
+                project.getLogger().warn("Potentially ambiguous version detection: The same amount of commits since " + commit + "(version=" + version
+                        + ") as since " + shortestCommit + " (version=" + shortestVersion + ")");
             }
             revWalk.close();
         }
@@ -118,11 +118,7 @@ private String getGitBranch(Git git) throws IOException {
         if (branch.equals("HEAD")) {
             branch = firstNonEmpty(
                     () -> new RuntimeException("Found HEAD branch! This is most likely caused by detached head state! Will assume unknown version!"),
-                    System.getenv("TRAVIS_BRANCH"),
-                    System.getenv("GIT_BRANCH"),
-                    System.getenv("BRANCH_NAME"),
-                    System.getenv("GITHUB_HEAD_REF")
-            );
+                    System.getenv("TRAVIS_BRANCH"), System.getenv("GIT_BRANCH"), System.getenv("BRANCH_NAME"), System.getenv("GITHUB_HEAD_REF"));
         }
 
         if (branch.startsWith("origin/")) {
@@ -131,22 +127,20 @@ private String getGitBranch(Git git) throws IOException {
         return branch;
     }
 
-
     private String getModVersion(Project target, McGitVersionExtension extension, GitVersionInfo describe, String branch, boolean mvn) {
         String mcVersion = getMcVersion(extension);
         if (branch.startsWith("MC_")) {
             String branchMcVersion = branch.substring("MC_".length());
             if (!mcVersion.startsWith(branchMcVersion)) {
-                target.getLogger().warn("Branch version different than project MC version! MC version: " +
-                        mcVersion + ", branch: " + branch + ", branch version: " + branchMcVersion);
+                target.getLogger().warn("Branch version different than project MC version! MC version: " + mcVersion + ", branch: " + branch
+                        + ", branch version: " + branchMcVersion);
             }
         }
 
-        //branches "master" and "MC_something" are not appended to version string, everything else is
-        //only builds from "master" and "MC_version" branches will actually use the correct versioning
-        //but it allows to distinguish between builds from different branches even if version number is the same
-        String branchSuffix = (branch.equals("master") || branch.startsWith("MC_")) ? "" :
-                ("-" + branch.replaceAll("[^a-zA-Z0-9.-]", "_"));
+        // branches "master" and "MC_something" are not appended to version string, everything else is
+        // only builds from "master" and "MC_version" branches will actually use the correct versioning
+        // but it allows to distinguish between builds from different branches even if version number is the same
+        String branchSuffix = (branch.equals("master") || branch.startsWith("MC_")) ? "" : ("-" + branch.replaceAll("[^a-zA-Z0-9.-]", "_"));
         String versionSuffix = extension.getVersionSuffix();
         String modAndApiVersion = describe.baseVersion;
 
@@ -200,4 +194,4 @@ public GitVersionInfo(String baseVersion, int commitsSinceBase) {
             this.commitsSinceBase = commitsSinceBase;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersionExtension.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersionExtension.java
index 95041a40..c0999eb6 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersionExtension.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/McGitVersionExtension.java
@@ -55,4 +55,4 @@ public void setForceVersionString(String forceVersionString) {
         this.configured = true;
         this.forceVersionString = forceVersionString;
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinAutoGen.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinAutoGen.java
index 20b656cb..e9f59e1d 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinAutoGen.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinAutoGen.java
@@ -26,4 +26,4 @@ public class MixinAutoGen implements Plugin<Project> {
             }
         });
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinGenExtension.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinGenExtension.java
index cfcd3c45..1edef22c 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinGenExtension.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/MixinGenExtension.java
@@ -1,6 +1,5 @@
 package io.github.opencubicchunks.gradle;
 
-
 import static java.nio.file.StandardOpenOption.CREATE;
 import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
 import static org.apache.tools.ant.util.StringUtils.removePrefix;
@@ -28,7 +27,8 @@
 import org.gradle.api.tasks.SourceSet;
 
 // Note: this intentionally only contains the parts that I actually use
-@SuppressWarnings("unused") public class MixinGenExtension {
+@SuppressWarnings("unused")
+public class MixinGenExtension {
 
     private final Map<SourceSet, Map<String, Action<MixinConfig>>> configsBySourceSet = new HashMap<>();
 
@@ -39,8 +39,7 @@
     private String defaultCompatibilityLevel;
     private String defaultMinVersion;
 
-    MixinGenExtension() {
-    }
+    MixinGenExtension() {}
 
     public void setFilePattern(String pattern) {
         this.filePattern = pattern;
@@ -253,7 +252,8 @@ void generateFiles(JavaPluginConvention convention) throws IOException {
         });
     }
 
-    private void writeMixins(JavaPluginConvention convention, SourceSet sourceSet, String name, MixinConfig config, JsonWriter writer) throws IOException {
+    private void writeMixins(JavaPluginConvention convention, SourceSet sourceSet, String name, MixinConfig config, JsonWriter writer)
+            throws IOException {
         Set<Path> classes = getMixinClasses(config, sourceSet.getAllJava());
 
         Set<Path> commonSet = new HashSet<>();
@@ -272,12 +272,14 @@ private void writeMixins(JavaPluginConvention convention, SourceSet sourceSet, S
                 commonSet.add(relative);
             }
         }
-        Function<Path, String> transform = path ->
-            removeSuffix(removePrefix(path.toString().replace(File.separatorChar, '.'), name + "."), ".java");
+        Function<Path, String> transform = path -> removeSuffix(removePrefix(path.toString().replace(File.separatorChar, '.'), name + "."), ".java");
 
-        List<String> common = commonSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT))).collect(Collectors.toList());
-        List<String> client = clientSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT))).collect(Collectors.toList());
-        List<String> server = serverSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT))).collect(Collectors.toList());
+        List<String> common = commonSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT)))
+                .collect(Collectors.toList());
+        List<String> client = clientSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT)))
+                .collect(Collectors.toList());
+        List<String> server = serverSet.stream().map(transform).sorted(Comparator.comparing(a -> a.toLowerCase(Locale.ROOT)))
+                .collect(Collectors.toList());
 
         writer.name("mixins").beginArray();
         for (String path : common) {
@@ -323,4 +325,4 @@ private Set<Path> getMixinClasses(MixinConfig config, SourceDirectorySet allJava
         }
         return classes;
     }
-}
\ No newline at end of file
+}
diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/Utils.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/Utils.java
index 8a7b1dbb..bb69035f 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/Utils.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/Utils.java
@@ -7,7 +7,8 @@
 
 public class Utils {
 
-    @Nonnull public static JavaPluginConvention getJavaPluginConvention(@Nonnull Project target) {
+    @Nonnull
+    public static JavaPluginConvention getJavaPluginConvention(@Nonnull Project target) {
         JavaPluginConvention convention = target.getConvention().findByType(JavaPluginConvention.class);
         if (convention == null) {
             convention = target.getConvention().findPlugin(JavaPluginConvention.class);
@@ -17,4 +18,4 @@ public class Utils {
         }
         return convention;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
index 28244688..edae4d38 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
@@ -29,7 +29,7 @@ public class CubicChunks extends CubicChunksBase {
     public CubicChunks(IEventBus modEventBus) {
         ChunkMap.class.getName();
         // if (!(CubeMap.class.isAssignableFrom(ChunkMap.class))) {
-        //     throw new IllegalStateException("Mixin not applied!");
+        // throw new IllegalStateException("Mixin not applied!");
         // }
         EarlyConfig.getDiameterInSections();
 
@@ -57,4 +57,4 @@ public static CommonConfig config() {
         }
         return config;
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
index 72a8d7d7..2c39baaf 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
@@ -12,7 +12,6 @@
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
 import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
-import io.github.notstirred.dasm.api.annotations.transform.Visibility;
 import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.api.CubicConstants;
 import io.github.opencubicchunks.cc_core.utils.Coords;
@@ -23,28 +22,22 @@
 import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.SectionPos;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.Heightmap;
 
 public interface ClientCubeCache extends CubeSource {
-    // TODO (P2) we might want a version of the vanilla replaceWithPacketData with a different signature for handling chunks, since we only need heightmap data with CC
+    // TODO (P2) we might want a version of the vanilla replaceWithPacketData with a different signature for handling chunks, since we only need
+    // heightmap data with CC
 
     void cc_drop(CubePos chunkPos);
 
     void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer);
 
     @Nullable LevelCube cc_replaceWithPacketData(
-        int x,
-        int y,
-        int z,
-        FriendlyByteBuf buffer,
-        Map<Heightmap.Types, long[]> map,
-        Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> consumer
+            int x, int y, int z, FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map,
+            Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> consumer
     );
 
     void cc_updateViewCenter(int x, int y, int z);
@@ -74,7 +67,8 @@ public Storage(int chunkRadius, ClientLevel clientLevel) {
         }
 
         public int getIndex(int x, int y, int z) {
-            return Math.floorMod(z, this.viewRange) * this.viewRange * this.viewRange + Math.floorMod(y, this.viewRange) * this.viewRange + Math.floorMod(x, this.viewRange);
+            return Math.floorMod(z, this.viewRange) * this.viewRange * this.viewRange + Math.floorMod(y, this.viewRange) * this.viewRange
+                    + Math.floorMod(x, this.viewRange);
         }
 
         public void replace(int chunkIndex, @Nullable LevelCube chunk) {
@@ -116,7 +110,8 @@ public void dropEmptySections(LevelCube chunk) {
             for (int dx = 0; dx < CubicConstants.DIAMETER_IN_SECTIONS; dx++) {
                 for (int dy = 0; dy < CubicConstants.DIAMETER_IN_SECTIONS; dy++) {
                     for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
-                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy), Coords.cubeToSection(cubePos.getZ(), dz));
+                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy),
+                                Coords.cubeToSection(cubePos.getZ(), dz));
                         this.loadedEmptySections.remove(sectionPosLong);
                     }
                 }
@@ -131,7 +126,8 @@ public void addEmptySections(LevelCube chunk) {
                 for (int dy = 0; dy < CubicConstants.DIAMETER_IN_SECTIONS; dy++) {
                     for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
                         var chunkSection = chunkSections[Coords.sectionToIndex(dx, dy, dz)];
-                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy), Coords.cubeToSection(cubePos.getZ(), dz));
+                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy),
+                                Coords.cubeToSection(cubePos.getZ(), dz));
                         if (chunkSection.hasOnlyAir()) {
                             this.loadedEmptySections.add(sectionPosLong);
                         }
@@ -148,7 +144,8 @@ public void refreshEmptySections(LevelCube chunk) {
                 for (int dy = 0; dy < CubicConstants.DIAMETER_IN_SECTIONS; dy++) {
                     for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
                         var chunkSection = chunkSections[Coords.sectionToIndex(dx, dy, dz)];
-                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy), Coords.cubeToSection(cubePos.getZ(), dz));
+                        long sectionPosLong = SectionPos.asLong(Coords.cubeToSection(cubePos.getX(), dx), Coords.cubeToSection(cubePos.getY(), dy),
+                                Coords.cubeToSection(cubePos.getZ(), dz));
                         if (chunkSection.hasOnlyAir()) {
                             this.loadedEmptySections.add(sectionPosLong);
                         } else if (this.loadedEmptySections.remove(sectionPosLong)) {
@@ -160,13 +157,11 @@ public void refreshEmptySections(LevelCube chunk) {
         }
 
         public boolean inRange(int x, int y, int z) {
-            return Math.abs(x - this.viewCenterX) <= this.cubeRadius
-                && Math.abs(y - this.viewCenterY) <= this.cubeRadius
-                && Math.abs(z - this.viewCenterZ) <= this.cubeRadius;
+            return Math.abs(x - this.viewCenterX) <= this.cubeRadius && Math.abs(y - this.viewCenterY) <= this.cubeRadius
+                    && Math.abs(z - this.viewCenterZ) <= this.cubeRadius;
         }
 
-        @Nullable
-        @TransformFromMethod(owner = @Ref(ClientChunkCache.Storage.class), value = @MethodSig("getChunk(I)Lnet/minecraft/world/level/chunk/LevelChunk;"), visibility = PUBLIC)
+        @Nullable @TransformFromMethod(owner = @Ref(ClientChunkCache.Storage.class), value = @MethodSig("getChunk(I)Lnet/minecraft/world/level/chunk/LevelChunk;"), visibility = PUBLIC)
         public native LevelCube getChunk(int chunkIndex);
 
         public void dumpChunks(String filePath) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCube.java
index 16d8babd..c7dfd5b4 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCube.java
@@ -22,7 +22,9 @@ public class RenderCube {
     public RenderCube(LevelCube wrapped) {
         throw new DasmFailedToApply();
     }
+
     public native BlockEntity getBlockEntity(BlockPos pos);
+
     // This method is modified with mixin
     public native BlockState getBlockState(BlockPos pos);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
index 14f654bb..39f93754 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
@@ -13,8 +13,10 @@
 import net.minecraft.world.level.material.FluidState;
 
 /**
- * The vanilla {@link RenderChunkRegion} stores a 3x3 of {@link RenderChunk}s and is used to get data for rendering a single {@link LevelChunkSection} in the center of the 3x3.
- * Similarly, {@code RenderCubeRegion} stores a 3x3x3 of {@link RenderCube}s and is used to get data for rendering a single {@link LevelChunkSection} in the center of the 3x3x3.
+ * The vanilla {@link RenderChunkRegion} stores a 3x3 of {@link RenderChunk}s and is used to get data for rendering a single {@link LevelChunkSection}
+ * in the center of the 3x3.
+ * Similarly, {@code RenderCubeRegion} stores a 3x3x3 of {@link RenderCube}s and is used to get data for rendering a single {@link LevelChunkSection}
+ * in the center of the 3x3x3.
  */
 public class RenderCubeRegion extends RenderChunkRegion {
     private final int minCubeX;
@@ -22,7 +24,10 @@ public class RenderCubeRegion extends RenderChunkRegion {
     private final int minCubeZ;
     protected final RenderCube[] cubes;
 
-    public RenderCubeRegion(Level level, int minCubeX, int minCubeY, int minCubeZ, RenderCube[] cubes, @Nullable it.unimi.dsi.fastutil.longs.Long2ObjectFunction<net.neoforged.neoforge.model.data.ModelData> modelDataSnapshot) {
+    public RenderCubeRegion(
+            Level level, int minCubeX, int minCubeY, int minCubeZ, RenderCube[] cubes,
+            @Nullable it.unimi.dsi.fastutil.longs.Long2ObjectFunction<net.neoforged.neoforge.model.data.ModelData> modelDataSnapshot
+    ) {
         super(level, 0, 0, null);
         // TODO set modelDataManager on parent - requires an accessor mixin since we can't AT the NF constructor or field
         this.minCubeX = minCubeX;
@@ -31,19 +36,16 @@ public RenderCubeRegion(Level level, int minCubeX, int minCubeY, int minCubeZ, R
         this.cubes = cubes;
     }
 
-    @Override
-    public BlockState getBlockState(BlockPos pos) {
+    @Override public BlockState getBlockState(BlockPos pos) {
         return this.getCube(Coords.blockToCube(pos.getX()), Coords.blockToCube(pos.getY()), Coords.blockToCube(pos.getZ())).getBlockState(pos);
     }
 
-    @Override
-    public FluidState getFluidState(BlockPos pos) {
-        return this.getCube(Coords.blockToCube(pos.getX()), Coords.blockToCube(pos.getY()), Coords.blockToCube(pos.getZ())).getBlockState(pos).getFluidState();
+    @Override public FluidState getFluidState(BlockPos pos) {
+        return this.getCube(Coords.blockToCube(pos.getX()), Coords.blockToCube(pos.getY()), Coords.blockToCube(pos.getZ())).getBlockState(pos)
+                .getFluidState();
     }
 
-    @Nullable
-    @Override
-    public BlockEntity getBlockEntity(BlockPos pos) {
+    @Nullable @Override public BlockEntity getBlockEntity(BlockPos pos) {
         return this.getCube(Coords.blockToCube(pos.getX()), Coords.blockToCube(pos.getY()), Coords.blockToCube(pos.getZ())).getBlockEntity(pos);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java b/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
index 64fb3e6b..62dde8e5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
@@ -29,12 +29,13 @@ private static CommentedConfig createDefaultConfig() {
         config.set(KEY_VERTICAL_VIEW_DISTANCE, 8);
         // TODO more detailed config comment?
         config.setComment(KEY_VERTICAL_VIEW_DISTANCE, """
- The vertical view distance for players in Cubic Chunks dimensions (similar to vanilla render distance for the horizontal axes).\
-""");
+                 The vertical view distance for players in Cubic Chunks dimensions (similar to vanilla render distance for the horizontal axes).\
+                """);
         config.set(KEY_GENERATE_NEW_WORLDS_AS_CC, true);
-        config.setComment(KEY_GENERATE_NEW_WORLDS_AS_CC, """
- Whether or not newly-created worlds generate using Cubic Chunks. (On the client, this is toggled by the button in the world creation GUI.)\
-""");
+        config.setComment(KEY_GENERATE_NEW_WORLDS_AS_CC,
+                """
+                         Whether or not newly-created worlds generate using Cubic Chunks. (On the client, this is toggled by the button in the world creation GUI.)\
+                        """);
         return config;
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
index fd4f1ea2..4e5a9377 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
@@ -36,7 +36,8 @@ private ServerConfig(CommentedConfig config) {
     }
 
     private static WorldStyle worldStyleFromString(String string) {
-        if (string.equals("VANILLA")) return WorldStyle.CHUNK;
+        if (string.equals("VANILLA"))
+            return WorldStyle.CHUNK;
         return WorldStyle.valueOf(string);
     }
 
@@ -45,27 +46,29 @@ public WorldStyle getWorldStyle(ResourceKey<Level> dimension) {
     }
 
     private static CommentedConfig createDefaultConfig() {
-        // TODO some way of setting different defaults for specific modids? e.g. for things like RFTools and Mystcraft - maybe things like "mystcraft:*"
+        // TODO some way of setting different defaults for specific modids? e.g. for things like RFTools and Mystcraft - maybe things like
+        // "mystcraft:*"
         Config.setInsertionOrderPreserved(true);
         var config = CommentedConfig.inMemory();
         config.set(KEY_DEFAULT_WORLD_STYLE, WorldStyle.CUBIC);
-        config.setComment(KEY_DEFAULT_WORLD_STYLE, """
- The default world style used for dimensions that are not explicitly defined in one of the three lists below.
- Possible values:
-     "CUBIC" - the dimension uses cubic chunks.
-     "HYBRID" - the dimension has cubic chunks enabled, but uses vanilla world generation. This may improve mod compatibility in some cases.
-     "VANILLA" - the dimension does NOT use cubic chunks; it behaves the same as in vanilla, with limited height, etc.\
-""");
+        config.setComment(KEY_DEFAULT_WORLD_STYLE,
+                """
+                         The default world style used for dimensions that are not explicitly defined in one of the three lists below.
+                         Possible values:
+                             "CUBIC" - the dimension uses cubic chunks.
+                             "HYBRID" - the dimension has cubic chunks enabled, but uses vanilla world generation. This may improve mod compatibility in some cases.
+                             "VANILLA" - the dimension does NOT use cubic chunks; it behaves the same as in vanilla, with limited height, etc.\
+                        """);
         config.set(KEY_CUBIC_DIMENSIONS, List.of());
         config.set(KEY_HYBRID_DIMENSIONS, List.of());
         config.set(KEY_CHUNK_DIMENSIONS, List.of(Level.END.location().toString()));
         config.setComment(KEY_CUBIC_DIMENSIONS, """
- Explicitly sets the world style for each dimension. Overrides the default in defaultWorldStyle.
- Note that this only affects dimensions that have not yet been generated.
- If you want to change the world style of an existing dimension, you will need to delete it manually to make it regenerate.
+                 Explicitly sets the world style for each dimension. Overrides the default in defaultWorldStyle.
+                 Note that this only affects dimensions that have not yet been generated.
+                 If you want to change the world style of an existing dimension, you will need to delete it manually to make it regenerate.
 
- By default, the only dimension listed here is the End, which is set to Vanilla so that you don't fall forever if you fall off.\
-""");
+                 By default, the only dimension listed here is the End, which is set to Vanilla so that you don't fall forever if you fall off.\
+                """);
         return config;
     }
 
@@ -75,31 +78,32 @@ private static File getConfigPath(Path worldFolder) {
 
     private static void createConfig(Path worldFolder) {
         File configPath = getConfigPath(worldFolder);
-        if (configPath.exists()) return;
+        if (configPath.exists())
+            return;
         configPath.getParentFile().mkdirs();
         write(configPath, createDefaultConfig());
     }
-/*
-    @Nullable public static ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
-        File configPath = getConfigPath(((LevelStorageAccessAccess) levelStorageAccess).getLevelPath());
-        if (configPath.exists()) {
-            var config = createDefaultConfig();
-            read(configPath, config);
-            var serverConfig = new ServerConfig(config);
-            // Write the config again in case any keys were missing or invalid
-            write(configPath, config);
-            return serverConfig;
-        }
-        return null;
-    }
-
-    public static void generateConfigIfNecessary(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
-        if (CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
-            CubicChunks.LOGGER.info("New worlds are configured to generate as CC; creating CC config file");
-            var rootFolderPath = ((LevelStorageAccessAccess) levelStorageAccess).getLevelPath();
-            ServerConfig.createConfig(rootFolderPath);
-        } else {
-            CubicChunks.LOGGER.info("New worlds are configured to NOT generate as CC; no Cubic Chunks data will be created");
-        }
-    }*/
+    /*
+     * @Nullable public static ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
+     * File configPath = getConfigPath(((LevelStorageAccessAccess) levelStorageAccess).getLevelPath());
+     * if (configPath.exists()) {
+     * var config = createDefaultConfig();
+     * read(configPath, config);
+     * var serverConfig = new ServerConfig(config);
+     * // Write the config again in case any keys were missing or invalid
+     * write(configPath, config);
+     * return serverConfig;
+     * }
+     * return null;
+     * }
+     * public static void generateConfigIfNecessary(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
+     * if (CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
+     * CubicChunks.LOGGER.info("New worlds are configured to generate as CC; creating CC config file");
+     * var rootFolderPath = ((LevelStorageAccessAccess) levelStorageAccess).getLevelPath();
+     * ServerConfig.createConfig(rootFolderPath);
+     * } else {
+     * CubicChunks.LOGGER.info("New worlds are configured to NOT generate as CC; no Cubic Chunks data will be created");
+     * }
+     * }
+     */
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
index 4475c92b..22829eca 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
@@ -61,8 +61,7 @@ public ASMConfigPlugin() {
         boolean developmentEnvironment = false;
         try {
             developmentEnvironment = !FMLEnvironment.production;
-        } catch (Throwable ignored) {
-        }
+        } catch (Throwable ignored) {}
         MappingsProvider mappings = MappingsProvider.IDENTITY;
 
         // TODO: breaks on fabric (remapped at runtime)
@@ -77,8 +76,7 @@ public ASMConfigPlugin() {
         this.annotationParser = new AnnotationParser(classProvider);
     }
 
-    @Override public void onLoad(String mixinPackage) {
-    }
+    @Override public void onLoad(String mixinPackage) {}
 
     @Override public String getRefMapperConfig() {
         return null;
@@ -97,12 +95,11 @@ public ASMConfigPlugin() {
             var classTransform = handleError(this.annotationParser.buildContext().buildClassTarget(targetClass));
             var methodTransformsTarget = handleError(this.annotationParser.buildContext().buildMethodTargets(targetClass, "cc_dasm$"));
 
-            var methodTransforms = Stream.of(methodTransformsTarget, methodTransformsMixin)
-                .filter(Optional::isPresent).map(Optional::get)
-                .flatMap(Collection::stream).toList();
+            var methodTransforms = Stream.of(methodTransformsTarget, methodTransformsMixin).filter(Optional::isPresent).map(Optional::get)
+                    .flatMap(Collection::stream).toList();
 
             String key = mixinClassName + "|" + targetClassName;
-            if (classTransform.isPresent())  {
+            if (classTransform.isPresent()) {
                 // TODO: nice error
                 assert methodTransformsMixin.isEmpty() && methodTransforms.isEmpty() : "Whole class transform WITH method transforms?";
                 ClassTransform transform = classTransform.get();
@@ -112,8 +109,10 @@ public ASMConfigPlugin() {
                     this.postApplyTargets.put(key, Either.left(transform));
                 }
             } else {
-                Collection<MethodTransform> preTransforms = this.preApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right().get();
-                Collection<MethodTransform> postTransforms = this.postApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right().get();
+                Collection<MethodTransform> preTransforms = this.preApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right()
+                        .get();
+                Collection<MethodTransform> postTransforms = this.postApplyTargets.computeIfAbsent(key, k -> Either.right(new ArrayList<>())).right()
+                        .get();
                 methodTransforms.forEach(transform -> {
                     if (transform.stage() == ApplicationStage.PRE_APPLY) {
                         preTransforms.add(transform);
@@ -132,10 +131,9 @@ public ASMConfigPlugin() {
         return true;
     }
 
-    @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) { }
+    @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
 
-    @Nullable
-    @Override public List<String> getMixins() {
+    @Nullable @Override public List<String> getMixins() {
         return null;
     }
 
@@ -150,7 +148,8 @@ public ASMConfigPlugin() {
 
         try {
             // ugly hack to add class metadata to mixin
-            // based on https://github.com/Chocohead/OptiFabric/blob/54fc2ef7533e43d1982e14bc3302bcf156f590d8/src/main/java/me/modmuss50/optifabric/compat/fabricrendererapi
+            // based on
+            // https://github.com/Chocohead/OptiFabric/blob/54fc2ef7533e43d1982e14bc3302bcf156f590d8/src/main/java/me/modmuss50/optifabric/compat/fabricrendererapi
             // /RendererMixinPlugin.java#L25:L44
             Method addMethod = ClassInfo.class.getDeclaredMethod("addMethod", MethodNode.class, boolean.class);
             addMethod.setAccessible(true);
@@ -182,17 +181,17 @@ public ASMConfigPlugin() {
             return;
 
         // Find all DASM-added method nodes and their corresponding MixinMerged method nodes
-        record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod) { }
+        record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod) {}
         List<PrefixMethodPair> methodPairs = new ArrayList<>();
         for (MethodNode methodNode : targetClass.methods) {
             if (methodNode.name.contains("cc_dasm$")) {
                 var methodNameWithoutPrefix = methodNode.name.substring(methodNode.name.indexOf("$") + 1);
                 var mixinAddedMethod = targetClass.methods.stream()
-                    .filter(m -> m.name.equals(methodNameWithoutPrefix) && m.desc.equals(methodNode.desc))
-                    .findFirst();
+                        .filter(m -> m.name.equals(methodNameWithoutPrefix) && m.desc.equals(methodNode.desc)).findFirst();
 
                 if (mixinAddedMethod.isEmpty()) {
-                    CubicChunks.LOGGER.info(String.format("Found DASM added method `%s` without a corresponding MixinMerged method", methodNameWithoutPrefix));
+                    CubicChunks.LOGGER
+                            .info(String.format("Found DASM added method `%s` without a corresponding MixinMerged method", methodNameWithoutPrefix));
                 }
                 methodPairs.add(new PrefixMethodPair(methodNode, mixinAddedMethod.orElse(null)));
             }
@@ -210,9 +209,8 @@ record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod)
                 prefixMethodPair.dasmAddedMethod.access |= (ACC_PUBLIC | ACC_PRIVATE | ACC_PROTECTED) & prefixMethodPair.mixinAddedMethod.access;
             }
 
-            prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name
-                .replace("__init__", "<init>")
-                .replace("__clinit__", "<clinit>");
+            prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name.replace("__init__", "<init>").replace("__clinit__",
+                    "<clinit>");
 
             // remove the prefix
             prefixMethodPair.dasmAddedMethod.name = prefixMethodPair.dasmAddedMethod.name.substring("cc_dasm$".length());
@@ -234,7 +232,8 @@ private void doPublicAnnotation(ClassNode targetClass) {
         for (MethodNode method : targetClass.methods) {
             List<AnnotationNode> visibleAnnotations = method.visibleAnnotations;
             if (visibleAnnotations != null) {
-                if (visibleAnnotations.stream().anyMatch(annotationNode -> annotationNode.desc.equals("L" + Public.class.getName().replace('.', '/') + ";"))) {
+                if (visibleAnnotations.stream()
+                        .anyMatch(annotationNode -> annotationNode.desc.equals("L" + Public.class.getName().replace('.', '/') + ";"))) {
                     method.access &= ~(ACC_PRIVATE | ACC_PROTECTED);
                     method.access |= ACC_PUBLIC;
                 }
@@ -245,7 +244,8 @@ private void doPublicAnnotation(ClassNode targetClass) {
     /**
      * @return Whether any transformation was done to the targetClass
      */
-    private boolean transformClass(String targetClassName, ClassNode targetClass, String mixinClassName, ApplicationStage stage) throws DasmException {
+    private boolean transformClass(String targetClassName, ClassNode targetClass, String mixinClassName, ApplicationStage stage)
+            throws DasmException {
         Either<ClassTransform, Collection<MethodTransform>> target = null;
         switch (stage) {
             case PRE_APPLY -> target = preApplyTargets.get(mixinClassName + "|" + targetClassName);
@@ -299,4 +299,4 @@ private void handleError(List<Notification> notifications) {
         if (notifications.stream().anyMatch(n -> n.kind == Notification.Kind.ERROR))
             throw Util.pauseInIde(new RuntimeException("DASM Failure, please see log output"));
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
index 55220528..cf708cd5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(SectionRenderDispatcher.class)
 public interface SectionRenderDispatcherAccess {
-    @Accessor("level") ClientLevel cc_getLevel();
+    @Accessor("level")
+    ClientLevel cc_getLevel();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
index 35aac436..4b38c230 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
@@ -2,11 +2,11 @@
 
 import net.minecraft.client.renderer.ViewArea;
 import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
-import net.minecraft.core.BlockPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(ViewArea.class)
 public interface ViewAreaAccess {
-    @Invoker("getRenderSection") SectionRenderDispatcher.RenderSection cc_invokeGetRenderSection(long sectionPosLong);
+    @Invoker("getRenderSection")
+    SectionRenderDispatcher.RenderSection cc_invokeGetRenderSection(long sectionPosLong);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
index c264d6ec..34eb1523 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(ChunkMap.class)
 public interface ChunkMapAccess {
-    @Invoker("getChunks") Iterable<ChunkHolder> cc_invokeGetChunks();
+    @Invoker("getChunks")
+    Iterable<ChunkHolder> cc_invokeGetChunks();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
index ea603061..440a4881 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(DistanceManager.class)
 public interface DistanceManagerAccess {
-    @Accessor("ticketDispatcher") ThrottlingChunkTaskDispatcher cc_ticketDispatcher();
+    @Accessor("ticketDispatcher")
+    ThrottlingChunkTaskDispatcher cc_ticketDispatcher();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
index 0ef07a11..fc7787df 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(GenerationChunkHolder.class)
 public interface GenerationChunkHolderAccess {
-    @Invoker("removeTask") void cc_invokeRemoveTask(ChunkGenerationTask task);
+    @Invoker("removeTask")
+    void cc_invokeRemoveTask(ChunkGenerationTask task);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
index a303d2a3..805ec308 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(SectionOcclusionGraph.GraphEvents.class)
 public interface SectionOcclusionGraph$GraphEventsAccess {
-    @Accessor("chunksWhichReceivedNeighbors") LongSet cc_chunksWhichReceivedNeighbors();
+    @Accessor("chunksWhichReceivedNeighbors")
+    LongSet cc_chunksWhichReceivedNeighbors();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
index d8946799..dc977f60 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
@@ -24,7 +24,6 @@
 import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.protocol.game.ClientboundLevelChunkPacketData;
 import net.minecraft.world.level.biome.Biomes;
@@ -38,14 +37,14 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 /**
- * The vanilla {@link ClientChunkCache} class stores all loaded chunks on the client and has methods to update and unload them, as well as change the center and range of the chunk storage.
+ * The vanilla {@link ClientChunkCache} class stores all loaded chunks on the client and has methods to update and unload them, as well as change the
+ * center and range of the chunk storage.
  * This mixin adds versions of these methods for cubes, meaning that this class now stores both cubes and chunks.
  */
 @Dasm(ChunkToCubeSet.class)
 @Mixin(ClientChunkCache.class)
 public abstract class MixinClientChunkCache extends MixinChunkSource implements ClientCubeCache {
-    @AddFieldToSets(containers = ChunkToCubeSet.ClientChunkCache_redirects.class,
-        field = @FieldSig(type = @Ref(ClientChunkCache.Storage.class), name = "storage"))
+    @AddFieldToSets(containers = ChunkToCubeSet.ClientChunkCache_redirects.class, field = @FieldSig(type = @Ref(ClientChunkCache.Storage.class), name = "storage"))
     volatile ClientCubeCache.Storage cc_cubeStorage;
 
     private LevelCube cc_emptyCube;
@@ -58,9 +57,8 @@ public abstract class MixinClientChunkCache extends MixinChunkSource implements
     @Inject(method = "<init>", at = @At("RETURN"))
     private void cc_onConstruct(ClientLevel level, int viewDistance, CallbackInfo ci) {
         if (((CanBeCubic) level).cc_isCubic()) {
-            cc_emptyCube = new EmptyLevelCube(
-                level, CubePos.of(0, 0, 0), level.registryAccess().lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.PLAINS)
-            );
+            cc_emptyCube = new EmptyLevelCube(level, CubePos.of(0, 0, 0),
+                    level.registryAccess().lookupOrThrow(Registries.BIOME).getOrThrow(Biomes.PLAINS));
             cc_cubeStorage = new ClientCubeCache.Storage(calculateStorageRange(viewDistance), level);
             // TODO we could redirect the initial construction instead of immediately resizing. doesn't really matter
             updateViewRadius(cc_calculateChunkViewDistance(viewDistance));
@@ -76,8 +74,7 @@ private static boolean cc_isValidCube(@Nullable LevelCube chunk, int x, int y, i
         }
     }
 
-    @Override
-    public void cc_drop(CubePos chunkPos) {
+    @Override public void cc_drop(CubePos chunkPos) {
         if (this.cc_cubeStorage.inRange(chunkPos.getX(), chunkPos.getY(), chunkPos.getZ())) {
             int i = this.cc_cubeStorage.getIndex(chunkPos.getX(), chunkPos.getY(), chunkPos.getZ());
             LevelCube levelCube = this.cc_cubeStorage.getChunk(i);
@@ -89,11 +86,10 @@ public void cc_drop(CubePos chunkPos) {
         }
     }
 
-    @Override
-    public @Nullable LevelCube cc_getCube(int chunkX, int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load) {
-        if (this.cc_cubeStorage.inRange(chunkX, chunkY,chunkZ)) {
-            LevelCube levelCube = this.cc_cubeStorage.getChunk(this.cc_cubeStorage.getIndex(chunkX, chunkY,chunkZ));
-            if (cc_isValidCube(levelCube, chunkX, chunkY,chunkZ)) {
+    @Override public @Nullable LevelCube cc_getCube(int chunkX, int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load) {
+        if (this.cc_cubeStorage.inRange(chunkX, chunkY, chunkZ)) {
+            LevelCube levelCube = this.cc_cubeStorage.getChunk(this.cc_cubeStorage.getIndex(chunkX, chunkY, chunkZ));
+            if (cc_isValidCube(levelCube, chunkX, chunkY, chunkZ)) {
                 return levelCube;
             }
         }
@@ -101,9 +97,10 @@ public void cc_drop(CubePos chunkPos) {
         return load ? this.cc_emptyCube : null;
     }
 
-    @Override
-    public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
-        if (true) throw new UnsupportedOperationException("don't remove this exception until packet integration tests are added for this method"); // TODO (P2)
+    @Override public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
+        if (true)
+            throw new UnsupportedOperationException("don't remove this exception until packet integration tests are added for this method"); // TODO
+                                                                                                                                             // (P2)
         if (!this.cc_cubeStorage.inRange(x, y, z)) {
             LOGGER.warn("Ignoring cube since it's not in the view range: {}, {}, {}", x, y, z);
         } else {
@@ -117,14 +114,9 @@ public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
         }
     }
 
-    @Override
-    public @Nullable LevelCube cc_replaceWithPacketData(
-        int x,
-        int y,
-        int z,
-        FriendlyByteBuf buffer,
-        Map<Heightmap.Types, long[]> map,
-        Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> consumer
+    @Override public @Nullable LevelCube cc_replaceWithPacketData(
+            int x, int y, int z, FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map,
+            Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> consumer
     ) {
         if (!this.cc_cubeStorage.inRange(x, y, z)) {
             LOGGER.warn("Ignoring cube since it's not in the view range: {}, {}, {}", x, y, z);
@@ -151,8 +143,7 @@ public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
 
     @Shadow public abstract void updateViewCenter(int x, int z);
 
-    @Override
-    public void cc_updateViewCenter(int x, int y, int z) {
+    @Override public void cc_updateViewCenter(int x, int y, int z) {
         this.cc_cubeStorage.viewCenterX = x;
         this.cc_cubeStorage.viewCenterY = y;
         this.cc_cubeStorage.viewCenterZ = z;
@@ -161,8 +152,7 @@ public void cc_updateViewCenter(int x, int y, int z) {
 
     @Shadow public abstract void updateViewRadius(int viewDistance);
 
-    @Override
-    public void cc_updateViewRadius(int viewDistance) {
+    @Override public void cc_updateViewRadius(int viewDistance) {
         int i = this.cc_cubeStorage.cubeRadius;
         int j = calculateStorageRange(viewDistance);
         if (i != j) {
@@ -171,7 +161,7 @@ public void cc_updateViewRadius(int viewDistance) {
             storage.viewCenterY = this.cc_cubeStorage.viewCenterY;
             storage.viewCenterZ = this.cc_cubeStorage.viewCenterZ;
 
-            for(int k = 0; k < this.cc_cubeStorage.chunks.length(); ++k) {
+            for (int k = 0; k < this.cc_cubeStorage.chunks.length(); ++k) {
                 LevelCube levelCube = this.cc_cubeStorage.chunks.get(k);
                 if (levelCube != null) {
                     CubePos cubePos = levelCube.cc_getCloPos().cubePos();
@@ -185,8 +175,7 @@ public void cc_updateViewRadius(int viewDistance) {
         updateViewRadius(cc_calculateChunkViewDistance(viewDistance));
     }
 
-    @Shadow
-    private static int calculateStorageRange(int viewDistance) {
+    @Shadow private static int calculateStorageRange(int viewDistance) {
         throw new IllegalStateException("mixin failed to apply");
     }
 
@@ -199,8 +188,7 @@ private static int cc_calculateChunkViewDistance(int cubeViewDistance) {
 
     // TODO gatherStats (only used for debug)
 
-    @Override
-    public int cc_getLoadedCubeCount() {
+    @Override public int cc_getLoadedCubeCount() {
         return this.cc_cubeStorage.chunkCount;
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientCubeCache$Storage.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientCubeCache$Storage.java
index 48efacca..4b315e95 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientCubeCache$Storage.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientCubeCache$Storage.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(ClientCubeCache.Storage.class)
-public class MixinClientCubeCache$Storage {
-}
+public class MixinClientCubeCache$Storage {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientLevel.java
index fd34a481..2049aa9b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientLevel.java
@@ -6,7 +6,6 @@
 import io.github.opencubicchunks.cubicchunks.mixin.core.common.world.level.MixinLevel;
 import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.LevelRenderer;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinLevelRenderer.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinLevelRenderer.java
index 223e4fd2..95c24940 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinLevelRenderer.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinLevelRenderer.java
@@ -13,6 +13,7 @@
 @Dasm(ChunkToCubeSet.class)
 @Mixin(LevelRenderer.class)
 public abstract class MixinLevelRenderer implements CubicLevelRenderer {
-    @AddTransformToSets(ChunkToCubeSet.LevelRenderer_redirects.class) @TransformFromMethod(@MethodSig("onChunkReadyToRender(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCubeSet.LevelRenderer_redirects.class)
+    @TransformFromMethod(@MethodSig("onChunkReadyToRender(Lnet/minecraft/world/level/ChunkPos;)V"))
     public native void cc_onCubeReadyToRender(CubePos cubePos);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph$GraphStorage.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph$GraphStorage.java
index 2fcd8431..3f84f8c3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph$GraphStorage.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph$GraphStorage.java
@@ -11,12 +11,14 @@
 @Mixin(targets = "net.minecraft.client.renderer.SectionOcclusionGraph$GraphStorage")
 public class MixinSectionOcclusionGraph$GraphStorage {
     /**
-     * Wrap reading of sectionGridSizeY when constructing {@link Octree} to ensure that the Octree does not have special-cased Y axis behavior (as occurs in vanilla worlds due to the height limit)
+     * Wrap reading of sectionGridSizeY when constructing {@link Octree} to ensure that the Octree does not have special-cased Y axis behavior (as
+     * occurs in vanilla worlds due to the height limit)
      */
     @WrapOperation(method = "<init>", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/ViewArea;sectionGridSizeY:I"))
     private int cc_onInit_constructOctree_getMinY(ViewArea instance, Operation<Integer> original) {
         if (((CanBeCubic) instance.getLevelHeightAccessor()).cc_isCubic()) {
-            // Passing MAX_VALUE for sectionGridSizeY when constructing the Octree ensures that the Y axis is not special-cased and behaves the same as the X and Z axes.
+            // Passing MAX_VALUE for sectionGridSizeY when constructing the Octree ensures that the Y axis is not special-cased and behaves the same
+            // as the X and Z axes.
             return Integer.MAX_VALUE;
         }
         return original.call(instance);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
index 906d48d6..35418ca6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
@@ -8,7 +8,6 @@
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddTransformToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.utils.Coords;
@@ -20,7 +19,6 @@
 import net.minecraft.client.renderer.SectionOcclusionGraph;
 import net.minecraft.client.renderer.ViewArea;
 import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
-import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.core.SectionPos;
 import org.spongepowered.asm.mixin.Mixin;
@@ -43,7 +41,8 @@ private void cc_onWaitAndReset(@Nullable ViewArea viewArea, CallbackInfo ci) {
         cc_isCubic = viewArea != null && ((CanBeCubic) viewArea.getLevelHeightAccessor()).cc_isCubic();
     }
 
-    @AddTransformToSets(ChunkToCubeSet.SectionOcclusionGraph_redirects.class) @TransformFromMethod(@MethodSig("onChunkReadyToRender(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCubeSet.SectionOcclusionGraph_redirects.class)
+    @TransformFromMethod(@MethodSig("onChunkReadyToRender(Lnet/minecraft/world/level/ChunkPos;)V"))
     public native void cc_onCubeReadyToRender(CubePos cubePos);
 
     @AddMethodToSets(containers = ChunkToCubeSet.SectionOcclusionGraph_redirects.class, method = @MethodSig("addNeighbors(Lnet/minecraft/client/renderer/SectionOcclusionGraph$GraphEvents;Lnet/minecraft/world/level/ChunkPos;)V"))
@@ -55,15 +54,18 @@ private void cc_addNeighbors(SectionOcclusionGraph.GraphEvents graphEvents, Cube
         for (int dx = -1; dx <= 1; dx++) {
             for (int dz = -1; dz <= 1; dz++) {
                 for (int dy = -1; dy <= 1; dy++) {
-                    if (dx == 0 && dy == 0 && dz == 0) continue;
-                    access.cc_chunksWhichReceivedNeighbors().add(CubePos.asLong(cubeX+dx, cubeY+dy, cubeZ+dz));
+                    if (dx == 0 && dy == 0 && dz == 0)
+                        continue;
+                    access.cc_chunksWhichReceivedNeighbors().add(CubePos.asLong(cubeX + dx, cubeY + dy, cubeZ + dz));
                 }
             }
         }
     }
 
     @WrapOperation(method = "initializeQueueForFullUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ViewArea;getRenderSection(J)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;"))
-    private @Nullable SectionRenderDispatcher.RenderSection cc_onInitializeQueueForFullUpdate_getRenderSectionAt(ViewArea instance, long sectionPos, Operation<SectionRenderDispatcher.RenderSection> original) {
+    private @Nullable SectionRenderDispatcher.RenderSection cc_onInitializeQueueForFullUpdate_getRenderSectionAt(
+            ViewArea instance, long sectionPos, Operation<SectionRenderDispatcher.RenderSection> original
+    ) {
         var result = original.call(instance, sectionPos);
         if (result == null && cc_isCubic) {
             throw new IllegalStateException("getRenderSectionAt should never return null in a cubic world");
@@ -73,25 +75,32 @@ private void cc_addNeighbors(SectionOcclusionGraph.GraphEvents graphEvents, Cube
 
     @WrapOperation(method = "runUpdates", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;sectionToChunk(J)J"))
     private long cc_onRunUpdates_sectionToChunk(long sectionPosLong, Operation<Long> original) {
-        if (!cc_isCubic) return original.call(sectionPosLong);
+        if (!cc_isCubic)
+            return original.call(sectionPosLong);
         return CubePos.asLong(SectionPos.x(sectionPosLong), SectionPos.y(sectionPosLong), SectionPos.z(sectionPosLong));
     }
 
     @Inject(method = "isInViewDistance", at = @At("HEAD"), cancellable = true)
     private void cc_onIsInViewDistance(long originSectionPosLong, long sectionPosLong, CallbackInfoReturnable<Boolean> cir) {
-        if (!cc_isCubic) return;
+        if (!cc_isCubic)
+            return;
         int originCubeX = Coords.blockToCube(SectionPos.x(originSectionPosLong));
         int originCubeY = Coords.blockToCube(SectionPos.y(originSectionPosLong));
         int originCubeZ = Coords.blockToCube(SectionPos.z(originSectionPosLong));
         int posCubeX = Coords.blockToCube(SectionPos.x(sectionPosLong));
         int posCubeY = Coords.blockToCube(SectionPos.y(sectionPosLong));
         int posCubeZ = Coords.blockToCube(SectionPos.z(sectionPosLong));
-        cir.setReturnValue(CloTrackingView.cc_isInViewDistance(originCubeX, originCubeY, originCubeZ, Coords.sectionToCubeRenderDistance(this.viewArea.getViewDistance()), posCubeX, posCubeY, posCubeZ));
+        cir.setReturnValue(CloTrackingView.cc_isInViewDistance(originCubeX, originCubeY, originCubeZ,
+                Coords.sectionToCubeRenderDistance(this.viewArea.getViewDistance()), posCubeX, posCubeY, posCubeZ));
     }
 
     @Inject(method = "getRelativeFrom", at = @At("HEAD"), cancellable = true)
-    private void cc_onGetRelativeFrom(long sectionPosLong, SectionRenderDispatcher.RenderSection section, Direction direction, CallbackInfoReturnable<SectionRenderDispatcher.RenderSection> cir) {
-        if (!cc_isCubic) return;
+    private void cc_onGetRelativeFrom(
+            long sectionPosLong, SectionRenderDispatcher.RenderSection section, Direction direction,
+            CallbackInfoReturnable<SectionRenderDispatcher.RenderSection> cir
+    ) {
+        if (!cc_isCubic)
+            return;
         // Same as vanilla logic but we don't manually check Y coordinates since that's handled by isInViewDistance now
         long sectionPosLong2 = section.getNeighborSectionNode(direction);
         if (!this.isInViewDistance(sectionPosLong, sectionPosLong2)) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
index eaca58f6..05de0506 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
@@ -2,7 +2,6 @@
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
-import io.github.opencubicchunks.cc_core.api.CubicConstants;
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.ViewArea;
@@ -33,7 +32,8 @@ public abstract class MixinViewArea {
     // This could be multiple more specific injects, but overwriting the method is probably cleaner
     @Inject(method = "setViewDistance", at = @At("HEAD"), cancellable = true)
     private void cc_onSetViewDistance(int renderDistanceChunks, CallbackInfo ci) {
-        if (!((CanBeCubic) level).cc_isCubic()) return;
+        if (!((CanBeCubic) level).cc_isCubic())
+            return;
         ci.cancel();
         int i = renderDistanceChunks * 2 + 1;
         this.sectionGridSizeX = i;
@@ -44,14 +44,17 @@ private void cc_onSetViewDistance(int renderDistanceChunks, CallbackInfo ci) {
 
     @WrapOperation(method = "createSections", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getMinSectionY()I"))
     private int cc_onCreateSections_getMinY(Level instance, Operation<Integer> original) {
-        if (!((CanBeCubic) level).cc_isCubic()) return original.call(instance);
-        return 0; // I don't really understand the logic here, but returning 0 makes the Y axis behave equivalently to X and Z, which *should* be what we want
+        if (!((CanBeCubic) level).cc_isCubic())
+            return original.call(instance);
+        return 0; // I don't really understand the logic here, but returning 0 makes the Y axis behave equivalently to X and Z, which *should* be what
+                  // we want
     }
 
     // TODO can we do this without fully overwriting the method?
     @Inject(method = "getRenderSection(III)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;", at = @At("HEAD"), cancellable = true)
     private void cc_onGetRenderSection(int sectionX, int sectionY, int sectionZ, CallbackInfoReturnable<SectionRenderDispatcher.RenderSection> cir) {
-        if (!((CanBeCubic) level).cc_isCubic()) return;
+        if (!((CanBeCubic) level).cc_isCubic())
+            return;
         if (!this.cc_containsSection(sectionX, sectionY, sectionZ)) {
             cir.setReturnValue(null);
             return;
@@ -66,7 +69,8 @@ private void cc_onGetRenderSection(int sectionX, int sectionY, int sectionZ, Cal
     // I don't really understand the coordinate maths here, but we replicate it for the Y axis
     @Inject(method = "repositionCamera", at = @At("HEAD"), cancellable = true)
     private void cc_onRepositionCamera(SectionPos newSectionPos, CallbackInfo ci) {
-        if (!((CanBeCubic) level).cc_isCubic()) return;
+        if (!((CanBeCubic) level).cc_isCubic())
+            return;
         ci.cancel();
         for (int sectionX = 0; sectionX < this.sectionGridSizeX; sectionX++) {
             int i1 = newSectionPos.x() - this.viewDistance;
@@ -94,7 +98,7 @@ private void cc_onRepositionCamera(SectionPos newSectionPos, CallbackInfo ci) {
 
     private boolean cc_containsSection(int x, int y, int z) {
         return x >= this.cameraSectionPos.x() - this.viewDistance && x <= this.cameraSectionPos.x() + this.viewDistance
-            && y >= this.cameraSectionPos.y() - this.viewDistance && y <= this.cameraSectionPos.y() + this.viewDistance
-            && z >= this.cameraSectionPos.z() - this.viewDistance && z <= this.cameraSectionPos.z() + this.viewDistance;
+                && y >= this.cameraSectionPos.y() - this.viewDistance && y <= this.cameraSectionPos.y() + this.viewDistance
+                && z >= this.cameraSectionPos.z() - this.viewDistance && z <= this.cameraSectionPos.z() + this.viewDistance;
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
index 74cbb4d3..14123815 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
@@ -23,10 +23,12 @@
 import org.spongepowered.asm.mixin.Shadow;
 
 /**
- * The vanilla {@link RenderRegionCache} caches {@link LevelChunk}s and {@link RenderChunk}s while rebuilding {@link SectionRenderDispatcher.RenderSection}s
+ * The vanilla {@link RenderRegionCache} caches {@link LevelChunk}s and {@link RenderChunk}s while rebuilding
+ * {@link SectionRenderDispatcher.RenderSection}s
  * and has a method for creating a {@link RenderChunkRegion} for a given {@link SectionPos}.
  * <p/>
- * We modify it by additionally caching {@link LevelCube}s and {@link RenderCube}s, and adding an equivalent method to create a {@link RenderCubeRegion} for a given {@link SectionPos}.
+ * We modify it by additionally caching {@link LevelCube}s and {@link RenderCube}s, and adding an equivalent method to create a
+ * {@link RenderCubeRegion} for a given {@link SectionPos}.
  */
 @Mixin(RenderRegionCache.class)
 public abstract class MixinRenderRegionCache implements CubicRenderRegionCache {
@@ -49,13 +51,12 @@ public abstract class MixinRenderRegionCache implements CubicRenderRegionCache {
         int cubeEndZ = centerCubeZ + 1;
         RenderCube[] renderCubes = new RenderCube[27];
 
-        for(int cubeX = cubeStartX; cubeX <= cubeEndX; ++cubeX) {
-            for(int cubeY = cubeStartY; cubeY <= cubeEndY; ++cubeY) {
-                for(int cubeZ = cubeStartZ; cubeZ <= cubeEndZ; ++cubeZ) {
+        for (int cubeX = cubeStartX; cubeX <= cubeEndX; ++cubeX) {
+            for (int cubeY = cubeStartY; cubeY <= cubeEndY; ++cubeY) {
+                for (int cubeZ = cubeStartZ; cubeZ <= cubeEndZ; ++cubeZ) {
                     int cubeIndex = RenderCubeRegion.index(cubeStartX, cubeStartY, cubeStartZ, cubeX, cubeY, cubeZ);
-                    var cubeInfo = cubeX == centerCubeX && cubeY == centerCubeY && cubeZ == centerCubeZ
-                        ? centerCubeInfo
-                        : this.cc_getChunkInfo(level, cubeX, cubeY, cubeZ);
+                    var cubeInfo = cubeX == centerCubeX && cubeY == centerCubeY && cubeZ == centerCubeZ ? centerCubeInfo
+                            : this.cc_getChunkInfo(level, cubeX, cubeY, cubeZ);
                     renderCubes[cubeIndex] = cubeInfo.renderCube();
                 }
             }
@@ -66,10 +67,7 @@ public abstract class MixinRenderRegionCache implements CubicRenderRegionCache {
     }
 
     private RenderRegionCacheCubeInfo cc_getChunkInfo(Level level, int cubeX, int cubeY, int cubeZ) {
-        return this.chunkInfoCache
-            .computeIfAbsent(
-                CubePos.asLong(cubeX, cubeY, cubeZ),
-                cubePosLong -> new RenderRegionCacheCubeInfo(((CubicLevel) level).cc_getCube(CubePos.extractX(cubePosLong), CubePos.extractY(cubePosLong), CubePos.extractZ(cubePosLong)))
-            );
+        return this.chunkInfoCache.computeIfAbsent(CubePos.asLong(cubeX, cubeY, cubeZ), cubePosLong -> new RenderRegionCacheCubeInfo(
+                ((CubicLevel) level).cc_getCube(CubePos.extractX(cubePosLong), CubePos.extractY(cubePosLong), CubePos.extractZ(cubePosLong))));
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
index dd5b9588..7e5defa1 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
@@ -26,7 +26,8 @@
 
 /**
  * {@code RenderSection} represents a single {@link LevelChunkSection} to be rendered.
- * We modify it to check cubes instead of chunks when validating the presence of neighboring sections in cubic levels, and to use {@link RenderCubeRegion} instead of {@link RenderChunkRegion}.
+ * We modify it to check cubes instead of chunks when validating the presence of neighboring sections in cubic levels, and to use
+ * {@link RenderCubeRegion} instead of {@link RenderChunkRegion}.
  */
 @Mixin(SectionRenderDispatcher.RenderSection.class)
 public abstract class MixinSectionRenderDispatcher$RenderSection {
@@ -40,8 +41,11 @@ private void cc_onDoesChunkExistAt(long sectionPosLong, CallbackInfoReturnable<B
         if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic()) {
             return;
         }
-        // TODO (P2) lighting: also check the cubic equivalent of LevelLightEngine.lightOnInColumn here (see vanilla doesChunkExistAt method) - sections currently sometimes fail to render due to this missing check
-        cir.setReturnValue(((CubicLevel) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_getCube(Coords.sectionToCube(SectionPos.x(sectionPosLong)), Coords.sectionToCube(SectionPos.y(sectionPosLong)), Coords.sectionToCube(SectionPos.z(sectionPosLong)), ChunkStatus.FULL, false) != null);
+        // TODO (P2) lighting: also check the cubic equivalent of LevelLightEngine.lightOnInColumn here (see vanilla doesChunkExistAt method) -
+        // sections currently sometimes fail to render due to this missing check
+        cir.setReturnValue(((CubicLevel) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_getCube(
+                Coords.sectionToCube(SectionPos.x(sectionPosLong)), Coords.sectionToCube(SectionPos.y(sectionPosLong)),
+                Coords.sectionToCube(SectionPos.z(sectionPosLong)), ChunkStatus.FULL, false) != null);
     }
 
     /**
@@ -54,7 +58,8 @@ private void cc_onHasAllNeighbors(CallbackInfoReturnable<Boolean> cir) {
         for (int dx = -1; dx <= 1; dx++) {
             for (int dy = -1; dy <= 1; dy++) {
                 for (int dz = -1; dz <= 1; dz++) {
-                    if (dx == 0 && dy == 0 && dz == 0) continue;
+                    if (dx == 0 && dy == 0 && dz == 0)
+                        continue;
                     if (!this.doesChunkExistAt(SectionPos.offset(this.sectionNode, dx, dy, dz))) {
                         cir.setReturnValue(false);
                         return;
@@ -65,13 +70,14 @@ private void cc_onHasAllNeighbors(CallbackInfoReturnable<Boolean> cir) {
         cir.setReturnValue(true);
     }
 
-
     /**
-     * Wrap creation of RenderChunkRegion to create a RenderCubeRegion in cubic worlds (return type stays the same because RenderCubeRegion extends RenderChunkRegion)
+     * Wrap creation of RenderChunkRegion to create a RenderCubeRegion in cubic worlds (return type stays the same because RenderCubeRegion extends
+     * RenderChunkRegion)
      */
     @WrapOperation(method = "createCompileTask", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/chunk/RenderRegionCache;createRegion(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/SectionPos;Z)Lnet/minecraft/client/renderer/chunk/RenderChunkRegion;"))
-    @Nullable private RenderChunkRegion cc_onCreateCompileTask_createRegion(RenderRegionCache instance, Level level, SectionPos sectionPos, boolean bool,
-                                                                            Operation<RenderChunkRegion> original) {
+    @Nullable private RenderChunkRegion cc_onCreateCompileTask_createRegion(
+            RenderRegionCache instance, Level level, SectionPos sectionPos, boolean bool, Operation<RenderChunkRegion> original
+    ) {
         if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic())
             return original.call(instance, level, sectionPos, bool);
         return ((CubicRenderRegionCache) instance).cc_createRegion(level, sectionPos, bool);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
index 00eb0ac9..3958cac3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
@@ -15,7 +15,8 @@ public abstract class MixinRenderCube {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic @Redirect(method = "getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = "getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos pos) {
         return Coords.blockToIndex(pos);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderRegionCacheCubeInfo.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderRegionCacheCubeInfo.java
index b29e8bb3..f56fc24c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderRegionCacheCubeInfo.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderRegionCacheCubeInfo.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(RenderRegionCacheCubeInfo.class)
-public abstract class MixinRenderRegionCacheCubeInfo {
-}
+public abstract class MixinRenderRegionCacheCubeInfo {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/core/MixinSectionPos.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/core/MixinSectionPos.java
index da56a31a..15c10334 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/core/MixinSectionPos.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/core/MixinSectionPos.java
@@ -12,6 +12,7 @@ public abstract class MixinSectionPos {
 
     /**
      * Replaces {@link SectionPos}.chunk() in dasm-copied code in cases where a cube position should be returned, rather than a chunk position.
+     * 
      * @return The position of the cube containing this section, as a {@link CloPos}
      */
     public CloPos cc_cube() {
@@ -20,6 +21,7 @@ public CloPos cc_cube() {
 
     /**
      * Replaces {@link SectionPos}.chunk() in dasm-copied code in cases where a chunk position should still be returned, not a cube position.
+     * 
      * @return The position of the chunk containing this section, as a {@link CloPos}
      */
     public CloPos cc_chunk() {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCCommonHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCCommonHooks.java
index 9950c383..93bdc169 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCCommonHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCCommonHooks.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CCCommonHooks.class)
-public class MixinCCCommonHooks {
-}
+public class MixinCCCommonHooks {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCEventHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCEventHooks.java
index c8661f04..4fbc0b53 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCEventHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/movetoforgesourcesetlater/MixinCCEventHooks.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CCEventHooks.class)
-public class MixinCCEventHooks {
-}
+public class MixinCCEventHooks {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/MixinMinecraftServer.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/MixinMinecraftServer.java
index 516c013f..fe82e53a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/MixinMinecraftServer.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/MixinMinecraftServer.java
@@ -23,9 +23,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.ModifyConstant;
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
@@ -38,8 +36,10 @@ public abstract class MixinMinecraftServer {
     // setInitialSpawn
     // We replace the ChunkPos spawn position with a CubePos spawn position and reuse it later to get the world position.
     @Inject(method = "setInitialSpawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;<init>(Lnet/minecraft/core/BlockPos;)V"))
-    private static void cc_replaceChunkPosInSetInitialSpawn(ServerLevel serverLevel, ServerLevelData serverLevelData, boolean generateBonusChest, boolean debug, CallbackInfo ci, @Share(
-        "cubePos") LocalRef<CubePos> cubePosLocalRef) {
+    private static void cc_replaceChunkPosInSetInitialSpawn(
+            ServerLevel serverLevel, ServerLevelData serverLevelData, boolean generateBonusChest, boolean debug, CallbackInfo ci,
+            @Share("cubePos") LocalRef<CubePos> cubePosLocalRef
+    ) {
         if (((CanBeCubic) serverLevel).cc_isCubic()) {
             CubePos cubePos = new CubePos(serverLevel.getChunkSource().randomState().sampler().findSpawnPosition());
             cubePosLocalRef.set(cubePos);
@@ -47,8 +47,9 @@ private static void cc_replaceChunkPosInSetInitialSpawn(ServerLevel serverLevel,
     }
 
     @WrapOperation(method = "setInitialSpawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;getWorldPosition()Lnet/minecraft/core/BlockPos;"))
-    private static BlockPos cc_replaceGetWorldPositionInSetInitialSpawn(ChunkPos chunkPos, Operation<BlockPos> original, ServerLevel serverLevel, @Share(
-        "cubePos") LocalRef<CubePos> cubePosLocalRef) {
+    private static BlockPos cc_replaceGetWorldPositionInSetInitialSpawn(
+            ChunkPos chunkPos, Operation<BlockPos> original, ServerLevel serverLevel, @Share("cubePos") LocalRef<CubePos> cubePosLocalRef
+    ) {
         if (((CanBeCubic) serverLevel).cc_isCubic()) {
             return cubePosLocalRef.get().asChunkPos().getWorldPosition();
         }
@@ -58,14 +59,15 @@ private static BlockPos cc_replaceGetWorldPositionInSetInitialSpawn(ChunkPos chu
     /**
      * This mixin uses SpawnPlaceFinder (core CC2 code) in a similar fashion to the CC2 implementation.
      */
-    @WrapOperation(method = "setInitialSpawn",
-        at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;getHeight(Lnet/minecraft/world/level/levelgen/Heightmap$Types;II)I"))
-    private static int cc_replaceGetHeightWithSpawnPlaceFinder(ServerLevel serverLevel, Heightmap.Types heightmapType, int x, int z, Operation<Integer> original,
-                                                               @Share("cubePos") LocalRef<CubePos> cubePosLocalRef) {
+    @WrapOperation(method = "setInitialSpawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;getHeight(Lnet/minecraft/world/level/levelgen/Heightmap$Types;II)I"))
+    private static int cc_replaceGetHeightWithSpawnPlaceFinder(
+            ServerLevel serverLevel, Heightmap.Types heightmapType, int x, int z, Operation<Integer> original,
+            @Share("cubePos") LocalRef<CubePos> cubePosLocalRef
+    ) {
         if (((CanBeCubic) serverLevel).cc_isCubic()) {
             BlockPos topBlockBisect = SpawnPlaceFinder.getTopBlockBisect(serverLevel, cubePosLocalRef.get().asBlockPos(), false,
-                pos -> serverLevel.getBlockState(pos).is(BlockTags.VALID_SPAWN),
-                pos -> serverLevel.getBlockState(pos).getCollisionShape(serverLevel, pos).isEmpty());
+                    pos -> serverLevel.getBlockState(pos).is(BlockTags.VALID_SPAWN),
+                    pos -> serverLevel.getBlockState(pos).getCollisionShape(serverLevel, pos).isEmpty());
             if (topBlockBisect != null) {
                 return topBlockBisect.getY();
             } else {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
index 620b88ac..8918b783 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
@@ -41,9 +41,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * {@link ChunkGenerationTask} handles loading a given chunk at a given {@link ChunkStatus}, including generation if required, and loading neighboring chunks as required.
+ * {@link ChunkGenerationTask} handles loading a given chunk at a given {@link ChunkStatus}, including generation if required, and loading neighboring
+ * chunks as required.
  * <p/>
- * We modify it to support cube loading as well, loading both neighboring cubes and chunks as required, and preserving chunk-cube load order invariants
+ * We modify it to support cube loading as well, loading both neighboring cubes and chunks as required, and preserving chunk-cube load order
+ * invariants
  * (cube status never exceeds the status of any chunks intersecting it)
  */
 @Dasm(GlobalSet.class)
@@ -57,7 +59,8 @@ public abstract class MixinChunkGenerationTask implements CloGenerationTask {
     @Shadow @Final private StaticCache2D<GenerationChunkHolder> cache;
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkGenerationTask_redirects.class, field = @FieldSig(type = @Ref(ChunkPos.class), name = "pos"))
     private CubePos cc_cubePos;
-    // scheduledChunkStatus must be one status higher than the scheduled status for cubes until the target status is reached, to ensure load order invariants are preserved
+    // scheduledChunkStatus must be one status higher than the scheduled status for cubes until the target status is reached, to ensure load order
+    // invariants are preserved
     // we use the vanilla field for cube status, since that is the status of the actual cube that is being generated
     @Nullable public ChunkStatus cc_scheduledChunkStatus;
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkGenerationTask_redirects.class, field = @FieldSig(type = @Ref(StaticCache2D.class), name = "cache"))
@@ -82,15 +85,15 @@ private GeneratingCubeMap cc_getGeneratingCubeMap() {
         int cubeRadius = CubePyramid.CC_GENERATION_PYRAMID_CUBES.getStepTo(targetStatus).getAccumulatedRadiusOf(ChunkStatus.EMPTY);
         int cubeDiameter = cubeRadius * 2 + 1;
         int chunkDiameter = cubeDiameter * CubicConstants.DIAMETER_IN_SECTIONS;
-        // We directly use the StaticCache2D constructor, as the `create` factory method only allows for odd dimensions, and `chunkDiameter` is even (for cube sizes greater than 16)
-        StaticCache2D<GenerationChunkHolder> staticcache2d = new StaticCache2D<>(
-            Coords.cubeToSection(pos.getX() - cubeRadius, 0), Coords.cubeToSection(pos.getZ() - cubeRadius, 0), chunkDiameter, chunkDiameter, (x, z) -> chunkMap.acquireGeneration(ChunkPos.asLong(x, z))
-        );
+        // We directly use the StaticCache2D constructor, as the `create` factory method only allows for odd dimensions, and `chunkDiameter` is even
+        // (for cube sizes greater than 16)
+        StaticCache2D<GenerationChunkHolder> staticcache2d = new StaticCache2D<>(Coords.cubeToSection(pos.getX() - cubeRadius, 0),
+                Coords.cubeToSection(pos.getZ() - cubeRadius, 0), chunkDiameter, chunkDiameter,
+                (x, z) -> chunkMap.acquireGeneration(ChunkPos.asLong(x, z)));
         var chunkGenerationTask = new ChunkGenerationTask(chunkMap, targetStatus, null, staticcache2d);
         ((MixinChunkGenerationTask) (Object) chunkGenerationTask).cc_cubePos = pos;
-        ((MixinChunkGenerationTask) (Object) chunkGenerationTask).cc_cubeCache = StaticCache3D.create(
-            pos.getX(), pos.getY(), pos.getZ(), cubeRadius, (x, y, z) -> chunkMap.acquireGeneration(CubePos.asLong(x, y, z))
-        );
+        ((MixinChunkGenerationTask) (Object) chunkGenerationTask).cc_cubeCache = StaticCache3D.create(pos.getX(), pos.getY(), pos.getZ(), cubeRadius,
+                (x, y, z) -> chunkMap.acquireGeneration(CubePos.asLong(x, y, z)));
         return chunkGenerationTask;
     }
 
@@ -113,7 +116,8 @@ private void cc_onScheduleNextLayer(CallbackInfo ci) {
 
     /**
      * Cube equivalent to {@code scheduleNextLayer}.
-     * Loads chunks one status higher than cubes until chunks have reached the target status, as otherwise cubes could reach a status before their intersecting chunks do.
+     * Loads chunks one status higher than cubes until chunks have reached the target status, as otherwise cubes could reach a status before their
+     * intersecting chunks do.
      */
     private void cc_scheduleNextLayer() {
         ChunkStatus nextChunkStatus;
@@ -169,7 +173,8 @@ private void cc_onCanLoadWithoutGeneration(CallbackInfoReturnable<Boolean> cir)
         if (this.targetStatus == ChunkStatus.EMPTY) {
             cir.setReturnValue(true);
         } else {
-            ChunkStatus currentCubeStatus = this.cc_cubeCache.get(this.cc_cubePos.getX(), this.cc_cubePos.getY(), this.cc_cubePos.getZ()).getPersistedStatus();
+            ChunkStatus currentCubeStatus = this.cc_cubeCache.get(this.cc_cubePos.getX(), this.cc_cubePos.getY(), this.cc_cubePos.getZ())
+                    .getPersistedStatus();
             if (currentCubeStatus != null && !currentCubeStatus.isBefore(this.targetStatus)) {
                 ChunkDependencies cubeDependencies = CubePyramid.CC_LOADING_PYRAMID_CUBES.getStepTo(this.targetStatus).accumulatedDependencies();
                 int cubeRadius = cubeDependencies.getRadius();
@@ -211,16 +216,19 @@ private void cc_onCanLoadWithoutGeneration(CallbackInfoReturnable<Boolean> cir)
 
     @Inject(method = "getCenter", at = @At("HEAD"), cancellable = true)
     private void cc_onGetCenter(CallbackInfoReturnable<GenerationChunkHolder> cir) {
-        if (cc_cubePos != null) cir.setReturnValue(this.cc_cubeCache.get(this.cc_cubePos.getX(), this.cc_cubePos.getY(), this.cc_cubePos.getZ()));
+        if (cc_cubePos != null)
+            cir.setReturnValue(this.cc_cubeCache.get(this.cc_cubePos.getX(), this.cc_cubePos.getY(), this.cc_cubePos.getZ()));
     }
 
     /**
-     * Cubic equivalent of {@code scheduleLayer}; schedules both cubes and chunks at given statuses (Chunk status will be higher to preserve load order invariants)
+     * Cubic equivalent of {@code scheduleLayer}; schedules both cubes and chunks at given statuses (Chunk status will be higher to preserve load
+     * order invariants)
      */
     // TODO this could be two methods I guess? does it matter?
     private void cc_scheduleLayer(@Nullable ChunkStatus chunkStatus, @Nullable ChunkStatus cubeStatus, boolean needsGeneration) {
         try (Zone zone = Profiler.get().zone("scheduleLayer")) {
-            zone.addText(() -> String.format("Chunk: %s, Cube: %s", chunkStatus == null ? "null" : chunkStatus.getName(), cubeStatus == null ? "null" : cubeStatus.getName()));
+            zone.addText(() -> String.format("Chunk: %s, Cube: %s", chunkStatus == null ? "null" : chunkStatus.getName(),
+                    cubeStatus == null ? "null" : cubeStatus.getName()));
             if (cubeStatus != null) {
                 int cubeRadius = this.cc_getCubeRadiusForLayer(cubeStatus, needsGeneration);
                 for (int cubeX = this.cc_cubePos.getX() - cubeRadius; cubeX <= this.cc_cubePos.getX() + cubeRadius; cubeX++) {
@@ -256,7 +264,8 @@ private void cc_scheduleLayer(@Nullable ChunkStatus chunkStatus, @Nullable Chunk
 
     @Inject(method = "scheduleLayer", at = @At("HEAD"))
     private void cc_onScheduleLayer(ChunkStatus status, boolean needsGeneration, CallbackInfo ci) {
-        if (cc_cubePos == null) return;
+        if (cc_cubePos == null)
+            return;
         throw new IllegalStateException("shouldn't call vanilla scheduleLayer for cube generation task");
     }
 
@@ -274,7 +283,9 @@ private void cc_onScheduleLayer(ChunkStatus status, boolean needsGeneration, Cal
     @Shadow protected abstract boolean canLoadWithoutGeneration();
 
     @Inject(method = "scheduleChunkInLayer", at = @At("HEAD"), cancellable = true)
-    private void cc_onScheduleChunkInLayer(ChunkStatus status, boolean needsGeneration, GenerationChunkHolder chunk, CallbackInfoReturnable<Boolean> cir) {
+    private void cc_onScheduleChunkInLayer(
+            ChunkStatus status, boolean needsGeneration, GenerationChunkHolder chunk, CallbackInfoReturnable<Boolean> cir
+    ) {
         if (((GenerationCloHolder) chunk).cc_getCubePos() != null) {
             cir.setReturnValue(cc_scheduleCubeInLayer(status, needsGeneration, chunk));
         }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
index 534a4069..3436d9e3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
@@ -46,8 +46,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * The vanilla {@link ChunkHolder} class extends {@link GenerationChunkHolder} to have methods for getting a fully loaded chunk, and handle saving dependencies and broadcasting updates to clients.
- * This mixin adds cubic chunks equivalents for methods where necessary, to allow GenerationChunkHolder to dynamically wrap either a chunk or a cube (i.e. a CLO).
+ * The vanilla {@link ChunkHolder} class extends {@link GenerationChunkHolder} to have methods for getting a fully loaded chunk, and handle saving
+ * dependencies and broadcasting updates to clients.
+ * This mixin adds cubic chunks equivalents for methods where necessary, to allow GenerationChunkHolder to dynamically wrap either a chunk or a cube
+ * (i.e. a CLO).
  */
 @Dasm(ChunkToCubeSet.class)
 @Mixin(ChunkHolder.class)
@@ -61,14 +63,16 @@ public abstract class MixinChunkHolder extends MixinGenerationChunkHolder implem
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkHolder_redirects.class, field = @FieldSig(type = @Ref(ChunkHolder.PlayerProvider.class), name = "playerProvider"))
     private final PlayerProvider cc_playerProvider;
 
-    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/ChunkPos;ILnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/world/level/lighting/LevelLightEngine;Lnet/minecraft/server/level/ChunkHolder$LevelChangeListener;Lnet/minecraft/server/level/ChunkHolder$PlayerProvider;)V"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/ChunkPos;ILnet/minecraft/world/level/LevelHeightAccessor;Lnet/minecraft/world/level/lighting/LevelLightEngine;Lnet/minecraft/server/level/ChunkHolder$LevelChangeListener;Lnet/minecraft/server/level/ChunkHolder$PlayerProvider;)V"))
     public MixinChunkHolder() {
         throw new DasmFailedToApply();
     }
 
     @Shadow @Nullable public abstract LevelChunk getTickingChunk();
 
-    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;"))
     @Nullable public native LevelCube cc_getTickingCube();
 
     @AddMethodToSets(containers = ChunkToCloSet.ChunkHolder_redirects.class, method = @MethodSig("getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;"))
@@ -81,10 +85,12 @@ public MixinChunkHolder() {
 
     @Shadow @Nullable public abstract LevelChunk getChunkToSend();
 
-    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
     @Nullable public native LevelCube cc_getCubeToSend();
 
-    @AddTransformToSets(ChunkToCloSet.ChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
     @Nullable public LevelClo cc_getCloToSend() {
         if (cc_cubePos != null) {
             return cc_getCubeToSend();
@@ -103,7 +109,8 @@ public void cc_onBlockChanged(BlockPos pos, CallbackInfoReturnable<Boolean> cir)
     @TransformFromMethod(@MethodSig("blockChanged(Lnet/minecraft/core/BlockPos;)Z"))
     private native boolean cc_blockChanged(BlockPos pos);
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_blockChanged", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_blockChanged", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionIndex(I)I"))
     private int cc_onBlockChanged_sectionIndex(LevelHeightAccessor instance, int y, BlockPos pos) {
         return Coords.sectionToIndex(Coords.blockToSection(pos.getX()), Coords.blockToSection(pos.getY()), Coords.blockToSection(pos.getZ()));
     }
@@ -119,11 +126,14 @@ public void cc_onSectionLightChanged(LightLayer lightLayer, int sectionY, Callba
     @Shadow public abstract void broadcastChanges(LevelChunk chunk);
 
     // region [cc_broadcastCubeChanges dasm + mixin]
-    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("broadcastChanges(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("broadcastChanges(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     public native void cc_broadcastCubeChanges(LevelCube cube);
-    // TODO (P2) lighting - ClientboundLightUpdatePacket branch is currently never reached; once we have lighting it will have to be a CC packet, and this.broadcast will need to redirect to a CC method
+    // TODO (P2) lighting - ClientboundLightUpdatePacket branch is currently never reached; once we have lighting it will have to be a CC packet, and
+    // this.broadcast will need to redirect to a CC method
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionYFromSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionYFromSectionIndex(I)I"))
     private int cc_onBroadcastCubeChanges_indexToSectionY(LevelHeightAccessor instance, int sectionIndex) {
         // The vanilla method uses SectionPos.of(ChunkPos, sectionY), but we want SectionPos.of(CubePos, sectionIndex).
         // The easiest way to accomplish this is to turn `getSectionYFromSectionIndex` into a no-op so that we get sectionIndex instead of sectionY.
@@ -131,7 +141,8 @@ private int cc_onBroadcastCubeChanges_indexToSectionY(LevelHeightAccessor instan
         return sectionIndex;
     }
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;of(Lio/github/opencubicchunks/cc_core/api/CubePos;I)Lnet/minecraft/core/SectionPos;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;of(Lio/github/opencubicchunks/cc_core/api/CubePos;I)Lnet/minecraft/core/SectionPos;"))
     private SectionPos cc_onBroadcastCubeChanges_sectionPos(CubePos cubePos, int sectionIndex) {
         return Coords.sectionPosByIndex(cubePos, sectionIndex);
     }
@@ -146,8 +157,11 @@ public void cc_broadcastCloChanges(LevelClo clo) {
         }
     }
 
-    @WrapOperation(method = { "lambda$scheduleFullChunkPromotion$4", "demoteFullChunk" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;onFullChunkStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V"))
-    private void cc_onCallChunkMapOnFullChunkStatusChange(ChunkMap instance, ChunkPos chunkPos, FullChunkStatus fullChunkStatus, Operation<Void> original) {
+    @WrapOperation(method = { "lambda$scheduleFullChunkPromotion$4",
+        "demoteFullChunk" }, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;onFullChunkStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V"))
+    private void cc_onCallChunkMapOnFullChunkStatusChange(
+            ChunkMap instance, ChunkPos chunkPos, FullChunkStatus fullChunkStatus, Operation<Void> original
+    ) {
         if (cc_cubePos != null) {
             ((CubicChunkMap) instance).cc_onFullChunkStatusChange(cc_cubePos, fullChunkStatus);
         } else {
@@ -156,8 +170,10 @@ private void cc_onCallChunkMapOnFullChunkStatusChange(ChunkMap instance, ChunkPo
     }
 
     @WrapOperation(method = "updateFutures", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkHolder$LevelChangeListener;onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
-    protected void cc_onUpdateFutures_onCallOnLevelChange(ChunkHolder.LevelChangeListener instance, ChunkPos chunkPos, IntSupplier intSupplier, int i, IntConsumer intConsumer,
-                                                          Operation<Void> original) {
+    protected void cc_onUpdateFutures_onCallOnLevelChange(
+            ChunkHolder.LevelChangeListener instance, ChunkPos chunkPos, IntSupplier intSupplier, int i, IntConsumer intConsumer,
+            Operation<Void> original
+    ) {
         if (cc_cubePos != null) {
             cc_onLevelChange.cc_onLevelChange(cc_cubePos, intSupplier, i, intConsumer);
         } else {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
index 54317e95..ab06abe1 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
@@ -20,14 +20,16 @@
 public abstract class MixinChunkMap$TrackedEntity {
     @Shadow @Final Entity entity;
 
-    //region [cc_updatePlayer dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap$TrackedEntity_redirects.class) @TransformFromMethod(@MethodSig("updatePlayer(Lnet/minecraft/server/level/ServerPlayer;)V"))
+    // region [cc_updatePlayer dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap$TrackedEntity_redirects.class)
+    @TransformFromMethod(@MethodSig("updatePlayer(Lnet/minecraft/server/level/ServerPlayer;)V"))
     public native void cc_updatePlayer(ServerPlayer player);
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_updatePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_updatePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_updatePlayer_isChunkTracked(ChunkMap instance, ServerPlayer player, int x, int z) {
         // FIXME entity clo position once implemented
-        return false; //((CubicChunkMap) instance).cc_isChunkTracked(player, this.entity.chunkPosition().x, 0, this.entity.chunkPosition().z);
+        return false; // ((CubicChunkMap) instance).cc_isChunkTracked(player, this.entity.chunkPosition().x, 0, this.entity.chunkPosition().z);
     }
-    //endregion
+    // endregion
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
index b9f51edf..a28aa6b4 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
@@ -91,7 +91,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * The vanilla {@link ChunkMap} class stores all loaded chunks for a world and handles loading and unloading them, including dependencies on neighboring chunks.
+ * The vanilla {@link ChunkMap} class stores all loaded chunks for a world and handles loading and unloading them, including dependencies on
+ * neighboring chunks.
  * This mixin adds cubic chunks equivalents for methods where necessary, to allow ChunkMap to work with CLOs (i.e. both chunks and cubes).
  */
 @Dasm(ChunkToCloSet.class)
@@ -119,18 +120,23 @@ public abstract class MixinChunkMap extends MixinChunkStorage implements Generat
 
     // TODO once we can target non-return locations in constructors, do this when the vanilla field is set
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void cc_onInit(ServerLevel level, LevelStorageSource.LevelStorageAccess levelStorageAccess, DataFixer fixerUpper, StructureTemplateManager structureManager, Executor dispatcher,
-                           BlockableEventLoop mainThreadExecutor, LightChunkGetter lightChunk, ChunkGenerator generator, ChunkProgressListener progressListener,
-                           ChunkStatusUpdateListener chunkStatusListener, Supplier overworldDataStorage, TicketStorage ticketStorage, int serverViewDistance, boolean sync, CallbackInfo ci) {
+    private void cc_onInit(
+            ServerLevel level, LevelStorageSource.LevelStorageAccess levelStorageAccess, DataFixer fixerUpper,
+            StructureTemplateManager structureManager, Executor dispatcher, BlockableEventLoop mainThreadExecutor, LightChunkGetter lightChunk,
+            ChunkGenerator generator, ChunkProgressListener progressListener, ChunkStatusUpdateListener chunkStatusListener,
+            Supplier overworldDataStorage, TicketStorage ticketStorage, int serverViewDistance, boolean sync, CallbackInfo ci
+    ) {
         if (((CanBeCubic) level).cc_isCubic()) {
             cc_progressListener = ((CloProgressListener) progressListener);
-            // TODO P2 (entities): actually pass in a cloStatusListener - since ChunkStatusUpdateListener is passed as a parameter, not sure what the best approach is without making our own constructor
+            // TODO P2 (entities): actually pass in a cloStatusListener - since ChunkStatusUpdateListener is passed as a parameter, not sure what the
+            // best approach is without making our own constructor
             cc_cloStatusListener = (cloPos, fullChunkStatus) -> {};
             ((MarkableAsCubic) distanceManager).cc_setCubic();
         }
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("setChunkUnsaved(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("setChunkUnsaved(Lnet/minecraft/world/level/ChunkPos;)V"))
     private native void cc_setCloUnsaved(CloPos cloPos);
 
     /**
@@ -155,11 +161,10 @@ private static double cc_euclideanDistanceSquared(CloPos cloPos, Vec3 vec3) {
     // TODO make vanilla isChunkTracked/isChunkOnTrackedBorder fail in cubic world
 
     // These methods are not copied due to taking 3 ints instead of 2
-    @Override
-    public boolean cc_isChunkTracked(ServerPlayer player, int x, int y, int z) {
+    @Override public boolean cc_isChunkTracked(ServerPlayer player, int x, int y, int z) {
         return ((CCServerPlayer) player).cc_getCloTrackingView().cc_contains(x, y, z)
-            // TODO this requires PlayerChunkSender to accept Clo longs
-            && !player.connection.chunkSender.isPending(CloPos.cubeAsLong(x, y, z));
+                // TODO this requires PlayerChunkSender to accept Clo longs
+                && !player.connection.chunkSender.isPending(CloPos.cubeAsLong(x, y, z));
     }
 
     private boolean cc_isChunkOnTrackedBorder(ServerPlayer player, int x, int y, int z) {
@@ -179,22 +184,30 @@ private boolean cc_isChunkOnTrackedBorder(ServerPlayer player, int x, int y, int
 
     // TODO getChunkDebugData - low prio
 
-    //region [cc_getChunkRangeFuture dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("getChunkRangeFuture(Lnet/minecraft/server/level/ChunkHolder;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;"))
-    private native CompletableFuture<ChunkResult<List<CloAccess>>> cc_getChunkRangeFuture(ChunkHolder cloHolder, int radius,
-                                                                                          IntFunction<ChunkStatus> statusByRadius);
+    // region [cc_getChunkRangeFuture dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("getChunkRangeFuture(Lnet/minecraft/server/level/ChunkHolder;ILjava/util/function/IntFunction;)Ljava/util/concurrent/CompletableFuture;"))
+    private native CompletableFuture<ChunkResult<List<CloAccess>>> cc_getChunkRangeFuture(
+            ChunkHolder cloHolder, int radius, IntFunction<ChunkStatus> statusByRadius
+    );
 
     // TODO this could be substantially improved probably hopefully
     /**
      * Cubes require different adjacency logic compared to Chunks
      */
-    @Dynamic @Inject(method = "cc_dasm$cc_getChunkRangeFuture", at = @At("HEAD"), cancellable = true)
-    private void cc_onGetChunkRangeFuture(ChunkHolder cloHolder, int radius, IntFunction<ChunkStatus> statusByRadius,
-                                          CallbackInfoReturnable<CompletableFuture<ChunkResult<List<CloAccess>>>> cir) {
-        // Note that statusByRadius sometimes isn't actually correct for cubes beyond the first few steps, but getChunkRangeFuture is only called with parameters for which it's correct within the radius
+    @Dynamic
+    @Inject(method = "cc_dasm$cc_getChunkRangeFuture", at = @At("HEAD"), cancellable = true)
+    private void cc_onGetChunkRangeFuture(
+            ChunkHolder cloHolder, int radius, IntFunction<ChunkStatus> statusByRadius,
+            CallbackInfoReturnable<CompletableFuture<ChunkResult<List<CloAccess>>>> cir
+    ) {
+        // Note that statusByRadius sometimes isn't actually correct for cubes beyond the first few steps, but getChunkRangeFuture is only called with
+        // parameters for which it's correct within the radius
         CloPos pos = ((CloHolder) cloHolder).cc_getCloPos();
-        if (!pos.isCube()) return;
-        // The vanilla method has an early exit for radius=0 here; this is not valid for cubes because even if radius=0 we still depend on chunks that neighbor the cube
+        if (!pos.isCube())
+            return;
+        // The vanilla method has an early exit for radius=0 here; this is not valid for cubes because even if radius=0 we still depend on chunks that
+        // neighbor the cube
         int cubeDiameter = radius * 2 + 1;
         int chunkDiameter = cubeDiameter * CubicConstants.DIAMETER_IN_SECTIONS;
         int futureCount = cubeDiameter * cubeDiameter * cubeDiameter + chunkDiameter * chunkDiameter;
@@ -207,40 +220,45 @@ private void cc_onGetChunkRangeFuture(ChunkHolder cloHolder, int radius, IntFunc
                 int chunkDistance = Math.max(Math.abs(dz), Math.abs(dx));
                 for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                     for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
-                        ChunkHolder holder = this.getUpdatingChunkIfPresent(CloPos.chunkAsLong(Coords.cubeToSection(pos.getX()+dx, sectionX), Coords.cubeToSection(pos.getZ()+dz, sectionZ)));
+                        ChunkHolder holder = this.getUpdatingChunkIfPresent(
+                                CloPos.chunkAsLong(Coords.cubeToSection(pos.getX() + dx, sectionX), Coords.cubeToSection(pos.getZ() + dz, sectionZ)));
                         if (holder == null) {
                             cir.setReturnValue(UNLOADED_CHUNK_LIST_FUTURE);
                             return;
                         }
                         ChunkStatus expectedStatus = statusByRadius.apply(chunkDistance);
-                        futures.add((CompletableFuture<ChunkResult<CloAccess>>) (Object) holder.scheduleChunkGenerationTask(expectedStatus, (ChunkMap) (Object) this));
+                        futures.add((CompletableFuture<ChunkResult<CloAccess>>) (Object) holder.scheduleChunkGenerationTask(expectedStatus,
+                                (ChunkMap) (Object) this));
                     }
                 }
                 for (int dy = -radius; dy <= radius; dy++) {
                     if (dx == 0 && dy == 0 && dz == 0) {
                         middleCubeIndex = futures.size();
                     }
-                    ChunkHolder holder = this.getUpdatingChunkIfPresent(CloPos.cubeAsLong(pos.getX()+dx, pos.getY()+dy, pos.getZ()+dz));
+                    ChunkHolder holder = this.getUpdatingChunkIfPresent(CloPos.cubeAsLong(pos.getX() + dx, pos.getY() + dy, pos.getZ() + dz));
                     if (holder == null) {
                         cir.setReturnValue(UNLOADED_CHUNK_LIST_FUTURE);
                         return;
                     }
                     ChunkStatus expectedStatus = statusByRadius.apply(Math.max(chunkDistance, Math.abs(dy)));
-                    futures.add((CompletableFuture<ChunkResult<CloAccess>>) (Object) holder.scheduleChunkGenerationTask(expectedStatus, (ChunkMap) (Object) this));
+                    futures.add((CompletableFuture<ChunkResult<CloAccess>>) (Object) holder.scheduleChunkGenerationTask(expectedStatus,
+                            (ChunkMap) (Object) this));
                 }
             }
         }
 
-        // Vanilla expects that the center chunk is in the middle of the list; this is not the case for cubes, so we manually swap the center cube to the middle
+        // Vanilla expects that the center chunk is in the middle of the list; this is not the case for cubes, so we manually swap the center cube to
+        // the middle
         // - this is a """temporary""" approach, that we may or may not actually fix later.
         Collections.swap(futures, middleCubeIndex, futures.size() / 2);
 
         cir.setReturnValue(Util.sequence(futures).thenApply(resultList -> {
             List<CloAccess> outputList = new ArrayList<>(resultList.size());
 
-            for(final ChunkResult<CloAccess> chunkResult : resultList) {
+            for (final ChunkResult<CloAccess> chunkResult : resultList) {
                 if (chunkResult == null) {
-                    throw this.debugFuturesAndCreateReportedException(new IllegalStateException("At least one of the chunk futures were null"), "n/a");
+                    throw this.debugFuturesAndCreateReportedException(new IllegalStateException("At least one of the chunk futures were null"),
+                            "n/a");
                 }
 
                 CloAccess cloAccess = chunkResult.orElse(null);
@@ -254,10 +272,11 @@ private void cc_onGetChunkRangeFuture(ChunkHolder cloHolder, int radius, IntFunc
             return ChunkResult.of(outputList);
         }));
     }
-    //endregion
+    // endregion
 
-    //region [cc_updateCubeScheduling dasm + mixin]
-    @AddTransformToSets(ChunkToCubeSet.ChunkMap_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCubeSet.class, value = @MethodSig("updateChunkScheduling(JILnet/minecraft/server/level/ChunkHolder;I)Lnet/minecraft/server/level/ChunkHolder;"))
+    // region [cc_updateCubeScheduling dasm + mixin]
+    @AddTransformToSets(ChunkToCubeSet.ChunkMap_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCubeSet.class, value = @MethodSig("updateChunkScheduling(JILnet/minecraft/server/level/ChunkHolder;I)Lnet/minecraft/server/level/ChunkHolder;"))
     @Nullable public native ChunkHolder cc_updateCubeScheduling(long cubePos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
 
     @Inject(method = "updateChunkScheduling", at = @At("HEAD"), cancellable = true)
@@ -266,9 +285,10 @@ private void cc_onUpdateChunkScheduling(long cloPos, int newLevel, ChunkHolder h
             cir.setReturnValue(cc_updateCubeScheduling(cloPos, newLevel, holder, oldLevel));
         }
     }
-    //endregion
+    // endregion
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
     private native void cc_onLevelChange(CloPos cloPos, IntSupplier intsupplier, int i, IntConsumer intconsumer);
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkMap_redirects.class, method = @MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
@@ -276,7 +296,8 @@ public void cc_onCubeLevelChange(CubePos cubePos, IntSupplier queueLevelGetter,
         cc_onLevelChange(CloPos.cube(cubePos), queueLevelGetter, ticketLevel, queueLevelSetter);
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("saveAllChunks(Z)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("saveAllChunks(Z)V"))
     public native void cc_saveAllChunks(boolean flush);
 
     @Inject(method = "saveAllChunks", at = @At("HEAD"), cancellable = true)
@@ -287,7 +308,8 @@ private void cc_onSaveAllChunks(boolean flush, CallbackInfo ci) {
         }
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("saveChunksEagerly(Ljava/util/function/BooleanSupplier;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("saveChunksEagerly(Ljava/util/function/BooleanSupplier;)V"))
     private native void cc_saveClosEagerly(BooleanSupplier hasMoreTime);
 
     @AddMethodToSets(containers = ChunkToCloSet.ChunkMap_redirects.class, method = @MethodSig("scheduleUnload(JLnet/minecraft/server/level/ChunkHolder;)V"))
@@ -295,8 +317,9 @@ private void cc_scheduleUnload(long chunkPos, ChunkHolder chunkHolder) {
         // TODO (P2) save/load
     }
 
-    //region [cc_scheduleChunkLoad dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("scheduleChunkLoad(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
+    // region [cc_scheduleChunkLoad dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("scheduleChunkLoad(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
     private native CompletableFuture<CloAccess> cc_scheduleChunkLoad(CloPos cloPos);
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkMap_redirects.class, method = @MethodSig("scheduleChunkLoad(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
@@ -304,39 +327,46 @@ private CompletableFuture<CloAccess> cc_scheduleChunkLoad(CubePos cubePos) {
         return cc_scheduleChunkLoad(CloPos.cube(cubePos));
     }
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_scheduleChunkLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;prefetch(Lio/github/opencubicchunks/cc_core/world/level/CloPos;)Ljava/util/concurrent/CompletableFuture;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_scheduleChunkLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;prefetch(Lio/github/opencubicchunks/cc_core/world/level/CloPos;)Ljava/util/concurrent/CompletableFuture;"))
     private CompletableFuture<?> cc_onScheduleChunkLoad_poiManagerPreFetch(PoiManager instance, CloPos cloPos) {
         // TODO (P2) save/load - PoiManager
         return CompletableFuture.completedFuture(null);
     }
-    //endregion
+    // endregion
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("handleChunkLoadFailure(Ljava/lang/Throwable;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("handleChunkLoadFailure(Ljava/lang/Throwable;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     private native ChunkResult<CloAccess> cc_handleChunkLoadFailure(Throwable exception, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(
-            value = @MethodSig("createEmptyChunk(Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(value = @MethodSig("createEmptyChunk(Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     private native CloAccess cc_createEmptyChunk(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("markPositionReplaceable(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("markPositionReplaceable(Lnet/minecraft/world/level/ChunkPos;)V"))
     private native void cc_markPositionReplaceable(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("markPosition(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkType;)B"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("markPosition(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkType;)B"))
     private native byte cc_markPosition(CloPos cloPos, ChunkType chunkType);
 
-    //region [cc_applyCubeStep dasm + mixin]
-    @AddTransformToSets(ChunkToCubeSet.ChunkMap_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCubeSet.class, value = @MethodSig("applyStep(Lnet/minecraft/server/level/GenerationChunkHolder;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;)Ljava/util/concurrent/CompletableFuture;"))
+    // region [cc_applyCubeStep dasm + mixin]
+    @AddTransformToSets(ChunkToCubeSet.ChunkMap_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCubeSet.class, value = @MethodSig("applyStep(Lnet/minecraft/server/level/GenerationChunkHolder;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;)Ljava/util/concurrent/CompletableFuture;"))
     public native CompletableFuture<CubeAccess> cc_applyCubeStep(
-        GenerationChunkHolder generationchunkholder, CubeStep chunkstep, StaticCache3D<GenerationChunkHolder> cache
+            GenerationChunkHolder generationchunkholder, CubeStep chunkstep, StaticCache3D<GenerationChunkHolder> cache
     );
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_applyCubeStep", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_applyCubeStep", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
     private Object cc_onApplyCubeStep_staticCacheGet(StaticCache3D instance, int x, int z, @Local(ordinal = 0) CubePos cubePos) {
         return instance.get(cubePos.getX(), cubePos.getY(), cubePos.getZ());
     }
-    //endregion
+    // endregion
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("scheduleGenerationTask(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/server/level/ChunkGenerationTask;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("scheduleGenerationTask(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/server/level/ChunkGenerationTask;"))
     public native ChunkGenerationTask cc_scheduleGenerationTask(ChunkStatus chunkstatus, CloPos cloPos);
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkMap_redirects.class, method = @MethodSig("scheduleGenerationTask(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/server/level/ChunkGenerationTask;"))
@@ -344,8 +374,9 @@ public ChunkGenerationTask cc_scheduleGenerationTask(ChunkStatus chunkstatus, Cu
         return cc_scheduleGenerationTask(chunkstatus, CloPos.cube(cubePos));
     }
 
-    //region [cc_runGenerationTask dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("runGenerationTask(Lnet/minecraft/server/level/ChunkGenerationTask;)V"))
+    // region [cc_runGenerationTask dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("runGenerationTask(Lnet/minecraft/server/level/ChunkGenerationTask;)V"))
     private native void cc_runGenerationTask(ChunkGenerationTask chunkgenerationtask);
 
     // Delegate to the cube method for cubes
@@ -356,9 +387,10 @@ private void cc_onVanillaRunGenerationTask(ChunkGenerationTask task, CallbackInf
             cc_runGenerationTask(task);
         }
     }
-    //endregion
+    // endregion
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("prepareEntityTickingChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("prepareEntityTickingChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
     public native CompletableFuture<ChunkResult<LevelClo>> cc_prepareEntityTickingChunk(ChunkHolder holder);
 
     @Inject(method = "prepareEntityTickingChunk", at = @At("HEAD"), cancellable = true)
@@ -368,7 +400,8 @@ private void cc_onVanillaPrepareEntityTickingChunk(ChunkHolder chunk, CallbackIn
         }
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("prepareTickingChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("prepareTickingChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
     public native CompletableFuture<ChunkResult<LevelClo>> cc_prepareTickingChunk(ChunkHolder holder);
 
     @Inject(method = "prepareTickingChunk", at = @At("HEAD"), cancellable = true)
@@ -378,10 +411,12 @@ private void cc_onVanillaPrepareTickingChunk(ChunkHolder chunk, CallbackInfoRetu
         }
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("onChunkReadyToSend(Lnet/minecraft/server/level/ChunkHolder;Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("onChunkReadyToSend(Lnet/minecraft/server/level/ChunkHolder;Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     private native void cc_onChunkReadyToSend(ChunkHolder chunkholder, LevelClo cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("prepareAccessibleChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("prepareAccessibleChunk(Lnet/minecraft/server/level/ChunkHolder;)Ljava/util/concurrent/CompletableFuture;"))
     public native CompletableFuture<ChunkResult<LevelClo>> cc_prepareAccessibleChunk(ChunkHolder holder);
 
     @Inject(method = "prepareAccessibleChunk", at = @At("HEAD"), cancellable = true)
@@ -391,7 +426,8 @@ private void cc_onVanillaPrepareAccessibleChunk(ChunkHolder chunk, CallbackInfoR
         }
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("saveChunkIfNeeded(Lnet/minecraft/server/level/ChunkHolder;J)Z"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("saveChunkIfNeeded(Lnet/minecraft/server/level/ChunkHolder;J)Z"))
     private native boolean cc_saveChunkIfNeeded(ChunkHolder holder, long gameTime);
 
     // TODO (P2): for now we just don't save (requires more things to be CC-ified to not crash)
@@ -415,19 +451,24 @@ private boolean cc_save(CloAccess cloAccess) {
 //    //endregion
 
     // This calls ChunkSerializer.getChunkTypeFromTag, which could be an issue?
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("isExistingChunkFull(Lnet/minecraft/world/level/ChunkPos;)Z"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("isExistingChunkFull(Lnet/minecraft/world/level/ChunkPos;)Z"))
     private native boolean cc_isExistingChunkFull(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("markChunkPendingToSend(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("markChunkPendingToSend(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V"))
     private native void cc_markChunkPendingToSend(ServerPlayer player, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("markChunkPendingToSend(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("markChunkPendingToSend(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     private static native void cc_markChunkPendingToSend(ServerPlayer player, LevelClo clo);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("dropChunk(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("dropChunk(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V"))
     private static native void cc_dropChunk(ServerPlayer player, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("getChunkToSend(J)Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("getChunkToSend(J)Lnet/minecraft/world/level/chunk/LevelChunk;"))
     public native LevelClo cc_getChunkToSend(long cloPos);
 
     // dumpChunks (low prio)
@@ -436,67 +477,86 @@ private boolean cc_save(CloAccess cloAccess) {
 
     // TODO (P2) readChunk: this.upgradeChunkTag might need a dasm redirect?
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("readChunk(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("readChunk(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
     private native CompletableFuture<Optional<CompoundTag>> cc_readChunk(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("collectSpawningChunks(Ljava/util/List;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("collectSpawningChunks(Ljava/util/List;)V"))
     native void cc_collectSpawningClos(List<LevelClo> list);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("forEachBlockTickingChunk(Ljava/util/function/Consumer;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("forEachBlockTickingChunk(Ljava/util/function/Consumer;)V"))
     native void cc_forEachBlockTickingClo(Consumer<LevelClo> consumer);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("anyPlayerCloseEnoughForSpawning(Lnet/minecraft/world/level/ChunkPos;)Z"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("anyPlayerCloseEnoughForSpawning(Lnet/minecraft/world/level/ChunkPos;)Z"))
     public native boolean cc_anyPlayerCloseEnoughForSpawning(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("anyPlayerCloseEnoughForSpawningInternal(Lnet/minecraft/world/level/ChunkPos;)Z"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("anyPlayerCloseEnoughForSpawningInternal(Lnet/minecraft/world/level/ChunkPos;)Z"))
     private native boolean cc_anyPlayerCloseEnoughForSpawningInternal(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("getPlayersCloseForSpawning(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/List;"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("getPlayersCloseForSpawning(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/List;"))
     public native List<ServerPlayer> cc_getPlayersCloseForSpawning(CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("playerIsCloseEnoughForSpawning(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)Z"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("playerIsCloseEnoughForSpawning(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)Z"))
     private native boolean cc_playerIsCloseEnoughForSpawning(ServerPlayer player, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("updatePlayerStatus(Lnet/minecraft/server/level/ServerPlayer;Z)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("updatePlayerStatus(Lnet/minecraft/server/level/ServerPlayer;Z)V"))
     public native void cc_updatePlayerStatus(ServerPlayer player, boolean track);
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("move(Lnet/minecraft/server/level/ServerPlayer;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("move(Lnet/minecraft/server/level/ServerPlayer;)V"))
     public native void cc_move(ServerPlayer player);
 
-    //region [cc_updateChunkTracking dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("updateChunkTracking(Lnet/minecraft/server/level/ServerPlayer;)V"))
+    // region [cc_updateChunkTracking dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("updateChunkTracking(Lnet/minecraft/server/level/ServerPlayer;)V"))
     private native void cc_updateChunkTracking(ServerPlayer player);
 
-    @Dynamic @WrapOperation(method = "cc_dasm$cc_updateChunkTracking", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;getPlayerViewDistance(Lnet/minecraft/server/level/ServerPlayer;)I"))
+    @Dynamic
+    @WrapOperation(method = "cc_dasm$cc_updateChunkTracking", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;getPlayerViewDistance(Lnet/minecraft/server/level/ServerPlayer;)I"))
     private int cc_onUpdateChunkTracking_getViewDistance(ChunkMap instance, ServerPlayer player, Operation<Integer> original) {
         return Coords.sectionToCubeRenderDistance(original.call(instance, player));
     }
-    //endregion
+    // endregion
 
-    //region [cc_applyChunkTrackingView dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("applyChunkTrackingView(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/level/ChunkTrackingView;)V"))
+    // region [cc_applyChunkTrackingView dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("applyChunkTrackingView(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/level/ChunkTrackingView;)V"))
     private native void cc_applyChunkTrackingView(ServerPlayer player, CloTrackingView chunkTrackingView);
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_applyChunkTrackingView", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
-    private void cc_onApplyChunkTrackingView_setChunkCacheCenterPacket(ServerGamePacketListenerImpl instance, Packet packet, ServerPlayer player, CloTrackingView cloTrackingView) {
-        PacketDistributor.sendToPlayer(player, new CCClientboundSetCubeCacheCenterPacket(((CloTrackingView.Positioned) cloTrackingView).center().cubePos()));
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_applyChunkTrackingView", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
+    private void cc_onApplyChunkTrackingView_setChunkCacheCenterPacket(
+            ServerGamePacketListenerImpl instance, Packet packet, ServerPlayer player, CloTrackingView cloTrackingView
+    ) {
+        PacketDistributor.sendToPlayer(player,
+                new CCClientboundSetCubeCacheCenterPacket(((CloTrackingView.Positioned) cloTrackingView).center().cubePos()));
     }
-    //endregion
+    // endregion
 
-    //region [cc_getPlayers dasm + mixin]
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
+    // region [cc_getPlayers dasm + mixin]
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
     public native List<ServerPlayer> cc_getPlayers(CloPos pos, boolean boundaryOnly);
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkOnTrackedBorder(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkOnTrackedBorder(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_getPlayers_isChunkOnTrackedBorder(ChunkMap instance, ServerPlayer player, int x, int z, @Local CloPos pos) {
         return this.cc_isChunkOnTrackedBorder(player, pos.getX(), pos.getY(), pos.getZ());
     }
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_getPlayers_isChunkTracked(ChunkMap instance, ServerPlayer player, int x, int z, @Local CloPos pos) {
         return this.cc_isChunkTracked(player, pos.getX(), pos.getY(), pos.getZ());
     }
-    //endregion
+    // endregion
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkMap_redirects.class, method = @MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
     @Override public List<ServerPlayer> cc_getPlayers(CubePos pos, boolean boundaryOnly) {
@@ -504,18 +564,23 @@ private boolean cc_getPlayers_isChunkTracked(ChunkMap instance, ServerPlayer pla
     }
 
     // Replace `SectionPos.chunk()` with `SectionPos.cc_cube()` unconditionally here
-    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class) @TransformFromMethod(value = @MethodSig("tick(Ljava/util/function/BooleanSupplier;)V"), useRedirectSets = { ChunkToCloSet.class, SectionPosToCubeSet.class })
+    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class)
+    @TransformFromMethod(value = @MethodSig("tick(Ljava/util/function/BooleanSupplier;)V"), useRedirectSets = { ChunkToCloSet.class,
+        SectionPosToCubeSet.class })
     protected native void cc_tick(BooleanSupplier hasMoreTime);
 
-    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class) @TransformFromMethod(value = @MethodSig("tick()V"), useRedirectSets = { ChunkToCloSet.class, SectionPosToCubeSet.class })
+    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class)
+    @TransformFromMethod(value = @MethodSig("tick()V"), useRedirectSets = { ChunkToCloSet.class, SectionPosToCubeSet.class })
     public native void cc_tick();
 
-    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class) @TransformFromMethod(value = @MethodSig("processUnloads(Ljava/util/function/BooleanSupplier;)V"))
+    @AddTransformToSets(GlobalSet.ChunkMap_redirects.class)
+    @TransformFromMethod(value = @MethodSig("processUnloads(Ljava/util/function/BooleanSupplier;)V"))
     private native void cc_processUnloads(BooleanSupplier hasMoreTime);
 
     // TODO resendBiomesForChunks - only used for FillBiomeCommand
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("onFullChunkStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("onFullChunkStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V"))
     public native void cc_onFullChunkStatusChange(CloPos cloPos, FullChunkStatus fullChunkStatus);
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkMap_redirects.class, method = @MethodSig("onFullChunkStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/server/level/FullChunkStatus;)V"))
@@ -523,6 +588,7 @@ public void cc_onFullChunkStatusChange(CubePos cubePos, FullChunkStatus fullChun
         cc_onFullChunkStatusChange(CloPos.cube(cubePos), fullChunkStatus);
     }
 
-    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class) @TransformFromMethod(@MethodSig("waitForLightBeforeSending(Lnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
+    @TransformFromMethod(@MethodSig("waitForLightBeforeSending(Lnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_waitForLightBeforeSending(CloPos cloPos, int p_301130_);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskDispatcher.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskDispatcher.java
index b4b8c397..2359b33c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskDispatcher.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskDispatcher.java
@@ -19,7 +19,8 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(ChunkTaskDispatcher.class)
 public class MixinChunkTaskDispatcher implements CubeHolder.LevelChangeListener, CloTaskDispatcher {
-    @AddTransformToSets(ChunkToCloSet.ChunkTaskDispatcher_redirects.class) @TransformFromMethod(owner = @Ref(ChunkTaskDispatcher.class), value = @MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkTaskDispatcher_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkTaskDispatcher.class), value = @MethodSig("onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
     @Override public native void cc_onLevelChange(CloPos cloPos, IntSupplier queueLevelGetter, int ticketLevel, IntConsumer queueLevelSetter);
 
     public void cc_onLevelChange(CubePos cubePos, IntSupplier queueLevelGetter, int ticketLevel, IntConsumer queueLevelSetter) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
index cb4405cc..5d01e15f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTaskPriorityQueue.java
@@ -34,6 +34,7 @@ private void cc_onResortChunkTasks(int queueLevel, ChunkPos chunkPos, int ticket
     }
 
     @UsedFromASM
-    @AddTransformToSets(ChunkToCloSet.ChunkTaskPriorityQueue_redirects.class) @TransformFromMethod(@MethodSig("resortChunkTasks(ILnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.ChunkTaskPriorityQueue_redirects.class)
+    @TransformFromMethod(@MethodSig("resortChunkTasks(ILnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_resortCubicTasks(int queueLevel, CloPos cloPos, int ticketLevel);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
index 08095ad0..e828c1b9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
@@ -21,9 +21,11 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * {@link ChunkTracker} is a class that determines the edges and as well as the values to be propagated to the edges in {@link DynamicGraphMinFixedPoint}.
+ * {@link ChunkTracker} is a class that determines the edges and as well as the values to be propagated to the edges in
+ * {@link DynamicGraphMinFixedPoint}.
  * It marks all chunks in a 1 chunk radius around the center as edges. Edge chunks have 1 level higher than the center chunk.
- * <br><br>
+ * <br>
+ * <br>
  * This mixin replaces {@link ChunkPos} with {@link CloPos} and adds in logic to handle propagation for cubes.
  */
 @Mixin(ChunkTracker.class)
@@ -31,26 +33,27 @@ public abstract class MixinChunkTracker extends DynamicGraphMinFixedPoint implem
     protected boolean cc_isCubic;
     private int cc_noChunkLevel;
 
-    /** This is a list of all loaded cubes grouped by "big" column positions (32x32 columns) since cubes are 32x32x32.
-     * It is needed for quick lookups to determine which cubes are next to a column when propagating level. */
+    /**
+     * This is a list of all loaded cubes grouped by "big" column positions (32x32 columns) since cubes are 32x32x32.
+     * It is needed for quick lookups to determine which cubes are next to a column when propagating level.
+     */
     private Long2ObjectMap<IntSet> cc_existingCubesForCubeColumns;
 
     protected MixinChunkTracker() {
         super(0, 0, 0);
     }
 
-    @Override
-    public void cc_setCubic() {
+    @Override public void cc_setCubic() {
         cc_isCubic = true;
         cc_existingCubesForCubeColumns = new Long2ObjectLinkedOpenHashMap<>();
-        cc_noChunkLevel = levelCount-1;
+        cc_noChunkLevel = levelCount - 1;
     }
 
     @Override public boolean cc_isCubic() {
         return cc_isCubic;
     }
 
-    @Redirect(method="*", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/ChunkPos;INVALID_CHUNK_POS:J"))
+    @Redirect(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/ChunkPos;INVALID_CHUNK_POS:J"))
     private long cc_sentinelValue() {
         if (cc_isCubic)
             return CloPos.INVALID_CLO_POS;
@@ -58,12 +61,15 @@ private long cc_sentinelValue() {
     }
 
     @ModifyConstant(method = "computeLevelFromNeighbor", constant = @Constant(intValue = 1))
-    private int cc_dontIncrementLevelOnCubeChunkEdge(int constant, @Local(ordinal = 0, argsOnly = true) long startPos, @Local(ordinal = 1, argsOnly = true) long endPos) {
-        if (cc_isCubic && CloPos.isCube(startPos) && CloPos.isChunk(endPos)) return 0;
+    private int cc_dontIncrementLevelOnCubeChunkEdge(
+            int constant, @Local(ordinal = 0, argsOnly = true) long startPos, @Local(ordinal = 1, argsOnly = true) long endPos
+    ) {
+        if (cc_isCubic && CloPos.isCube(startPos) && CloPos.isChunk(endPos))
+            return 0;
         return constant;
     }
 
-    @Inject(method="checkNeighborsAfterUpdate", at=@At("HEAD"), cancellable = true)
+    @Inject(method = "checkNeighborsAfterUpdate", at = @At("HEAD"), cancellable = true)
     private void cc_onCheckNeighborsAfterUpdate(long pos, int level, boolean isDecreasing, CallbackInfo ci) {
         if (cc_isCubic) {
             ci.cancel();
@@ -73,16 +79,19 @@ private void cc_onCheckNeighborsAfterUpdate(long pos, int level, boolean isDecre
 
     /**
      * This computes the propagation of the level from neighbor to neighbor.
-     * <br><br>
+     * <br>
+     * <br>
      * We have to handle two cases: whether we are propagating to a column or a cube.
-     * <br><br>
+     * <br>
+     * <br>
      * However, it is important to note that you cannot propagate from a column to a cube. This is because
      * if we did do that, then a single column could potentially load an infinite amount of cubes. So only
      * cubes can propagate to a column, or cubes propagating to cubes.
      */
-    @Inject(method = "getComputedLevel", at=@At("HEAD"), cancellable = true)
+    @Inject(method = "getComputedLevel", at = @At("HEAD"), cancellable = true)
     private void cc_onGetComputedLevel(long pos, long excludedSourcePos, int level, CallbackInfoReturnable<Integer> cir) {
-        if (!cc_isCubic) return;
+        if (!cc_isCubic)
+            return;
         if (CloPos.isChunk(pos)) {
             int out = level;
 
@@ -163,13 +172,14 @@ private void cc_onGetComputedLevel(long pos, long excludedSourcePos, int level,
 
     /**
      * This function adds in new cubes and sorts them into the cube column map.
-     * <br><br>
+     * <br>
+     * <br>
      * It should be called from each implementation of {@link DynamicGraphMinFixedPoint#setLevel(long, int)} on a ChunkTracker subclass.
      * For CC, this is handled by:
      * <ul>
-     *     <li>{@link MixinFixedPlayerDistanceChunkTracker#cc_onSetLevel(long, int)}.</li>
-     *     <li>{@link MixinLoadingChunkTracker#cc_onSetLevel(long, int)}.</li>
-     *     <li>{@link MixinSimulationChunkTracker#cc_onSetLevel(long, int)}.</li>
+     * <li>{@link MixinFixedPlayerDistanceChunkTracker#cc_onSetLevel(long, int)}.</li>
+     * <li>{@link MixinLoadingChunkTracker#cc_onSetLevel(long, int)}.</li>
+     * <li>{@link MixinSimulationChunkTracker#cc_onSetLevel(long, int)}.</li>
      * </ul>
      */
     protected void cc_onSetLevel(long pos, int level) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView$Positioneed.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView$Positioneed.java
index 251fbd36..7f34ee6e 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView$Positioneed.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView$Positioneed.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CloTrackingView.Positioned.class)
-public class MixinCloTrackingView$Positioneed {
-}
+public class MixinCloTrackingView$Positioneed {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView.java
index 39809aa0..d8918e84 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCloTrackingView.java
@@ -6,5 +6,4 @@
 // Needed for DASM to apply
 // TODO won't be necessary once we have dasm.json
 @Mixin(CloTrackingView.class)
-public interface MixinCloTrackingView {
-}
+public interface MixinCloTrackingView {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCubeLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCubeLevel.java
index 87ea5b7f..b633464f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCubeLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinCubeLevel.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CubeLevel.class)
-public class MixinCubeLevel {
-}
+public class MixinCubeLevel {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
index ce6e5018..ccee35f9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
@@ -25,7 +25,8 @@
  * {@link DistanceManager} contains the main ticket hashmap and stores all the chunks that are loaded.
  * A ticket inside {@link DistanceManager} means that something is either requested to be loaded or is already loaded and needs to stay loaded.
  * It informs {@link ChunkMap} of what chunks it needs to generate/load/unload to satisfy the tickets.
- * <br><br>
+ * <br>
+ * <br>
  * This mixin mostly just replaces calls to ChunkPos with CloPos.
  */
 @Dasm(ChunkToCloSet.class)
@@ -38,8 +39,7 @@ public abstract class MixinDistanceManager implements MarkableAsCubic {
     @Shadow @Final private DistanceManager.FixedPlayerDistanceChunkTracker naturalSpawnChunkCounter;
     @Shadow @Final private DistanceManager.PlayerTicketTracker playerTicketManager;
 
-    @Override
-    public void cc_setCubic() {
+    @Override public void cc_setCubic() {
         cc_isCubic = true;
         ((MarkableAsCubic) this.loadingChunkTracker).cc_setCubic();
         ((MarkableAsCubic) this.simulationChunkTracker).cc_setCubic();
@@ -53,12 +53,12 @@ public void cc_setCubic() {
 
     /**
      * This function replaces the addTicket call with a cubic version instead.
-     *
      * This requires replacing the ChunkPos with a CloPos.
      */
     @WrapWithCondition(method = "addPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/TicketStorage;addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     private boolean cc_replaceTicketTypeOnAddPlayer(TicketStorage instance, Ticket ticket, ChunkPos chunkPos, SectionPos sectionPos) {
-        if(!cc_isCubic) return true;
+        if (!cc_isCubic)
+            return true;
         CloPos cloPos = CloPos.section(sectionPos);
         ((CubicTicketStorage) instance).cc_addTicket(ticket, cloPos);
         return false;
@@ -66,12 +66,12 @@ private boolean cc_replaceTicketTypeOnAddPlayer(TicketStorage instance, Ticket t
 
     /**
      * This function replaces the removeTicket call with a cubic version instead.
-     *
      * This requires replacing ChunkPos with a CloPos.
      */
     @WrapWithCondition(method = "removePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/TicketStorage;removeTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     private boolean cc_replaceTicketTypeOnRemovePlayer(TicketStorage instance, Ticket ticket, ChunkPos chunkPos, SectionPos sectionPos) {
-        if(!cc_isCubic) return true;
+        if (!cc_isCubic)
+            return true;
         CloPos cloPos = CloPos.section(sectionPos);
         ((CubicTicketStorage) instance).cc_removeTicket(ticket, cloPos);
         return false;
@@ -82,7 +82,8 @@ private boolean cc_replaceTicketTypeOnRemovePlayer(TicketStorage instance, Ticke
      */
     @WrapOperation(method = "addPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;toLong()J"))
     private long cc_replaceTicketTypeOnAddPlayer(ChunkPos chunkPos, Operation<Long> original, SectionPos sectionPos) {
-        if(!cc_isCubic) return original.call(chunkPos);
+        if (!cc_isCubic)
+            return original.call(chunkPos);
         return CloPos.section(sectionPos).toLong();
     }
 
@@ -91,7 +92,8 @@ private long cc_replaceTicketTypeOnAddPlayer(ChunkPos chunkPos, Operation<Long>
      */
     @WrapOperation(method = "removePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;toLong()J"))
     private long cc_replaceTicketTypeOnRemovePlayer(ChunkPos chunkPos, Operation<Long> original, SectionPos sectionPos) {
-        if(!cc_isCubic) return original.call(chunkPos);
+        if (!cc_isCubic)
+            return original.call(chunkPos);
         return CloPos.section(sectionPos).toLong();
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
index a44d53ce..bb4c108c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
@@ -44,8 +44,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * The vanilla {@link GenerationChunkHolder} class wraps completable futures for different statuses (load levels) of a single chunk and handles logic for scheduling generation of that chunk.
- * This mixin adds cubic chunks equivalents for methods where necessary, to allow GenerationChunkHolder to dynamically wrap either a chunk or a cube (i.e. a CLO).
+ * The vanilla {@link GenerationChunkHolder} class wraps completable futures for different statuses (load levels) of a single chunk and handles logic
+ * for scheduling generation of that chunk.
+ * This mixin adds cubic chunks equivalents for methods where necessary, to allow GenerationChunkHolder to dynamically wrap either a chunk or a cube
+ * (i.e. a CLO).
  */
 @Dasm(ChunkToCubeSet.class)
 @Mixin(GenerationChunkHolder.class)
@@ -65,13 +67,17 @@ public abstract class MixinGenerationChunkHolder implements GenerationCloHolder
         return CloPos.chunk(pos);
     }
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("<init>(Lnet/minecraft/world/level/ChunkPos;)V"))
     public MixinGenerationChunkHolder() {
         throw new DasmFailedToApply();
     }
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("applyStep(Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/server/level/GeneratingChunkMap;Lnet/minecraft/util/StaticCache2D;)Ljava/util/concurrent/CompletableFuture;"))
-    native CompletableFuture<ChunkResult<CubeAccess>> cc_applyCubeStep(CubeStep step, GeneratingChunkMap chunkMap, StaticCache3D<GenerationChunkHolder> cache);
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("applyStep(Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/server/level/GeneratingChunkMap;Lnet/minecraft/util/StaticCache2D;)Ljava/util/concurrent/CompletableFuture;"))
+    native CompletableFuture<ChunkResult<CubeAccess>> cc_applyCubeStep(
+            CubeStep step, GeneratingChunkMap chunkMap, StaticCache3D<GenerationChunkHolder> cache
+    );
 
     @WrapOperation(method = "updateHighestAllowedStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkLevel;generationStatus(I)Lnet/minecraft/world/level/chunk/status/ChunkStatus;"))
     @Nullable protected ChunkStatus cc_onUpdateHighestAllowedStatus_generationStatus(int level, Operation<ChunkStatus> original) {
@@ -81,29 +87,36 @@ public MixinGenerationChunkHolder() {
         return original.call(level);
     }
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("replaceProtoChunk(Lnet/minecraft/world/level/chunk/ImposterProtoChunk;)V"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("replaceProtoChunk(Lnet/minecraft/world/level/chunk/ImposterProtoChunk;)V"))
     public native void cc_replaceProtoCube(ImposterProtoCube cube);
 
     @WrapOperation(method = "rescheduleChunkTask", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;scheduleGenerationTask(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/server/level/ChunkGenerationTask;"))
-    private ChunkGenerationTask cc_onRescheduleChunkTask_scheduleGenerationTask(ChunkMap instance, ChunkStatus status, ChunkPos chunkPos, Operation<ChunkGenerationTask> original) {
+    private ChunkGenerationTask cc_onRescheduleChunkTask_scheduleGenerationTask(
+            ChunkMap instance, ChunkStatus status, ChunkPos chunkPos, Operation<ChunkGenerationTask> original
+    ) {
         if (cc_cubePos != null) {
             return ((CubicChunkMap) instance).cc_scheduleGenerationTask(status, cc_cubePos);
         }
         return original.call(instance, status, chunkPos);
     }
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("completeFuture(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/chunk/ChunkAccess;)V"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("completeFuture(Lnet/minecraft/world/level/chunk/status/ChunkStatus;Lnet/minecraft/world/level/chunk/ChunkAccess;)V"))
     private native void cc_completeFuture(ChunkStatus targetStatus, CubeAccess cubeAccess);
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresentUnchecked(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresentUnchecked(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     @Nullable public native CubeAccess cc_getCubeIfPresentUnchecked(ChunkStatus status);
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresent(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresent(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     @Nullable public native CubeAccess cc_getCubeIfPresent(ChunkStatus status);
 
     @Shadow @Nullable public abstract ChunkAccess getLatestChunk();
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getLatestChunk()Lnet/minecraft/world/level/chunk/ChunkAccess;"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getLatestChunk()Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     @Nullable public native CubeAccess cc_getLatestCube();
 
     @AddMethodToSets(containers = ChunkToCloSet.GenerationChunkHolder_redirects.class, method = @MethodSig("getLatestChunk()Lnet/minecraft/world/level/chunk/ChunkAccess;"))
@@ -114,16 +127,20 @@ private ChunkGenerationTask cc_onRescheduleChunkTask_scheduleGenerationTask(Chun
         return (CloAccess) getLatestChunk();
     }
 
-    @SuppressWarnings("unchecked") @Inject(method = "getPersistedStatus", at = @At("HEAD"), cancellable = true)
+    @SuppressWarnings("unchecked")
+    @Inject(method = "getPersistedStatus", at = @At("HEAD"), cancellable = true)
     public void cc_onGetPersistedStatus(CallbackInfoReturnable<ChunkStatus> cir) {
         if (cc_cubePos != null) {
-            CompletableFuture<ChunkResult<CubeAccess>> completablefuture = (CompletableFuture<ChunkResult<CubeAccess>>) (Object) this.futures.get(ChunkStatus.EMPTY.getIndex());
-            CubeAccess cubeAccess = completablefuture == null ? null : completablefuture.getNow((ChunkResult<CubeAccess>) (Object) NOT_DONE_YET).orElse(null);
+            CompletableFuture<ChunkResult<CubeAccess>> completablefuture = (CompletableFuture<ChunkResult<CubeAccess>>) (Object) this.futures
+                    .get(ChunkStatus.EMPTY.getIndex());
+            CubeAccess cubeAccess = completablefuture == null ? null
+                    : completablefuture.getNow((ChunkResult<CubeAccess>) (Object) NOT_DONE_YET).orElse(null);
             cir.setReturnValue(cubeAccess == null ? null : cubeAccess.getPersistedStatus());
         }
     }
 
-    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class) @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))
+    @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
+    @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))
     public native CubePos cc_getCubePos();
 
     // TODO getLatestStatus - only used for vanilla debug code
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerRespawnLogic.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerRespawnLogic.java
index 2f5da73c..0999a71c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerRespawnLogic.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerRespawnLogic.java
@@ -24,7 +24,6 @@ private static void cc_onGetOverworldRespawnPos(ServerLevel level, int posX, int
             return;
         }
         cir.setReturnValue(SpawnPlaceFinder.getTopBlockBisect(level, new BlockPos(posX, 0, posZ), false,
-            pos -> level.getBlockState(pos).is(BlockTags.VALID_SPAWN),
-            pos -> level.getBlockState(pos).getCollisionShape(level, pos).isEmpty()));
+                pos -> level.getBlockState(pos).is(BlockTags.VALID_SPAWN), pos -> level.getBlockState(pos).getCollisionShape(level, pos).isEmpty()));
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
index a0c18efc..3105dd1b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
@@ -17,16 +17,20 @@
 
 @Mixin(DistanceManager.PlayerTicketTracker.class)
 public abstract class MixinPlayerTicketTracker extends MixinFixedPlayerDistanceChunkTracker {
-    @SuppressWarnings("target") @Shadow @Final DistanceManager this$0;
+    @SuppressWarnings("target")
+    @Shadow @Final DistanceManager this$0;
 
     /**
      * This modifies the lambda inside Distance.this.ticketDispatcher.onLevelChange to use a CloPos instead of a ChunkPos.
      */
     @WrapWithCondition(method = "runAllUpdates", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ThrottlingChunkTaskDispatcher;onLevelChange(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/IntSupplier;ILjava/util/function/IntConsumer;)V"))
-    private boolean cc_onRunAllUpdates(ThrottlingChunkTaskDispatcher instance, ChunkPos chunkPos, IntSupplier intSupplier, int i, IntConsumer intConsumer) {
-        if(!cc_isCubic) return true;
-        ((CloTaskDispatcher)((DistanceManagerAccess)this$0).cc_ticketDispatcher())
-            .cc_onLevelChange(CloPos.fromLong(chunkPos.toLong()), intSupplier, i, intConsumer);
+    private boolean cc_onRunAllUpdates(
+            ThrottlingChunkTaskDispatcher instance, ChunkPos chunkPos, IntSupplier intSupplier, int i, IntConsumer intConsumer
+    ) {
+        if (!cc_isCubic)
+            return true;
+        ((CloTaskDispatcher) ((DistanceManagerAccess) this$0).cc_ticketDispatcher()).cc_onLevelChange(CloPos.fromLong(chunkPos.toLong()), intSupplier,
+                i, intConsumer);
         return false;
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
index f910fd08..70c4d6ef 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
@@ -67,7 +67,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- * The vanilla {@link ServerChunkCache} class stores all loaded chunks on the server and has methods for getting chunks, ticking all chunks, handling block+light updates, managing chunkloading tickets, etc.
+ * The vanilla {@link ServerChunkCache} class stores all loaded chunks on the server and has methods for getting chunks, ticking all chunks, handling
+ * block+light updates, managing chunkloading tickets, etc.
  * This mixin adds versions of these methods for cubes, meaning that this class now stores and manages both cubes and chunks.
  */
 @Dasm(ChunkToCubeSet.class)
@@ -109,43 +110,60 @@ public abstract class MixinServerChunkCache extends MixinChunkSource implements
     @Shadow @Final private Set<ChunkHolder> chunkHoldersToBroadcast;
 
     @Inject(method = "<init>", at = @At("CTOR_HEAD"))
-    private void cc_onInit(ServerLevel level, LevelStorageSource.LevelStorageAccess levelStorageAccess, DataFixer fixerUpper, StructureTemplateManager structureManager, Executor dispatcher,
-                        ChunkGenerator generator, int viewDistance, int simulationDistance, boolean sync, ChunkProgressListener progressListener,
-                        ChunkStatusUpdateListener chunkStatusListener, Supplier overworldDataStorage, CallbackInfo ci) {
-        if (((CanBeCubic) level).cc_isCubic())  {
+    private void cc_onInit(
+            ServerLevel level, LevelStorageSource.LevelStorageAccess levelStorageAccess, DataFixer fixerUpper,
+            StructureTemplateManager structureManager, Executor dispatcher, ChunkGenerator generator, int viewDistance, int simulationDistance,
+            boolean sync, ChunkProgressListener progressListener, ChunkStatusUpdateListener chunkStatusListener, Supplier overworldDataStorage,
+            CallbackInfo ci
+    ) {
+        if (((CanBeCubic) level).cc_isCubic()) {
             this.cc_setCubic();
         }
     }
 
-    @AddTransformToSets(ChunkToCubeSet.ServerChunkCache_redirects.class) @TransformFromMethod(@MethodSig("storeInCache(JLnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
+    @AddTransformToSets(ChunkToCubeSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(@MethodSig("storeInCache(JLnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
     private native void cc_storeInCache(long pChunkPos, CubeAccess pChunk, ChunkStatus pChunkStatus);
 
     @TransformFromMethod(@MethodSig("getChunk(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
     @Override @Nullable public native CubeAccess cc_getCube(int chunkX, @AddUnusedParam int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load);
 
     // mixin-into-dasm to replace call to getChunk with getCube
-    @Dynamic @Inject(method = "cc_dasm$cc_getCube", cancellable = true, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
-    private void cc_getCube_supplyAsync(int pChunkX, int pChunkY, int pChunkZ, ChunkStatus pRequiredStatus, boolean pLoad, CallbackInfoReturnable<CubeAccess> cir) {
-        cir.setReturnValue(CompletableFuture.supplyAsync(() -> this.cc_getCube(pChunkX, pChunkY, pChunkZ, pRequiredStatus, pLoad), this.mainThreadProcessor).join());
+    @Dynamic
+    @Inject(method = "cc_dasm$cc_getCube", cancellable = true, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
+    private void cc_getCube_supplyAsync(
+            int pChunkX, int pChunkY, int pChunkZ, ChunkStatus pRequiredStatus, boolean pLoad, CallbackInfoReturnable<CubeAccess> cir
+    ) {
+        cir.setReturnValue(CompletableFuture
+                .supplyAsync(() -> this.cc_getCube(pChunkX, pChunkY, pChunkZ, pRequiredStatus, pLoad), this.mainThreadProcessor).join());
     }
 
-    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of getCube
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
+    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
+    // params of getCube
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
 
-    // The second through fifth params are the params to the call being redirected; the next three params are the x/y/z coordinates in the params of getCube
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;getChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
-    private CompletableFuture cc_getCube_getChunkFutureMainThread(ServerChunkCache instance, int chunkX, int chunkZ, ChunkStatus requiredStatus, boolean load, int chunkXRepeated, int chunkY, int chunkZRepeated) {
+    // The second through fifth params are the params to the call being redirected; the next three params are the x/y/z coordinates in the params of
+    // getCube
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;getChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
+    private CompletableFuture cc_getCube_getChunkFutureMainThread(
+            ServerChunkCache instance, int chunkX, int chunkZ, ChunkStatus requiredStatus, boolean load, int chunkXRepeated, int chunkY,
+            int chunkZRepeated
+    ) {
         return this.cc_getCubeFutureMainThread(chunkX, chunkY, chunkZ, requiredStatus, load);
     }
 
     @TransformFromMethod(@MethodSig("getChunkNow(II)Lnet/minecraft/world/level/chunk/LevelChunk;"))
     @Override @Nullable public native LevelCube cc_getCubeNow(int pChunkX, @AddUnusedParam int chunkY, int pChunkZ);
 
-    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of getCubeNow
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
+    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
+    // params of getCubeNow
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCubeNow_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
@@ -164,20 +182,16 @@ private void cc_onClearCache(CallbackInfo ci) {
     }
 
     // This method requires enough manual redirects that we just replace it entirely
-    @Override
-    public CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFuture(
-        int pX, int chunkY, int pZ, ChunkStatus pChunkStatus, boolean pLoad
-    ) {
+    @Override public CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFuture(int pX, int chunkY, int pZ, ChunkStatus pChunkStatus, boolean pLoad) {
         boolean flag = Thread.currentThread() == this.mainThread;
         CompletableFuture<ChunkResult<CubeAccess>> completablefuture;
         if (flag) {
             completablefuture = this.cc_getCubeFutureMainThread(pX, chunkY, pZ, pChunkStatus, pLoad);
             this.mainThreadProcessor.managedBlock(completablefuture::isDone);
         } else {
-            completablefuture = CompletableFuture.supplyAsync(
-                    () -> this.cc_getCubeFutureMainThread(pX, chunkY, pZ, pChunkStatus, pLoad), this.mainThreadProcessor
-                )
-                .thenCompose(p_8413_ -> p_8413_);
+            completablefuture = CompletableFuture
+                    .supplyAsync(() -> this.cc_getCubeFutureMainThread(pX, chunkY, pZ, pChunkStatus, pLoad), this.mainThreadProcessor)
+                    .thenCompose(p_8413_ -> p_8413_);
         }
 
         return completablefuture;
@@ -185,11 +199,13 @@ public CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFuture(
 
     @TransformFromMethod(@MethodSig("getChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
     private native CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFutureMainThread(
-        int pX, @AddUnusedParam int chunkY, int pZ, ChunkStatus pChunkStatus, boolean pLoad
+            int pX, @AddUnusedParam int chunkY, int pZ, ChunkStatus pChunkStatus, boolean pLoad
     );
 
-    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of cc_getCubeFutureMainThread
-    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
+    // params of cc_getCubeFutureMainThread
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
     private CubePos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CubePos.of(pX, pY, pZ);
     }
@@ -197,8 +213,10 @@ private CubePos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int
     @TransformFromMethod(@MethodSig("hasChunk(II)Z"))
     public native boolean cc_hasCube(int pX, @AddUnusedParam int y, int pZ);
 
-    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the params of cc_hasCube
-    @Dynamic @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
+    // params of cc_hasCube
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
     private CubePos cc_hasCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CubePos.of(pX, pY, pZ);
     }
@@ -216,10 +234,12 @@ private void cc_onTick(BooleanSupplier hasTimeLeft, boolean tickChunks, Callback
         }
     }
 
-    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class) @TransformFromMethod(@MethodSig("tick(Ljava/util/function/BooleanSupplier;Z)V"))
+    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(@MethodSig("tick(Ljava/util/function/BooleanSupplier;Z)V"))
     public native void cc_tick(BooleanSupplier hasTimeLeft, boolean tickChunks);
 
-    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("broadcastChangedChunks(Lnet/minecraft/util/profiling/ProfilerFiller;)V"))
+    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("broadcastChangedChunks(Lnet/minecraft/util/profiling/ProfilerFiller;)V"))
     private native void cc_broadcastChangedClos(ProfilerFiller profiler);
 
     @Inject(method = "broadcastChangedChunks", at = @At("HEAD"), cancellable = true)
@@ -230,7 +250,8 @@ private void cc_onVanillaBroadcastChangedChunks(ProfilerFiller profiler, Callbac
         }
     }
 
-    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;J)V"))
+    @AddTransformToSets(GlobalSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;J)V"))
     private native void cc_tickClos(ProfilerFiller profiler, long timeInhabited);
 
     @Inject(method = "tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;J)V", at = @At("HEAD"), cancellable = true)
@@ -269,22 +290,25 @@ private void cc_onVanillaOnLightUpdate(LightLayer type, SectionPos pos, Callback
         }
     }
 
-    @Override
-    @AddMethodToSets(containers = GlobalSet.ServerChunkCache_redirects.class, method = @MethodSig("onLightUpdate(Lnet/minecraft/world/level/LightLayer;Lnet/minecraft/core/SectionPos;)V"))
+    @Override @AddMethodToSets(containers = GlobalSet.ServerChunkCache_redirects.class, method = @MethodSig("onLightUpdate(Lnet/minecraft/world/level/LightLayer;Lnet/minecraft/core/SectionPos;)V"))
     public void cc_onLightUpdate(LightLayer pType, SectionPos pPos) {
         // TODO (P2) lighting
     }
 
-    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     public native void cc_addTicket(Ticket ticket, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("addTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("addTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_addTicketWithRadius(TicketType ticket, CloPos cloPos, int radius);
 
-    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("removeTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("removeTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_removeTicketWithRadius(TicketType ticket, CloPos cloPos, int radius);
 
-    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class) @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)Z"))
+    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(useRedirectSets = ChunkToCloSet.class, value = @MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)Z"))
     public native boolean cc_updateCloForced(CloPos pPos, boolean pAdd);
 
     // Cube-specific methods that delegate to the corresponding Clo methods
@@ -309,6 +333,7 @@ public void cc_removeTicketWithRadius(TicketType ticket, CubePos cubePos, int ra
     }
 
     // TODO should probably be implemented properly, but is low priority (debug)
-    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class) @TransformFromMethod(@MethodSig("getChunkDebugData(Lnet/minecraft/world/level/ChunkPos;)Ljava/lang/String;"))
+    @AddTransformToSets(ChunkToCloSet.ServerChunkCache_redirects.class)
+    @TransformFromMethod(@MethodSig("getChunkDebugData(Lnet/minecraft/world/level/ChunkPos;)Ljava/lang/String;"))
     public native String cc_getChunkDebugData(CloPos pChunkPos);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
index 4e7bd7f5..ec1fbb8d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
@@ -1,6 +1,5 @@
 package io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level;
 
-
 import java.util.List;
 import java.util.concurrent.Executor;
 
@@ -10,7 +9,6 @@
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddTransformToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.mixin.core.common.world.level.MixinLevel;
@@ -45,9 +43,11 @@ public abstract class MixinServerLevel extends MixinLevel implements CubicServer
     @Shadow @Final private ServerChunkCache chunkSource;
 
     @Inject(method = "<init>", at = @At("CTOR_HEAD"))
-    private void cc_onInit(MinecraftServer server, Executor dispatcher, LevelStorageSource.LevelStorageAccess levelStorageAccess, ServerLevelData serverLevelData, ResourceKey dimension,
-                           LevelStem levelStem, ChunkProgressListener progressListener, boolean isDebug, long biomeZoomSeed, List customSpawners, boolean tickTime,
-                           RandomSequences randomSequences, CallbackInfo ci) {
+    private void cc_onInit(
+            MinecraftServer server, Executor dispatcher, LevelStorageSource.LevelStorageAccess levelStorageAccess, ServerLevelData serverLevelData,
+            ResourceKey dimension, LevelStem levelStem, ChunkProgressListener progressListener, boolean isDebug, long biomeZoomSeed,
+            List customSpawners, boolean tickTime, RandomSequences randomSequences, CallbackInfo ci
+    ) {
         // TODO conditionally mark as cubic based on dimension, config, level data, etc
     }
 
@@ -55,11 +55,14 @@ private void cc_onInit(MinecraftServer server, Executor dispatcher, LevelStorage
         return ((ServerCubeCache) this.chunkSource);
     }
 
-    @AddTransformToSets(ChunkToCloSet.ServerLevel_redirects.class) @TransformFromMethod(@MethodSig("startTickingChunk(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
+    @AddTransformToSets(ChunkToCloSet.ServerLevel_redirects.class)
+    @TransformFromMethod(@MethodSig("startTickingChunk(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     public native void cc_startTickingClo(LevelClo chunk);
 
     @WrapOperation(method = "setDefaultSpawnPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;removeTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
-    private void cc_onSetDefaultSpawnPos_removeTicketWithRadius(ServerChunkCache instance, TicketType ticket, ChunkPos chunkPos, int radius, Operation<Void> original, BlockPos pos) {
+    private void cc_onSetDefaultSpawnPos_removeTicketWithRadius(
+            ServerChunkCache instance, TicketType ticket, ChunkPos chunkPos, int radius, Operation<Void> original, BlockPos pos
+    ) {
         if (cc_isCubic) {
             ((ServerCubeCache) instance).cc_removeTicketWithRadius(ticket, CloPos.cube(pos), radius);
         } else {
@@ -68,7 +71,9 @@ private void cc_onSetDefaultSpawnPos_removeTicketWithRadius(ServerChunkCache ins
     }
 
     @WrapOperation(method = "setDefaultSpawnPos", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;addTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
-    private void cc_onSetDefaultSpawnPos_addicketWithRadius(ServerChunkCache instance, TicketType ticket, ChunkPos chunkPos, int radius, Operation<Void> original, BlockPos pos) {
+    private void cc_onSetDefaultSpawnPos_addicketWithRadius(
+            ServerChunkCache instance, TicketType ticket, ChunkPos chunkPos, int radius, Operation<Void> original, BlockPos pos
+    ) {
         if (cc_isCubic) {
             ((ServerCubeCache) instance).cc_addTicketWithRadius(ticket, CloPos.cube(pos), radius);
         } else {
@@ -80,7 +85,8 @@ private void cc_onSetDefaultSpawnPos_addicketWithRadius(ServerChunkCache instanc
     public void cc_tickClo(LevelClo levelClo, int randomTickSpeed) {
         if (levelClo instanceof LevelCube levelCube) {
             cc_tickCube(levelCube, randomTickSpeed);
-        } {
+        }
+        {
             // TODO (P2) chunk ticking for anything that still needs to happen on chunks (probably just the forge event for mods?)
         }
     }
@@ -102,4 +108,4 @@ public void cc_tickCube(LevelCube levelCube, int randomTickSpeed) {
 
     // TODO: phase 2 - isPositionEntityTicking - mixin
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerPlayer.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerPlayer.java
index a21755f5..9a98480b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerPlayer.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerPlayer.java
@@ -21,10 +21,12 @@ public abstract class MixinServerPlayer extends MixinEntity implements CCServerP
     @AddFieldToSets(containers = ChunkToCloSet.ServerPlayer_redirects.class, field = @FieldSig(type = @Ref(ChunkTrackingView.class), name = "chunkTrackingView"))
     private CloTrackingView cc_cloTrackingView = CloTrackingView.EMPTY;
 
-    @AddTransformToSets(ChunkToCloSet.ServerPlayer_redirects.class) @TransformFromMethod(@MethodSig("getChunkTrackingView()Lnet/minecraft/server/level/ChunkTrackingView;"))
+    @AddTransformToSets(ChunkToCloSet.ServerPlayer_redirects.class)
+    @TransformFromMethod(@MethodSig("getChunkTrackingView()Lnet/minecraft/server/level/ChunkTrackingView;"))
     public native CloTrackingView cc_getCloTrackingView();
 
-    @AddTransformToSets(ChunkToCloSet.ServerPlayer_redirects.class) @TransformFromMethod(@MethodSig("setChunkTrackingView(Lnet/minecraft/server/level/ChunkTrackingView;)V"))
+    @AddTransformToSets(ChunkToCloSet.ServerPlayer_redirects.class)
+    @TransformFromMethod(@MethodSig("setChunkTrackingView(Lnet/minecraft/server/level/ChunkTrackingView;)V"))
     public native void cc_setCloTrackingView(CloTrackingView chunkTrackingView);
 
     // TODO P3 :: findDimensionEntryPoint
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinSimulationChunkTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinSimulationChunkTracker.java
index 21a856b1..58bc529a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinSimulationChunkTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinSimulationChunkTracker.java
@@ -17,7 +17,8 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(SimulationChunkTracker.class)
 public abstract class MixinSimulationChunkTracker extends MixinChunkTracker implements SimulationCloTracker {
-    @AddTransformToSets(ChunkToCloSet.SimulationChunkTracker_redirects.class) @TransformFromMethod(owner = @Ref(SimulationChunkTracker.class), value = @MethodSig("getLevel(Lnet/minecraft/world/level/ChunkPos;)I"))
+    @AddTransformToSets(ChunkToCloSet.SimulationChunkTracker_redirects.class)
+    @TransformFromMethod(owner = @Ref(SimulationChunkTracker.class), value = @MethodSig("getLevel(Lnet/minecraft/world/level/ChunkPos;)I"))
     public native int cc_getLevel(CloPos cloPos);
 
     @Inject(method = "setLevel", at = @At("HEAD"))
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinLoggerChunkProgressListener.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinLoggerChunkProgressListener.java
index e11586a1..f08e3e08 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinLoggerChunkProgressListener.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinLoggerChunkProgressListener.java
@@ -15,9 +15,11 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(LoggerChunkProgressListener.class)
 public abstract class MixinLoggerChunkProgressListener implements CloProgressListener {
-    @AddTransformToSets(ChunkToCloSet.LoggerChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.LoggerChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
     @Override public native void cc_updateSpawnPos(CloPos center);
 
-    @AddTransformToSets(ChunkToCloSet.LoggerChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
+    @AddTransformToSets(ChunkToCloSet.LoggerChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
     @Override public native void cc_onStatusChange(CloPos chunkPosition, @Nullable ChunkStatus newStatus);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinProcessorChunkProgressListener.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinProcessorChunkProgressListener.java
index a92d6a69..084d0738 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinProcessorChunkProgressListener.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinProcessorChunkProgressListener.java
@@ -34,9 +34,11 @@ private void cc_onInit(ChunkProgressListener delegate, Executor dispatcher, Call
         cc_delegate = ((CloProgressListener) delegate);
     }
 
-    @AddTransformToSets(ChunkToCloSet.ProcessorChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.ProcessorChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
     @Override public native void cc_updateSpawnPos(CloPos center);
 
-    @AddTransformToSets(ChunkToCloSet.ProcessorChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
+    @AddTransformToSets(ChunkToCloSet.ProcessorChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
     @Override public native void cc_onStatusChange(CloPos chunkPosition, @Nullable ChunkStatus newStatus);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinStoringChunkProgressListener.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinStoringChunkProgressListener.java
index dcf28e25..30ee4bc5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinStoringChunkProgressListener.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/progress/MixinStoringChunkProgressListener.java
@@ -24,9 +24,11 @@ public abstract class MixinStoringChunkProgressListener implements CloProgressLi
     @AddFieldToSets(containers = GlobalSet.StoringChunkProgressListener_redirects.class, field = @FieldSig(type = @Ref(ChunkPos.class), name = "spawnPos"))
     private CloPos cc_spawnPos;
 
-    @AddTransformToSets(ChunkToCloSet.StoringChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.StoringChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("updateSpawnPos(Lnet/minecraft/world/level/ChunkPos;)V"))
     @Override public native void cc_updateSpawnPos(CloPos center);
 
-    @AddTransformToSets(ChunkToCloSet.StoringChunkProgressListener_redirects.class) @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
+    @AddTransformToSets(ChunkToCloSet.StoringChunkProgressListener_redirects.class)
+    @TransformFromMethod(@MethodSig("onStatusChange(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"))
     @Override public native void cc_onStatusChange(CloPos chunkPosition, @Nullable ChunkStatus newStatus);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
index 1d36ea50..182a4a18 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
@@ -8,7 +8,6 @@
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddTransformToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.notstirred.dasm.api.annotations.transform.TransformFromMethod;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
@@ -52,7 +51,8 @@ public class MixinPlayerChunkSender {
 
     @Shadow @Final private LongSet pendingChunks;
 
-    @AddTransformToSets(ChunkToCloSet.PlayerChunkSender_redirects.class) @TransformFromMethod(value = @MethodSig("markChunkPendingToSend(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
+    @AddTransformToSets(ChunkToCloSet.PlayerChunkSender_redirects.class)
+    @TransformFromMethod(value = @MethodSig("markChunkPendingToSend(Lnet/minecraft/world/level/chunk/LevelChunk;)V"))
     public native void cc_markCloPendingToSend(LevelClo clo);
 
     @AddMethodToSets(containers = ChunkToCloSet.PlayerChunkSender_redirects.class, method = @MethodSig("dropChunk(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/world/level/ChunkPos;)V"))
@@ -77,32 +77,34 @@ private void cc_onSendNextChunks(ServerPlayer player, CallbackInfo ci) {
                 if (!this.pendingChunks.isEmpty()) {
                     ServerLevel serverlevel = player.serverLevel();
                     ChunkMap chunkmap = serverlevel.getChunkSource().chunkMap;
-                    List<LevelClo> list = this.cc_collectChunksToSend(chunkmap, CloPos.cube(((EntityCubePosGetter)player).cc_cubePosition()));
+                    List<LevelClo> list = this.cc_collectChunksToSend(chunkmap, CloPos.cube(((EntityCubePosGetter) player).cc_cubePosition()));
                     if (!list.isEmpty()) {
                         ServerGamePacketListenerImpl servergamepacketlistenerimpl = player.connection;
                         ++this.unacknowledgedBatches;
 
-                        // This packet can remain the same because it is just for timing purposes in order to determine how many chunks (or cubes) the client should request
+                        // This packet can remain the same because it is just for timing purposes in order to determine how many chunks (or cubes) the
+                        // client should request
                         servergamepacketlistenerimpl.send(ClientboundChunkBatchStartPacket.INSTANCE);
 
                         // TODO P2 :: We need to send heightmap and lighting data, which would be contained in the Column
 
                         // We need to send the chunks first before cubes, to ensure that load order invariants are preserved
                         for (LevelClo levelClo : list) {
-                            if(levelClo instanceof LevelChunk) {
+                            if (levelClo instanceof LevelChunk) {
                                 cc_sendChunk(servergamepacketlistenerimpl, serverlevel, (LevelChunk) levelClo);
                             }
                         }
 
                         for (LevelClo levelClo : list) {
-                            if(levelClo instanceof LevelCube) {
+                            if (levelClo instanceof LevelCube) {
                                 cc_sendCube(servergamepacketlistenerimpl, serverlevel, (LevelCube) levelClo);
                             }
                         }
 
-                        // This packet can remain the same because it is just for timing purposes in order to determine how many chunks (or cubes) the client should request
+                        // This packet can remain the same because it is just for timing purposes in order to determine how many chunks (or cubes) the
+                        // client should request
                         servergamepacketlistenerimpl.send(new ClientboundChunkBatchFinishedPacket(list.size()));
-                        this.batchQuota -= (float)list.size();
+                        this.batchQuota -= (float) list.size();
                     }
                 }
             }
@@ -139,12 +141,14 @@ private static void cc_sendChunk(ServerGamePacketListenerImpl packetListener, Se
     private native List<LevelClo> cc_collectChunksToSend(ChunkMap chunkMap, CloPos cloPos);
 
     // FIXME these should probably have some kind of reasonable sort order - at the very least, chunks before cubes
-    @Dynamic @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 0, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 0, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
     private Comparator<Long> cc_onCollectChunksToSend_comparator1(ToIntFunction<Long> keyExtractor) {
         return (a, b) -> 0;
     }
 
-    @Dynamic @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
     private Comparator<LevelClo> cc_onCollectChunksToSend_comparator2(ToIntFunction<LevelClo> keyExtractor) {
         return (a, b) -> 0;
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
index 6a05bdce..e6def584 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
@@ -31,7 +31,8 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 /**
- *  We modify Entity to track its cube position, and to replace calls to chunk-specific methods with their corresponding cubic methods when in a cubic Level.
+ * We modify Entity to track its cube position, and to replace calls to chunk-specific methods with their corresponding cubic methods when in a cubic
+ * Level.
  */
 @Dasm(ChunkToCubeSet.class)
 @Mixin(Entity.class)
@@ -40,14 +41,18 @@ public abstract class MixinEntity implements EntityCubePosGetter {
     @Shadow private BlockPos blockPosition;
 
     @Shadow public abstract Level level();
+
     @Shadow public abstract void teleportTo(double x, double y, double z);
+
     @Shadow public abstract AABB getBoundingBox();
+
     @Shadow public abstract int getId();
 
     @AddFieldToSets(containers = ChunkToCubeSet.Entity_redirects.class, field = @FieldSig(type = @Ref(ChunkPos.class), name = "chunkPosition"))
     private CubePos cc_cubePosition = CubePos.of(0, 0, 0);
 
-    @AddTransformToSets(ChunkToCubeSet.Entity_redirects.class) @TransformFromMethod(@MethodSig("chunkPosition()Lnet/minecraft/world/level/ChunkPos;"))
+    @AddTransformToSets(ChunkToCubeSet.Entity_redirects.class)
+    @TransformFromMethod(@MethodSig("chunkPosition()Lnet/minecraft/world/level/ChunkPos;"))
     public native CubePos cc_cubePosition();
 
     @AddMethodToSets(containers = ChunkToCloSet.Entity_redirects.class, method = @MethodSig("chunkPosition()Lnet/minecraft/world/level/ChunkPos;"))
@@ -58,7 +63,8 @@ public CloPos cc_cubePositionAsClo() {
     // Update cube position when blockpos changes - this is the same location as where vanilla updates the chunk position
     @Inject(method = "setPosRaw", at = @At(value = "FIELD", shift = At.Shift.AFTER, target = "Lnet/minecraft/world/entity/Entity;blockPosition:Lnet/minecraft/core/BlockPos;", opcode = Opcodes.PUTFIELD))
     private void cc_onSetPosRaw(double x, double y, double z, CallbackInfo ci) {
-        if (Coords.blockToCube(x) != cc_cubePosition.getX() || Coords.blockToCube(y) != cc_cubePosition.getY() || Coords.blockToCube(z) != cc_cubePosition.getZ()) {
+        if (Coords.blockToCube(x) != cc_cubePosition.getX() || Coords.blockToCube(y) != cc_cubePosition.getY()
+                || Coords.blockToCube(z) != cc_cubePosition.getZ()) {
             this.cc_cubePosition = CubePos.from(this.blockPosition);
         }
     }
@@ -66,7 +72,8 @@ private void cc_onSetPosRaw(double x, double y, double z, CallbackInfo ci) {
     // In cubic levels, check for unloaded cubes instead of chunks
     @Inject(method = "touchingUnloadedChunk", at = @At("HEAD"), cancellable = true)
     private void cc_onTouchingUnloadedChunk(CallbackInfoReturnable<Boolean> cir) {
-        if (!((CanBeCubic) this.level).cc_isCubic()) return;
+        if (!((CanBeCubic) this.level).cc_isCubic())
+            return;
         AABB aabb = this.getBoundingBox().inflate(1.0);
         int minX = Mth.floor(aabb.minX);
         int maxX = Mth.ceil(aabb.maxX);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
index 191267e8..22ea5605 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
@@ -31,13 +31,16 @@ public class MixinBlockCollisions {
     private boolean cc_isCubic;
 
     @Inject(method = "<init>(Lnet/minecraft/world/level/CollisionGetter;Lnet/minecraft/world/phys/shapes/CollisionContext;Lnet/minecraft/world/phys/AABB;ZLjava/util/function/BiFunction;)V", at = @At("CTOR_HEAD"))
-    private void cc_onInit(CollisionGetter collisionGetter, CollisionContext context, AABB box, boolean onlySuffocatingBlocks, BiFunction resultProvider, CallbackInfo ci) {
+    private void cc_onInit(
+            CollisionGetter collisionGetter, CollisionContext context, AABB box, boolean onlySuffocatingBlocks, BiFunction resultProvider,
+            CallbackInfo ci
+    ) {
         // TODO probably don't cast without an instanceof check in production - for dev it's fine since it will tell us we're missing something
-        if (((CanBeCubic) collisionGetter).cc_isCubic()) cc_isCubic = true;
+        if (((CanBeCubic) collisionGetter).cc_isCubic())
+            cc_isCubic = true;
     }
 
-    @Nullable
-    private BlockGetter cc_getCube(int x, int y, int z) {
+    @Nullable private BlockGetter cc_getCube(int x, int y, int z) {
         int cubeX = Coords.blockToCube(x);
         int cubeY = Coords.blockToCube(y);
         int cubeZ = Coords.blockToCube(z);
@@ -53,8 +56,11 @@ private BlockGetter cc_getCube(int x, int y, int z) {
     }
 
     @WrapOperation(method = "computeNext", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/BlockCollisions;getChunk(II)Lnet/minecraft/world/level/BlockGetter;"))
-    @Nullable private BlockGetter cc_onComputeNext_getChunk(BlockCollisions instance, int x, int z, Operation<BlockGetter> original, @Local(ordinal = 1) int y) {
-        if (!cc_isCubic) return original.call(instance, x, z);
+    @Nullable private BlockGetter cc_onComputeNext_getChunk(
+            BlockCollisions instance, int x, int z, Operation<BlockGetter> original, @Local(ordinal = 1) int y
+    ) {
+        if (!cc_isCubic)
+            return original.call(instance, x, z);
         return cc_getCube(x, y, z);
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinCubePos.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinCubePos.java
index 0fa0efab..3b6da28b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinCubePos.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinCubePos.java
@@ -6,19 +6,18 @@
 
 /**
  * When DASM redirects ChunkPos to CubePos, some methods do not have reasonable equivalents that can be automatically redirected to.
- * In these cases, we call dummy methods that throw errors, and require that mixins are used to manually replace these method calls with whatever the correct method is.
+ * In these cases, we call dummy methods that throw errors, and require that mixins are used to manually replace these method calls with whatever the
+ * correct method is.
  */
 @Mixin(CubePos.class)
 public class MixinCubePos {
     @Public private static CubePos dummy_fromChunkCoords(int x, int z) {
-        throw new IllegalStateException(
-            "This method should never be called, and indicates that something has been transformed incorrectly"
+        throw new IllegalStateException("This method should never be called, and indicates that something has been transformed incorrectly"
                 + " - all calls to this method should be manually redirected to CubePos.of(x, y, z)");
     }
 
     @Public private static long dummy_chunkAsLong(int x, int z) {
-        throw new IllegalStateException(
-            "This method should never be called, and indicates that something has been transformed incorrectly"
+        throw new IllegalStateException("This method should never be called, and indicates that something has been transformed incorrectly"
                 + " - all calls to this method should be manually redirected to CubePos.asLong(x, y, z)");
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
index 6aa8c52e..196281b6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
@@ -51,8 +51,7 @@ public abstract class MixinLevel implements CubicLevel, MarkableAsCubic, LevelAc
 
     protected boolean cc_isCubic;
 
-    @Override
-    public void cc_setCubic() {
+    @Override public void cc_setCubic() {
         cc_isCubic = true;
     }
 
@@ -61,18 +60,15 @@ public void cc_setCubic() {
     }
 
     public LevelCube cc_getCubeAt(BlockPos blockPos) {
-        return this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()),
-            Coords.blockToCube(blockPos.getZ()));
+        return this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()), Coords.blockToCube(blockPos.getZ()));
     }
 
     public LevelCube cc_getCube(int cubeX, int cubeY, int cubeZ) {
-        return (LevelCube)this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.FULL);
+        return (LevelCube) this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.FULL);
     }
 
-    @Nullable
-    @Override
-    public CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus status, boolean forceLoad) {
-        CubeAccess cubeaccess = ((CubeSource)this.getChunkSource()).cc_getCube(cubeX, cubeY, cubeZ, status, forceLoad);
+    @Nullable @Override public CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus status, boolean forceLoad) {
+        CubeAccess cubeaccess = ((CubeSource) this.getChunkSource()).cc_getCube(cubeX, cubeY, cubeZ, status, forceLoad);
         if (cubeaccess == null && forceLoad) {
             throw new IllegalStateException("Should always be able to create a cube!");
         } else {
@@ -82,7 +78,7 @@ public CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus status
 
     @Inject(method = "<init>", at = @At(value = "CTOR_HEAD"))
     private void cc_init(CallbackInfo ci) {
-        if(CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
+        if (CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
             this.cc_setCubic();
         }
     }
@@ -94,9 +90,11 @@ private void cc_init(CallbackInfo ci) {
     // setBlock
     // Uses LevelChunk to call setBlockState and markAndNotifyBlock, so we replace it with a LevelCube and call the Cubic variants of those functions.
     @WrapOperation(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level"
-        + "/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    private LevelChunk cc_replaceLevelChunkInGetChunkAt(Level level, BlockPos blockPos, Operation<LevelChunk> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+            + "/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    private LevelChunk cc_replaceLevelChunkInGetChunkAt(
+            Level level, BlockPos blockPos, Operation<LevelChunk> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             levelCubeLocalRef.set(this.cc_getCubeAt(blockPos));
             return null;
         }
@@ -104,41 +102,52 @@ private LevelChunk cc_replaceLevelChunkInGetChunkAt(Level level, BlockPos blockP
     }
 
     @WrapOperation(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;I)Lnet/minecraft/world/level/block/state/BlockState;"))
-    private BlockState cc_replaceLevelChunkInSetBlockState(LevelChunk levelChunk, BlockPos blockPos, BlockState blockState, int flags, Operation<BlockState> original,
-                                                           @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+    private BlockState cc_replaceLevelChunkInSetBlockState(
+            LevelChunk levelChunk, BlockPos blockPos, BlockState blockState, int flags, Operation<BlockState> original,
+            @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             return levelCubeLocalRef.get().setBlockState(blockPos, blockState, flags);
         }
         return original.call(levelChunk, blockPos, blockState, flags);
     }
 
     @WrapWithCondition(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
-    private boolean cc_replaceLevelChunkInMarkAndNotifyBlock(Level level, BlockPos blockPos, LevelChunk levelChunk, BlockState blockStatePrev, BlockState blockStateNew, int flags,
-                                                             int p_46607_, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+    private boolean cc_replaceLevelChunkInMarkAndNotifyBlock(
+            Level level, BlockPos blockPos, LevelChunk levelChunk, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46607_,
+            @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             this.cc_markAndNotifyBlock(blockPos, levelCubeLocalRef.get(), blockStatePrev, blockStateNew, flags, p_46607_);
             return false;
         }
         return true;
     }
 
-    @AddTransformToSets(ChunkToCubeSet.Level_redirects.class) @TransformFromMethod(useRedirectSets = { ChunkToCubeSet.class }, value  = @MethodSig("markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
-    public native void cc_markAndNotifyBlock(BlockPos blockPos, @Nullable LevelCube levelCube, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46608_);
+    @AddTransformToSets(ChunkToCubeSet.Level_redirects.class)
+    @TransformFromMethod(useRedirectSets = {
+        ChunkToCubeSet.class }, value = @MethodSig("markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
+    public native void cc_markAndNotifyBlock(
+            BlockPos blockPos, @Nullable LevelCube levelCube, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46608_
+    );
 
     // getBlockState
     // Replaces LevelChunk with a LevelCube to call getBlockState
     @Inject(method = "getBlockState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunk(II)Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    private void cc_replaceLevelChunkInGetBlockState(BlockPos blockPos, CallbackInfoReturnable<BlockState> cir, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+    private void cc_replaceLevelChunkInGetBlockState(
+            BlockPos blockPos, CallbackInfoReturnable<BlockState> cir, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             levelCubeLocalRef.set(this.cc_getCubeAt(blockPos));
         }
     }
 
     @WrapOperation(method = "getBlockState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;getBlockState(Lnet/minecraft/core/BlockPos;)"
-        + "Lnet/minecraft/world/level/block/state/BlockState;"))
-    private BlockState cc_replaceLevelChunkInGetBlockState(LevelChunk levelChunk, BlockPos blockPos, Operation<BlockState> original,
-                                                           @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+            + "Lnet/minecraft/world/level/block/state/BlockState;"))
+    private BlockState cc_replaceLevelChunkInGetBlockState(
+            LevelChunk levelChunk, BlockPos blockPos, Operation<BlockState> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             return levelCubeLocalRef.get().getBlockState(blockPos);
         }
         return original.call(levelChunk, blockPos);
@@ -147,9 +156,9 @@ private BlockState cc_replaceLevelChunkInGetBlockState(LevelChunk levelChunk, Bl
     // getBlockEntity
     // Replaces LevelChunk with a LevelCube to call getBlockEntity
     @Inject(method = "getBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)"
-        + "Lnet/minecraft/world/level/chunk/LevelChunk;"), cancellable = true)
+            + "Lnet/minecraft/world/level/chunk/LevelChunk;"), cancellable = true)
     private void cc_replaceGetChunkAtInSetBlockEntity(BlockPos blockPos, CallbackInfoReturnable<BlockEntity> cir) {
-        if(cc_isCubic) {
+        if (cc_isCubic) {
             cir.setReturnValue(this.cc_getCubeAt(blockPos).getBlockEntity(blockPos, LevelChunk.EntityCreationType.IMMEDIATE));
         }
     }
@@ -158,7 +167,7 @@ private void cc_replaceGetChunkAtInSetBlockEntity(BlockPos blockPos, CallbackInf
     // Replaces LevelChunk with a LevelCube to call getFluidState
     @WrapOperation(method = "getFluidState", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"))
     private FluidState cc_replaceGetChunkAtInGetFluidState(LevelChunk levelChunk, BlockPos blockPos, Operation<FluidState> original) {
-        if(cc_isCubic) {
+        if (cc_isCubic) {
             return this.cc_getCubeAt(blockPos).getFluidState(blockPos);
         }
         return original.call(levelChunk, blockPos);
@@ -166,10 +175,10 @@ private FluidState cc_replaceGetChunkAtInGetFluidState(LevelChunk levelChunk, Bl
 
     // setBlockEntity
     // Replaces LevelChunk with a LevelCube to call addAndRegisterBlockEntity
-    @Inject(method = "setBlockEntity", at = @At(value="INVOKE", target="Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)"
-        + "Lnet/minecraft/world/level/chunk/LevelChunk;"), cancellable=true)
+    @Inject(method = "setBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)"
+            + "Lnet/minecraft/world/level/chunk/LevelChunk;"), cancellable = true)
     private void cc_replaceLevelChunkInSetBlockEntity(BlockEntity blockEntity, CallbackInfo ci, @Local(ordinal = 0) BlockPos blockPos) {
-        if(cc_isCubic) {
+        if (cc_isCubic) {
             this.cc_getCubeAt(blockPos).addAndRegisterBlockEntity(blockEntity);
             ci.cancel();
         }
@@ -177,18 +186,22 @@ private void cc_replaceLevelChunkInSetBlockEntity(BlockEntity blockEntity, Callb
 
     // removeBlockEntity
     // Replaces LevelChunk with a LevelCube to call removeBlockEntity, needs a local ref to do so
-    @WrapOperation(method = "removeBlockEntity", at = @At(value="INVOKE", target="Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    private LevelChunk cc_replaceGetChunkAtInRemoveBlockEntity(Level level, BlockPos pos, Operation<LevelChunk> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+    @WrapOperation(method = "removeBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunkAt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/chunk/LevelChunk;"))
+    private LevelChunk cc_replaceGetChunkAtInRemoveBlockEntity(
+            Level level, BlockPos pos, Operation<LevelChunk> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             levelCubeLocalRef.set(cc_getCubeAt(pos));
             return null;
         }
         return original.call(level, pos);
     }
 
-    @WrapOperation(method = "removeBlockEntity", at = @At(value="INVOKE", target="Lnet/minecraft/world/level/chunk/LevelChunk;removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"))
-    private void cc_replaceLevelChunkInRemoveBlockEntity(LevelChunk levelChunk, BlockPos pos, Operation<Void> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef) {
-        if(cc_isCubic) {
+    @WrapOperation(method = "removeBlockEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/LevelChunk;removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"))
+    private void cc_replaceLevelChunkInRemoveBlockEntity(
+            LevelChunk levelChunk, BlockPos pos, Operation<Void> original, @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
+    ) {
+        if (cc_isCubic) {
             levelCubeLocalRef.get().removeBlockEntity(pos);
         } else {
             original.call(levelChunk, pos);
@@ -197,10 +210,11 @@ private void cc_replaceLevelChunkInRemoveBlockEntity(LevelChunk levelChunk, Bloc
 
     // isLoaded
     // Replaces ChunkSource with a CubeSource to call hasCube
-    @WrapOperation(method = "isLoaded", at = @At(value="INVOKE", target="Lnet/minecraft/world/level/chunk/ChunkSource;hasChunk(II)Z"))
+    @WrapOperation(method = "isLoaded", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/ChunkSource;hasChunk(II)Z"))
     private boolean cc_replaceHasChunkInIsLoaded(ChunkSource chunkSource, int x, int z, Operation<Boolean> original, BlockPos blockPos) {
-        if(cc_isCubic) {
-            return ((CubeSource)chunkSource).cc_hasCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()), Coords.blockToCube(blockPos.getZ()));
+        if (cc_isCubic) {
+            return ((CubeSource) chunkSource).cc_hasCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()),
+                    Coords.blockToCube(blockPos.getZ()));
         }
         return false;
     }
@@ -208,10 +222,14 @@ private boolean cc_replaceHasChunkInIsLoaded(ChunkSource chunkSource, int x, int
     // loadedAndEntityCanStandOnFace
     // Uses an inject here since the entire second half of the method needs to be replaced anyways
     @Inject(method = "loadedAndEntityCanStandOnFace", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getChunk(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Lnet/minecraft/world/level/chunk/ChunkAccess;"), cancellable = true)
-    private void cc_replaceGetChunkAtInLoadedAndEntityCanStandOnFace(BlockPos blockPos, Entity entity, Direction direction, CallbackInfoReturnable<Boolean> cir) {
-        if(cc_isCubic) {
-            CubeAccess cubeAccess = this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()), Coords.blockToCube(blockPos.getZ()), ChunkStatus.FULL, false);
-            cir.setReturnValue(cubeAccess == null ? false : cubeAccess.getBlockState(blockPos).entityCanStandOnFace(this, blockPos, entity, direction));
+    private void cc_replaceGetChunkAtInLoadedAndEntityCanStandOnFace(
+            BlockPos blockPos, Entity entity, Direction direction, CallbackInfoReturnable<Boolean> cir
+    ) {
+        if (cc_isCubic) {
+            CubeAccess cubeAccess = this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()),
+                    Coords.blockToCube(blockPos.getZ()), ChunkStatus.FULL, false);
+            cir.setReturnValue(
+                    cubeAccess == null ? false : cubeAccess.getBlockState(blockPos).entityCanStandOnFace(this, blockPos, entity, direction));
         }
     }
 
@@ -219,7 +237,7 @@ private void cc_replaceGetChunkAtInLoadedAndEntityCanStandOnFace(BlockPos blockP
     // This function is small enough that we can just replace it entirely
     @Inject(method = "blockEntityChanged", at = @At(value = "HEAD"), cancellable = true)
     private void cc_replaceBlockEntityChanged(BlockPos blockPos, CallbackInfo ci) {
-        if(cc_isCubic) {
+        if (cc_isCubic) {
             if (this.cc_hasCubeAt(blockPos)) {
                 this.cc_getCubeAt(blockPos).markUnsaved();
             }
@@ -232,7 +250,7 @@ private void cc_replaceBlockEntityChanged(BlockPos blockPos, CallbackInfo ci) {
     // Local difficulty is not something people mod so this is fine
     @Inject(method = "getCurrentDifficultyAt", at = @At(value = "HEAD"), cancellable = true)
     private void cc_replaceGetCurrentDifficultyAt(BlockPos blockPos, CallbackInfoReturnable<DifficultyInstance> cir) {
-        if(cc_isCubic) {
+        if (cc_isCubic) {
             long i = 0L;
             float f = 0.0F;
             if (this.cc_hasCubeAt(blockPos)) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevelHeightAccessor.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevelHeightAccessor.java
index 506bd2fa..aa93a517 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevelHeightAccessor.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevelHeightAccessor.java
@@ -8,7 +8,9 @@
 @Mixin(LevelHeightAccessor.class)
 public interface MixinLevelHeightAccessor {
     @Shadow int getMinY();
+
     @Shadow int getMaxY();
+
     default int getMinBuildHeight() {
         return getMinY();
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinTicketStorage.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinTicketStorage.java
index a7d173e5..5c5ab219 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinTicketStorage.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinTicketStorage.java
@@ -1,6 +1,5 @@
 package io.github.opencubicchunks.cubicchunks.mixin.core.common.world.level;
 
-
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddTransformToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
@@ -19,22 +18,28 @@
 public class MixinTicketStorage implements CubicTicketStorage {
     // TODO (P2) codec nonsense for save/load
 
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("addTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("addTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_addTicketWithRadius(TicketType ticketType, CloPos cloPos, int radius);
 
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     public native void cc_addTicket(Ticket ticket, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("removeTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("removeTicketWithRadius(Lnet/minecraft/server/level/TicketType;Lnet/minecraft/world/level/ChunkPos;I)V"))
     public native void cc_removeTicketWithRadius(TicketType ticketType, CloPos cloPos, int radius);
 
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("removeTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("removeTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     public native void cc_removeTicket(Ticket ticket, CloPos cloPos);
 
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)Z"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("updateChunkForced(Lnet/minecraft/world/level/ChunkPos;Z)Z"))
     public native boolean cc_updateChunkForced(CloPos cloPos, boolean add);
 
     // TODO move to neoforge-specific mixin
-    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class) @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("shouldForceNaturalSpawning(Lnet/minecraft/world/level/ChunkPos;)Z"))
+    @AddTransformToSets(ChunkToCloSet.TicketStorage_redirects.class)
+    @TransformFromMethod(owner = @Ref(TicketStorage.class), value = @MethodSig("shouldForceNaturalSpawning(Lnet/minecraft/world/level/ChunkPos;)Z"))
     public native boolean cc_shouldForceNaturalSpawning(CloPos cloPos);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkAccess.java
index 9294ecad..edf5a18a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkAccess.java
@@ -19,9 +19,10 @@ public abstract class MixinChunkAccess implements CloAccess {
     private CloPos cc_cloPos;
 
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void cc_onInit(ChunkPos chunkPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry biomeRegistry, long inhabitedTime, LevelChunkSection[] sections,
-                           BlendingData blendingData,
-                           CallbackInfo ci) {
+    private void cc_onInit(
+            ChunkPos chunkPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry biomeRegistry, long inhabitedTime,
+            LevelChunkSection[] sections, BlendingData blendingData, CallbackInfo ci
+    ) {
         cc_cloPos = CloPos.chunk(chunkPos);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkSource.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkSource.java
index 53b3e340..302c2402 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkSource.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinChunkSource.java
@@ -14,8 +14,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 /**
- * The {@link ChunkSource} class is the abstract parent class of both {@link ClientChunkCache} and {@link ServerChunkCache}, and contains a few methods common to both classes.
- * This mixin adds versions of chunk-related methods for cubes where necessary, as the subclasses of this class are used to track both cubes and chunks when cubic chunks is enabled.
+ * The {@link ChunkSource} class is the abstract parent class of both {@link ClientChunkCache} and {@link ServerChunkCache}, and contains a few
+ * methods common to both classes.
+ * This mixin adds versions of chunk-related methods for cubes where necessary, as the subclasses of this class are used to track both cubes and
+ * chunks when cubic chunks is enabled.
  */
 @Mixin(ChunkSource.class)
 public abstract class MixinChunkSource implements CubeSource, MarkableAsCubic {
@@ -30,11 +32,11 @@ public abstract class MixinChunkSource implements CubeSource, MarkableAsCubic {
     }
 
     public @Nullable LevelCube cc_getCube(int x, int y, int z, boolean forceLoad) {
-        return (LevelCube)this.cc_getCube(x, y, z, ChunkStatus.FULL, forceLoad);
+        return (LevelCube) this.cc_getCube(x, y, z, ChunkStatus.FULL, forceLoad);
     }
 
     public @Nullable LevelCube cc_getCubeNow(int x, int y, int z) {
-        return this.cc_getCube(x, y, z,false);
+        return this.cc_getCube(x, y, z, false);
     }
 
     // TODO: Phase 2 - getCubeForLighting
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinLevelChunk.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinLevelChunk.java
index 9c6a4d6a..67468c13 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinLevelChunk.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinLevelChunk.java
@@ -5,5 +5,4 @@
 import org.spongepowered.asm.mixin.Mixin;
 
 @Mixin(LevelChunk.class)
-public abstract class MixinLevelChunk implements LevelClo {
-}
+public abstract class MixinLevelChunk implements LevelClo {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinProtoChunk.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinProtoChunk.java
index 0bb9d6b3..861de55b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinProtoChunk.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/MixinProtoChunk.java
@@ -6,5 +6,4 @@
 
 // Needed to add the ProtoClo interface
 @Mixin(ProtoChunk.class)
-public abstract class MixinProtoChunk implements ProtoClo {
-}
+public abstract class MixinProtoChunk implements ProtoClo {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinCCChunkStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinCCChunkStatusTasks.java
index 6b7e3f71..652aca93 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinCCChunkStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinCCChunkStatusTasks.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CCChunkStatusTasks.class)
-public class MixinCCChunkStatusTasks {
-}
+public class MixinCCChunkStatusTasks {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinChunkStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinChunkStatusTasks.java
index 116ed32a..b1235170 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinChunkStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/status/MixinChunkStatusTasks.java
@@ -22,7 +22,8 @@
 public class MixinChunkStatusTasks {
     @Inject(method = "generateStructureStarts", at = @At("HEAD"), cancellable = true)
     private static void cc_generateStructureStarts(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateStructureStarts(worldGenContext, step, cache, chunk));
@@ -31,7 +32,8 @@ private static void cc_generateStructureStarts(
 
     @Inject(method = "loadStructureStarts", at = @At("HEAD"), cancellable = true)
     private static void cc_loadStructureStarts(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.loadStructureStarts(worldGenContext, step, cache, chunk));
@@ -40,7 +42,8 @@ private static void cc_loadStructureStarts(
 
     @Inject(method = "generateStructureReferences", at = @At("HEAD"), cancellable = true)
     private static void cc_generateStructureReferences(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateStructureReferences(worldGenContext, step, cache, chunk));
@@ -49,7 +52,8 @@ private static void cc_generateStructureReferences(
 
     @Inject(method = "generateBiomes", at = @At("HEAD"), cancellable = true)
     private static void cc_generateBiomes(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateBiomes(worldGenContext, step, cache, chunk));
@@ -58,7 +62,8 @@ private static void cc_generateBiomes(
 
     @Inject(method = "generateNoise", at = @At("HEAD"), cancellable = true)
     private static void cc_generateNoise(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateNoise(worldGenContext, step, cache, chunk));
@@ -67,7 +72,8 @@ private static void cc_generateNoise(
 
     @Inject(method = "generateSurface", at = @At("HEAD"), cancellable = true)
     private static void cc_generateSurface(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateSurface(worldGenContext, step, cache, chunk));
@@ -76,7 +82,8 @@ private static void cc_generateSurface(
 
     @Inject(method = "generateCarvers", at = @At("HEAD"), cancellable = true)
     private static void cc_generateCarvers(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateCarvers(worldGenContext, step, cache, chunk));
@@ -85,7 +92,8 @@ private static void cc_generateCarvers(
 
     @Inject(method = "generateFeatures", at = @At("HEAD"), cancellable = true)
     private static void cc_generateFeatures(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateFeatures(worldGenContext, step, cache, chunk));
@@ -94,7 +102,8 @@ private static void cc_generateFeatures(
 
     @Inject(method = "initializeLight", at = @At("HEAD"), cancellable = true)
     private static void cc_initializeLight(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.initializeLight(worldGenContext, step, cache, chunk));
@@ -103,7 +112,8 @@ private static void cc_initializeLight(
 
     @Inject(method = "light", at = @At("HEAD"), cancellable = true)
     private static void cc_light(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.light(worldGenContext, step, cache, chunk));
@@ -112,7 +122,8 @@ private static void cc_light(
 
     @Inject(method = "generateSpawn", at = @At("HEAD"), cancellable = true)
     private static void cc_generateSpawn(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.generateSpawn(worldGenContext, step, cache, chunk));
@@ -121,7 +132,8 @@ private static void cc_generateSpawn(
 
     @Inject(method = "full", at = @At("HEAD"), cancellable = true)
     private static void cc_full(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk, CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk,
+            CallbackInfoReturnable<CompletableFuture<ChunkAccess>> cir
     ) {
         if (((CanBeCubic) worldGenContext.level()).cc_isCubic()) {
             cir.setReturnValue(CCChunkStatusTasks.full(worldGenContext, step, cache, chunk));
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/storage/MixinChunkStorage.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/storage/MixinChunkStorage.java
index d5422dee..0a0a92bf 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/storage/MixinChunkStorage.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/chunk/storage/MixinChunkStorage.java
@@ -6,7 +6,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCloSet;
 import net.minecraft.nbt.CompoundTag;
@@ -16,21 +15,18 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(ChunkStorage.class)
 public abstract class MixinChunkStorage {
-    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class,
-        method = @MethodSig("isOldChunkAround(Lnet/minecraft/world/level/ChunkPos;I)Z"))
+    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class, method = @MethodSig("isOldChunkAround(Lnet/minecraft/world/level/ChunkPos;I)Z"))
     public boolean cc_isOldChunkAround(CloPos pos, int radius) {
         return false; // TODO (P2) should be dasm'd once IOWorker is done
     }
 
-    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class,
-        method = @MethodSig("read(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class, method = @MethodSig("read(Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;"))
     public CompletableFuture<Optional<CompoundTag>> cc_read(CloPos cloPos) {
         // TODO (P2) loading - this method should be dasm'd
         return CompletableFuture.completedFuture(Optional.empty());
     }
 
-    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class,
-        method = @MethodSig("write(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)V"))
+    @AddMethodToSets(containers = ChunkToCloSet.ChunkStorage_redirects.class, method = @MethodSig("write(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)V"))
     public void cc_write(CloPos cloPos, CompoundTag chunkData) {
         // TODO (P2) loading/unloading
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinCubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinCubeAccess.java
index 65a4ebeb..ed3eaf48 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinCubeAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinCubeAccess.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CubeAccess.class)
-public class MixinCubeAccess {
-}
+public class MixinCubeAccess {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinEmptyLevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinEmptyLevelCube.java
index 236cbabc..c872850c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinEmptyLevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinEmptyLevelCube.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(EmptyLevelCube.class)
-public abstract class MixinEmptyLevelCube extends MixinLevelCube {
-}
+public abstract class MixinEmptyLevelCube extends MixinLevelCube {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
index 2d85876d..e63a61ed 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
@@ -13,7 +13,8 @@
 @Mixin(ImposterProtoCube.class)
 public abstract class MixinImposterProtoCube extends MixinProtoCube implements ImposterProtoClo {
     // Field generated by DASM
-    @Dynamic @Shadow @Final private LevelCube wrapped;
+    @Dynamic
+    @Shadow @Final private LevelCube wrapped;
 
     @Override public LevelClo cc_getWrappedClo() {
         return this.wrapped;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$BoundTickingBlockEntity.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$BoundTickingBlockEntity.java
index a5c43588..2b9bbe3b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$BoundTickingBlockEntity.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$BoundTickingBlockEntity.java
@@ -4,5 +4,4 @@
 
 // Needed for DASM to apply
 @Mixin(targets = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$BoundTickingBlockEntity")
-public class MixinLevelCube$BoundTickingBlockEntity {
-}
+public class MixinLevelCube$BoundTickingBlockEntity {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$RebindableTickingBlockEntityWrapper.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$RebindableTickingBlockEntityWrapper.java
index 2794c6fa..e8284312 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$RebindableTickingBlockEntityWrapper.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube$RebindableTickingBlockEntityWrapper.java
@@ -4,5 +4,4 @@
 
 // Needed for DASM to apply
 @Mixin(targets = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$RebindableTickingBlockEntityWrapper")
-public class MixinLevelCube$RebindableTickingBlockEntityWrapper {
-}
+public class MixinLevelCube$RebindableTickingBlockEntityWrapper {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
index cf47984c..8870575e 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
@@ -14,7 +14,8 @@ public abstract class MixinLevelCube extends MixinCubeAccess {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic @Redirect(method = "cc_dasm$getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos pos) {
         return Coords.blockToIndex(pos);
     }
@@ -22,8 +23,9 @@ private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic @Redirect(method = "cc_dasm$getFluidState(III)Lnet/minecraft/world/level/material/FluidState;", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
-        + "/world/level/cube/LevelCube;getSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$getFluidState(III)Lnet/minecraft/world/level/material/FluidState;", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
+            + "/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetFluidState_SectionIndex(LevelCube instance, int yUnused, int x, int y, int z) {
         return Coords.blockToIndex(x, y, z);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
index 52afa05e..be5842f1 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
@@ -14,8 +14,10 @@ public abstract class MixinProtoCube extends MixinCubeAccess {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic @Redirect(method = {"markPosForPostprocessing", "cc_dasm$getBlockState", "cc_dasm$getFluidState"}, at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
-        + "/world/level/cube/ProtoCube;getSectionIndex(I)I"))
+    @Dynamic
+    @Redirect(method = { "markPosForPostprocessing", "cc_dasm$getBlockState",
+        "cc_dasm$getFluidState" }, at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
+                + "/world/level/cube/ProtoCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(ProtoCube instance, int i, BlockPos pos) {
         return Coords.blockToIndex(pos);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid$Builder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid$Builder.java
index 1591a54e..84b6b073 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid$Builder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid$Builder.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CubePyramid.Builder.class)
-public class MixinCubePyramid$Builder {
-}
+public class MixinCubePyramid$Builder {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid.java
index 62f87d3a..5cc74ac9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubePyramid.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CubePyramid.class)
-public class MixinCubePyramid {
-}
+public class MixinCubePyramid {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
index e3791bce..80459bbc 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
@@ -14,13 +14,16 @@
 // Needed for DASM to apply
 @Mixin(CubeStatusTasks.class)
 public class MixinCubeStatusTasks {
-    @Dynamic @Redirect(method = "cc_dasm$full", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
+    @Dynamic
+    @Redirect(method = "cc_dasm$full", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
     private static Object onFullCube_cacheGet(StaticCache3D<?> instance, int x, int z, @Local(ordinal = 0) CubePos cubePos) {
         return instance.get(x, cubePos.getY(), z);
     }
 
-    @Dynamic @Redirect(method = "dasm$redirect$lambda$full$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/status/WorldGenContext;unsavedListener()Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube$UnsavedListener;"))
+    @Dynamic
+    @Redirect(method = "dasm$redirect$lambda$full$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/status/WorldGenContext;unsavedListener()Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube$UnsavedListener;"))
     private static LevelCube.UnsavedListener onFullCube_worldGenContext_unsavedListener(WorldGenContext instance) {
-        return cubePos -> {}; // TODO (P2) save/load: this is temporary until WorldGenContext actually has a proper redirect so we can get a cube unsaved listener
+        return cubePos -> {}; // TODO (P2) save/load: this is temporary until WorldGenContext actually has a proper redirect so we can get a cube
+                              // unsaved listener
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep$Builder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep$Builder.java
index 92f9e8ce..c561169c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep$Builder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep$Builder.java
@@ -5,5 +5,4 @@
 
 // Needed for DASM to apply
 @Mixin(CubeStep.Builder.class)
-public class MixinCubeStep$Builder {
-}
+public class MixinCubeStep$Builder {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
index 4653b7fc..c7375ea9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
@@ -14,7 +14,8 @@
 // Needed for DASM to apply
 @Mixin(CubeStep.class)
 public class MixinCubeStep {
-    @Dynamic @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkGenerate(Lio/github/opencubicchunks/cc_core/api/CubePos;Lnet/minecraft/resources/ResourceKey;Ljava/lang/String;)Lnet/minecraft/util/profiling/jfr/callback/ProfiledDuration;"))
+    @Dynamic
+    @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkGenerate(Lio/github/opencubicchunks/cc_core/api/CubePos;Lnet/minecraft/resources/ResourceKey;Ljava/lang/String;)Lnet/minecraft/util/profiling/jfr/callback/ProfiledDuration;"))
     private ProfiledDuration cc_onApply_profilerCall(JvmProfiler instance, CubePos cubePos, ResourceKey<Level> levelResourceKey, String s) {
         // TODO we just hack out the profiler stuff for now
         return null;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
index 15bdeb2d..50f664ff 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
@@ -2,7 +2,6 @@
 
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import org.spongepowered.asm.mixin.Final;
@@ -20,11 +19,13 @@ public class MixinLevelLightEngine {
 
     @Inject(method = "lightOnInColumn", at = @At("HEAD"), cancellable = true)
     private void cc_onLightOnInColumn(long columnPos, CallbackInfoReturnable<Boolean> cir) {
-        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic()) cir.setReturnValue(true);
+        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic())
+            cir.setReturnValue(true);
     }
 
     @Inject(method = "getRawBrightness", at = @At("HEAD"), cancellable = true)
     private void cc_onGetRawBrightness(BlockPos blockPos, int amount, CallbackInfoReturnable<Integer> cir) {
-        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic()) cir.setReturnValue(15);
+        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic())
+            cir.setReturnValue(15);
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkInCubicContextSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkInCubicContextSet.java
index 29412e38..d71beebd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkInCubicContextSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkInCubicContextSet.java
@@ -9,6 +9,5 @@
 @RedirectSet
 public interface ChunkInCubicContextSet extends GlobalSet {
     @InterOwnerContainer(from = @Ref(ChunkStatusTasks.class), to = @Ref(CCChunkStatusTasks.class))
-    class ChunkStatusTasks_to_CCChunkStatusTasks_redirects {
-    }
+    class ChunkStatusTasks_to_CCChunkStatusTasks_redirects {}
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCloSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCloSet.java
index 11e8fe4c..c2bcdb65 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCloSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCloSet.java
@@ -67,8 +67,10 @@
 
 /**
  * Should be used for DASM transforms that work with Clos (i.e. work with both Chunks and Cubes)
- * <br/><br/>
- * Clo-related field and type redirects, and method redirects containing Clo-related types in the signature or return type should be added to this set.
+ * <br/>
+ * <br/>
+ * Clo-related field and type redirects, and method redirects containing Clo-related types in the signature or return type should be added to this
+ * set.
  * <br/>
  * Other redirects may also be added to this set if they should only be applied in contexts working with both Chunks and Cubes.
  * Redirects applicable in all contexts should be added to {@link GlobalSet}.
@@ -112,61 +114,45 @@ interface LevelChunk_to_LevelClo_redirects extends ChunkAccess_to_CloAccess_redi
         static LevelClo create(Level level, ChunkPos pos) {
             throw new DasmFailedToApply();
         }
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(Level.class),
-            @Ref(ChunkPos.class),
-            @Ref(UpgradeData.class),
-            @Ref(LevelChunkTicks.class),
-            @Ref(LevelChunkTicks.class),
-            @Ref(long.class),
-            @Ref(LevelChunkSection[].class),
-            @Ref(LevelChunk.PostLoadProcessor.class),
-            @Ref(BlendingData.class)
-        }))
-        static LevelClo create(Level level,
-                               CloPos pos,
-                               UpgradeData data,
-                               LevelChunkTicks<Block> blockTicks,
-                               LevelChunkTicks<Fluid> fluidTicks,
-                               long inhabitedTime,
-                               @Nullable LevelChunkSection[] sections,
-                               @Nullable LevelClo.PostLoadProcessor postLoad,
-                               @Nullable BlendingData blendingData) {
+
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(Level.class), @Ref(ChunkPos.class), @Ref(UpgradeData.class),
+            @Ref(LevelChunkTicks.class), @Ref(LevelChunkTicks.class), @Ref(long.class), @Ref(LevelChunkSection[].class),
+            @Ref(LevelChunk.PostLoadProcessor.class), @Ref(BlendingData.class) }))
+        static LevelClo create(
+                Level level, CloPos pos, UpgradeData data, LevelChunkTicks<Block> blockTicks, LevelChunkTicks<Fluid> fluidTicks, long inhabitedTime,
+                @Nullable LevelChunkSection[] sections, @Nullable LevelClo.PostLoadProcessor postLoad, @Nullable BlendingData blendingData
+        ) {
             throw new DasmFailedToApply();
         }
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ServerLevel.class), @Ref(ProtoChunk.class), @Ref(LevelChunk.PostLoadProcessor.class)  }))
+
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ServerLevel.class), @Ref(ProtoChunk.class),
+            @Ref(LevelChunk.PostLoadProcessor.class) }))
         static LevelClo create(ServerLevel level, ProtoClo clo, @Nullable LevelClo.PostLoadProcessor postLoad) {
             throw new DasmFailedToApply();
         }
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.PostLoadProcessor.class), to = @Ref(LevelClo.PostLoadProcessor.class))
-    interface LevelChunk$PostLoadProcessor_to_LevelClo$PostLoadProcessor_redirects { }
+    interface LevelChunk$PostLoadProcessor_to_LevelClo$PostLoadProcessor_redirects {}
 
     @TypeRedirect(from = @Ref(ProtoChunk.class), to = @Ref(ProtoClo.class))
     interface ProtoChunk_to_ProtoClo_redirects extends ChunkAccess_to_CloAccess_redirects {
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ChunkPos.class), @Ref(UpgradeData.class), @Ref(LevelHeightAccessor.class), @Ref(Registry.class), @Ref(BlendingData.class) }))
-        static ProtoClo create(CloPos cloPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, @Nullable BlendingData blendingData) {
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ChunkPos.class), @Ref(UpgradeData.class), @Ref(LevelHeightAccessor.class),
+            @Ref(Registry.class), @Ref(BlendingData.class) }))
+        static ProtoClo create(
+                CloPos cloPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+                @Nullable BlendingData blendingData
+        ) {
             throw new DasmFailedToApply();
         }
 
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = {
-            @Ref(ChunkPos.class),
-            @Ref(UpgradeData.class),
-            @Ref(LevelChunkSection[].class),
-            @Ref(ProtoChunkTicks.class),
-            @Ref(ProtoChunkTicks.class),
-            @Ref(LevelHeightAccessor.class),
-            @Ref(Registry.class),
-            @Ref(BlendingData.class)}))
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(ChunkPos.class), @Ref(UpgradeData.class), @Ref(LevelChunkSection[].class),
+            @Ref(ProtoChunkTicks.class), @Ref(ProtoChunkTicks.class), @Ref(LevelHeightAccessor.class), @Ref(Registry.class),
+            @Ref(BlendingData.class) }))
         static ProtoClo create(
-            CloPos cloPos,
-            UpgradeData upgradeData,
-            @Nullable LevelChunkSection[] sections,
-            ProtoChunkTicks<Block> blockTicks,
-            ProtoChunkTicks<Fluid> liquidTicks,
-            LevelHeightAccessor levelHeightAccessor,
-            Registry<Biome> biomeRegistry,
-            @Nullable BlendingData blendingData
+                CloPos cloPos, UpgradeData upgradeData, @Nullable LevelChunkSection[] sections, ProtoChunkTicks<Block> blockTicks,
+                ProtoChunkTicks<Fluid> liquidTicks, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+                @Nullable BlendingData blendingData
         ) {
             throw new DasmFailedToApply();
         }
@@ -174,7 +160,7 @@ static ProtoClo create(
 
     @TypeRedirect(from = @Ref(ImposterProtoChunk.class), to = @Ref(ImposterProtoClo.class))
     interface ImposterProtoChunk_to_ImposterProtoClo_redirects {
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class), @Ref(boolean.class)}))
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class), @Ref(boolean.class) }))
         static ImposterProtoClo create(LevelClo wrapped, boolean allowWrites) {
             throw new DasmFailedToApply();
         }
@@ -184,17 +170,16 @@ static ImposterProtoClo create(LevelClo wrapped, boolean allowWrites) {
     }
 
     @TypeRedirect(from = @Ref(ChunkTrackingView.class), to = @Ref(CloTrackingView.class))
-    interface ChunkTrackingView_to_CloTrackingView_redirects {
-    }
+    interface ChunkTrackingView_to_CloTrackingView_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkTrackingView.Positioned.class), to = @Ref(CloTrackingView.Positioned.class))
-    abstract class ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects implements ChunkTrackingView_to_CloTrackingView_redirects {
-    }
+    abstract class ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects implements ChunkTrackingView_to_CloTrackingView_redirects {}
 
-    //region [Forge stuff]
+    // region [Forge stuff]
     // TODO move to a forge-specific sourceset
     @TypeRedirect(from = @Ref(ChunkEvent.Load.class), to = @Ref(Event.class))
-    abstract class ChunkEvent$Load_to_Event_redirects { }
+    abstract class ChunkEvent$Load_to_Event_redirects {}
+
     @InterOwnerContainer(from = @Ref(ChunkEvent.Load.class), to = @Ref(EventConstructorDelegates.class))
     abstract class ChunkEvent$Load_delegateConstruction {
         @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class), @Ref(boolean.class) }))
@@ -202,10 +187,11 @@ abstract class ChunkEvent$Load_delegateConstruction {
     }
 
     @TypeRedirect(from = @Ref(ChunkEvent.Unload.class), to = @Ref(Event.class))
-    abstract class ChunkEvent$Unload_to_Event_redirects { }
+    abstract class ChunkEvent$Unload_to_Event_redirects {}
+
     @InterOwnerContainer(from = @Ref(ChunkEvent.Unload.class), to = @Ref(EventConstructorDelegates.class))
     abstract class ChunkEvent$Unload_delegateConstruction {
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class)}))
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class) }))
         static native Event create_ChunkEvent$Unload(LevelCube levelCube);
     }
 
@@ -214,87 +200,68 @@ abstract class GenerationChunkHolder_Forge_Jank_redirects {
         @FieldToMethodRedirect(value = @FieldSig(name = "currentlyLoading", type = @Ref(LevelChunk.class)), setter = "cc_setCurrentlyLoading")
         public native LevelClo cc_getCurrentlyLoading();
     }
+
     @IntraOwnerContainer(@Ref(ChunkHolder.class))
     abstract class ChunkHolder_Forge_Jank_redirects extends GenerationChunkHolder_Forge_Jank_redirects {}
-    //endregion
+    // endregion
 
     @IntraOwnerContainer(@Ref(ChunkHolder.class))
-    class ChunkHolder_redirects extends GenerationChunkHolder_redirects {
-    }
+    class ChunkHolder_redirects extends GenerationChunkHolder_redirects {}
 
     @IntraOwnerContainer(@Ref(ProcessorChunkProgressListener.class))
-    class ProcessorChunkProgressListener_redirects {
-    }
+    class ProcessorChunkProgressListener_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkGenerationTask.class))
-    class ChunkGenerationTask_redirects {
-    }
+    class ChunkGenerationTask_redirects {}
 
     @IntraOwnerContainer(@Ref(GenerationChunkHolder.class))
-    class GenerationChunkHolder_redirects {
-    }
+    class GenerationChunkHolder_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkStorage.class))
-    class ChunkStorage_redirects {
-    }
+    class ChunkStorage_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkMap.class))
-    class ChunkMap_redirects extends ChunkStorage_redirects {
-    }
+    class ChunkMap_redirects extends ChunkStorage_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkMap.TrackedEntity.class))
-    class ChunkMap$TrackedEntity_redirects {
-    }
+    class ChunkMap$TrackedEntity_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerChunkCache.class))
-    class ServerChunkCache_redirects {
-    }
+    class ServerChunkCache_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerLevel.class))
-    class ServerLevel_redirects {
-    }
+    class ServerLevel_redirects {}
 
     @IntraOwnerContainer(@Ref(Entity.class))
-    class Entity_redirects {
-    }
+    class Entity_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerPlayer.class))
-    class ServerPlayer_redirects extends Entity_redirects {
-    }
+    class ServerPlayer_redirects extends Entity_redirects {}
 
     @IntraOwnerContainer(@Ref(PlayerChunkSender.class))
-    class PlayerChunkSender_redirects {
-    }
+    class PlayerChunkSender_redirects {}
 
     @InterOwnerContainer(from = @Ref(EventHooks.class), to = @Ref(CCEventHooks.class))
-    class EventHooks_to_CCEventHooks_redirects {
-    }
+    class EventHooks_to_CCEventHooks_redirects {}
 
     @InterOwnerContainer(from = @Ref(CommonHooks.class), to = @Ref(CCCommonHooks.class))
-    class CommonHooks_to_CCCommonHooks_redirects {
-    }
+    class CommonHooks_to_CCCommonHooks_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkTaskDispatcher.class))
-    class ChunkTaskDispatcher_redirects {
-    }
+    class ChunkTaskDispatcher_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkTaskPriorityQueue.class))
-    class ChunkTaskPriorityQueue_redirects {
-    }
+    class ChunkTaskPriorityQueue_redirects {}
 
     @IntraOwnerContainer(@Ref(SimulationChunkTracker.class))
-    class SimulationChunkTracker_redirects {
-    }
+    class SimulationChunkTracker_redirects {}
 
     @IntraOwnerContainer(@Ref(LoggerChunkProgressListener.class))
-    class LoggerChunkProgressListener_redirects {
-    }
+    class LoggerChunkProgressListener_redirects {}
 
     @IntraOwnerContainer(@Ref(StoringChunkProgressListener.class))
-    class StoringChunkProgressListener_redirects {
-    }
+    class StoringChunkProgressListener_redirects {}
 
     @IntraOwnerContainer(@Ref(TicketStorage.class))
-    class TicketStorage_redirects {
-    }
+    class TicketStorage_redirects {}
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCubeSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCubeSet.java
index 3e9c89b8..32e38e63 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCubeSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ChunkToCubeSet.java
@@ -69,8 +69,10 @@
 
 /**
  * Should be used for DASM transforms that work with only Cubes (as opposed to working with both Chunks and Cubes)
- * <br/><br/>
- * Cube-related field and type redirects, and method redirects containing Cube-related types in the signature or return type should be added to this set.
+ * <br/>
+ * <br/>
+ * Cube-related field and type redirects, and method redirects containing Cube-related types in the signature or return type should be added to this
+ * set.
  * <br/>
  * Other redirects may also be added to this set if they should only be applied in contexts working with only Cubes.
  * Redirects applicable in all contexts should be added to {@link GlobalSet}.
@@ -102,72 +104,67 @@ abstract class ChunkPos_to_CubePos_redirects {
 
     @TypeRedirect(from = @Ref(ChunkAccess.class), to = @Ref(CubeAccess.class))
     abstract class ChunkAccess_to_CubeAccess_redirects {
-        @FieldRedirect(@FieldSig(type = @Ref(ChunkPos.class), name = "chunkPos")) protected CubePos cubePos;
+        @FieldRedirect(@FieldSig(type = @Ref(ChunkPos.class), name = "chunkPos"))
+        protected CubePos cubePos;
 
-        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;")) public native CubePos cc_getCubePos();
+        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))
+        public native CubePos cc_getCubePos();
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.class), to = @Ref(LevelCube.class))
     abstract class LevelChunk_to_LevelCube_redirects {
-        @FieldRedirect(@FieldSig(type = @Ref(ChunkPos.class), name = "chunkPos")) protected CubePos cubePos;
+        @FieldRedirect(@FieldSig(type = @Ref(ChunkPos.class), name = "chunkPos"))
+        protected CubePos cubePos;
 
-        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;")) public native CubePos cc_getCubePos();
+        @MethodRedirect(@MethodSig("getPos()Lnet/minecraft/world/level/ChunkPos;"))
+        public native CubePos cc_getCubePos();
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.PostLoadProcessor.class), to = @Ref(LevelCube.PostLoadProcessor.class))
-    interface LevelChunk$PostLoadProcessor_to_LevelCube$PostLoadProcessor_redirects { }
+    interface LevelChunk$PostLoadProcessor_to_LevelCube$PostLoadProcessor_redirects {}
 
-    @TypeRedirect(
-        from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"),
-        to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$BoundTickingBlockEntity")
-    )
-    abstract class LevelChunk$BoundTickingBlockEntity_to_LevelCube$BoundTickingBlockEntity_redirects { }
+    @TypeRedirect(from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$BoundTickingBlockEntity"), to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$BoundTickingBlockEntity"))
+    abstract class LevelChunk$BoundTickingBlockEntity_to_LevelCube$BoundTickingBlockEntity_redirects {}
 
-    @TypeRedirect(
-        from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"),
-        to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$RebindableTickingBlockEntityWrapper")
-    )
-    abstract class LevelChunk$RebindableTickingBlockEntityWrapper_to_LevelCube$RebindableTickingBlockEntityWrapper_redirects { }
+    @TypeRedirect(from = @Ref(string = "net.minecraft.world.level.chunk.LevelChunk$RebindableTickingBlockEntityWrapper"), to = @Ref(string = "io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube$RebindableTickingBlockEntityWrapper"))
+    abstract class LevelChunk$RebindableTickingBlockEntityWrapper_to_LevelCube$RebindableTickingBlockEntityWrapper_redirects {}
 
     @TypeRedirect(from = @Ref(ProtoChunk.class), to = @Ref(ProtoCube.class))
-    abstract class ProtoChunk_to_ProtoCube_redirects { }
+    abstract class ProtoChunk_to_ProtoCube_redirects {}
 
     @TypeRedirect(from = @Ref(ImposterProtoChunk.class), to = @Ref(ImposterProtoCube.class))
-    abstract class ImposterProtoChunk_to_ImposterProtoCube_redirects { }
+    abstract class ImposterProtoChunk_to_ImposterProtoCube_redirects {}
 
     @TypeRedirect(from = @Ref(EmptyLevelChunk.class), to = @Ref(EmptyLevelCube.class))
-    abstract class EmptyLevelChunk_to_EmptyLevelCube_redirects { }
+    abstract class EmptyLevelChunk_to_EmptyLevelCube_redirects {}
 
     // FIXME probably need to move to a client-only set
     @TypeRedirect(from = @Ref(RenderChunk.class), to = @Ref(RenderCube.class))
-    abstract class RenderChunk_to_RenderCube_redirects { }
+    abstract class RenderChunk_to_RenderCube_redirects {}
 
     @TypeRedirect(from = @Ref(string = "net.minecraft.client.renderer.chunk.RenderRegionCache$ChunkInfo"), to = @Ref(RenderRegionCacheCubeInfo.class))
-    abstract class RenderRegionCache$ChunkInfo_to_RenderRegionCacheCubeInfo_redirects { }
+    abstract class RenderRegionCache$ChunkInfo_to_RenderRegionCacheCubeInfo_redirects {}
 
-    @TypeRedirect(
-        from = @Ref(ClientChunkCache.Storage.class),
-        to = @Ref(ClientCubeCache.Storage.class)
-    )
-    abstract class ClientChunkCache$Storage_to_ClientCubeCache$Storage_redirects { }
+    @TypeRedirect(from = @Ref(ClientChunkCache.Storage.class), to = @Ref(ClientCubeCache.Storage.class))
+    abstract class ClientChunkCache$Storage_to_ClientCubeCache$Storage_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkStatusTask.class), to = @Ref(CubeStatusTask.class))
-    interface ChunkStatusTask_to_CubeStatusTask_redirects { }
+    interface ChunkStatusTask_to_CubeStatusTask_redirects {}
 
     @TypeRedirect(from = @Ref(StaticCache2D.class), to = @Ref(StaticCache3D.class))
-    abstract class StaticCache2D_to_StaticCache3D_redirects { }
+    abstract class StaticCache2D_to_StaticCache3D_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkStep.class), to = @Ref(CubeStep.class))
-    abstract class ChunkStep_to_CubeStep_redirects { }
+    abstract class ChunkStep_to_CubeStep_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkStep.Builder.class), to = @Ref(CubeStep.Builder.class))
-    abstract class ChunkStep$Builder_to_CubeStep$Builder_redirects { }
+    abstract class ChunkStep$Builder_to_CubeStep$Builder_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkPyramid.class), to = @Ref(CubePyramid.class))
-    abstract class ChunkPyramid_to_CubePyramid_redirects { }
+    abstract class ChunkPyramid_to_CubePyramid_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkPyramid.Builder.class), to = @Ref(CubePyramid.Builder.class))
-    abstract class ChunkPyramid$Builder_to_CubePyramid$Builder_redirects { }
+    abstract class ChunkPyramid$Builder_to_CubePyramid$Builder_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkHolder.LevelChangeListener.class), to = @Ref(CubeHolder.LevelChangeListener.class))
     interface ChunkHolder$LevelChangeListener_to_CubeHolder$LevelChangeListener_redirects {
@@ -197,16 +194,16 @@ abstract class ChunkGenerationTask_redirects {
     }
 
     @TypeRedirect(from = @Ref(LevelChunk.UnsavedListener.class), to = @Ref(LevelCube.UnsavedListener.class))
-    interface LevelChunk$UnsavedListener_to_LevelCube$UnsavedListener_redirects { }
+    interface LevelChunk$UnsavedListener_to_LevelCube$UnsavedListener_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkHolder.class))
-    abstract class ChunkHolder_redirects extends GenerationChunkHolder_redirects {
-    }
+    abstract class ChunkHolder_redirects extends GenerationChunkHolder_redirects {}
 
-    //region [Forge stuff]
+    // region [Forge stuff]
     // TODO move to a forge-specific sourceset
     @TypeRedirect(from = @Ref(ChunkEvent.Load.class), to = @Ref(Event.class))
-    abstract class ChunkEvent$Load_to_Event_redirects { }
+    abstract class ChunkEvent$Load_to_Event_redirects {}
+
     @InterOwnerContainer(from = @Ref(ChunkEvent.Load.class), to = @Ref(EventConstructorDelegates.class))
     abstract class ChunkEvent$Load_delegateConstruction {
         @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class), @Ref(boolean.class) }))
@@ -214,26 +211,26 @@ abstract class ChunkEvent$Load_delegateConstruction {
     }
 
     @TypeRedirect(from = @Ref(ChunkEvent.Unload.class), to = @Ref(Event.class))
-    abstract class ChunkEvent$Unload_to_Event_redirects { }
+    abstract class ChunkEvent$Unload_to_Event_redirects {}
+
     @InterOwnerContainer(from = @Ref(ChunkEvent.Unload.class), to = @Ref(EventConstructorDelegates.class))
     abstract class ChunkEvent$Unload_delegateConstruction {
-        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class)}))
+        @ConstructorToFactoryRedirect(@ConstructorMethodSig(args = { @Ref(LevelChunk.class) }))
         static native Event create_ChunkEvent$Unload(LevelCube levelCube);
     }
 
     @IntraOwnerContainer(@Ref(GenerationChunkHolder.class))
     abstract class GenerationChunkHolder_Forge_Jank_redirects {}
+
     @IntraOwnerContainer(@Ref(ChunkHolder.class))
     abstract class ChunkHolder_Forge_Jank_redirects extends GenerationChunkHolder_Forge_Jank_redirects {}
-    //endregion
+    // endregion
 
     @InterOwnerContainer(from = @Ref(ChunkLevel.class), to = @Ref(CubeLevel.class))
-    class ChunkLevel_to_CubeLevel_redirects {
-    }
+    class ChunkLevel_to_CubeLevel_redirects {}
 
     @InterOwnerContainer(from = @Ref(ChunkStatusTasks.class), to = @Ref(CubeStatusTasks.class))
-    class ChunkStatusTasks_to_CubeStatusTasks_redirects {
-    }
+    class ChunkStatusTasks_to_CubeStatusTasks_redirects {}
 
     @IntraOwnerContainer(@Ref(GenerationChunkHolder.class))
     class GenerationChunkHolder_redirects {
@@ -242,42 +239,32 @@ class GenerationChunkHolder_redirects {
     }
 
     @IntraOwnerContainer(@Ref(ChunkMap.class))
-    class ChunkMap_redirects {
-    }
+    class ChunkMap_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerChunkCache.class))
-    class ServerChunkCache_redirects {
-    }
+    class ServerChunkCache_redirects {}
 
     @IntraOwnerContainer(@Ref(Entity.class))
-    class Entity_redirects {
-    }
+    class Entity_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerPlayer.class))
-    class ServerPlayer_redirects extends Entity_redirects {
-    }
+    class ServerPlayer_redirects extends Entity_redirects {}
 
     @IntraOwnerContainer(@Ref(ClientChunkCache.class))
-    class ClientChunkCache_redirects {
-    }
+    class ClientChunkCache_redirects {}
 
     @IntraOwnerContainer(@Ref(SectionOcclusionGraph.class))
-    class SectionOcclusionGraph_redirects {
-    }
+    class SectionOcclusionGraph_redirects {}
 
     @InterOwnerContainer(from = @Ref(CommonHooks.class), to = @Ref(CCCommonHooks.class))
-    class CommonHooks_to_CCCommonHooks_redirects {
-    }
+    class CommonHooks_to_CCCommonHooks_redirects {}
 
     @IntraOwnerContainer(@Ref(Level.class))
-    class Level_redirects {
-    }
+    class Level_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerLevel.class))
-    class ServerLevel_redirects extends Level_redirects {
-    }
+    class ServerLevel_redirects extends Level_redirects {}
 
     @IntraOwnerContainer(@Ref(LevelRenderer.class))
-    class LevelRenderer_redirects {
-    }
+    class LevelRenderer_redirects {}
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ForgeSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ForgeSet.java
index 5b38e6b5..53e5601a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ForgeSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/ForgeSet.java
@@ -10,6 +10,5 @@
 @RedirectSet
 public interface ForgeSet {
     @InterOwnerContainer(from = @Ref(EventHooks.class), to = @Ref(CCEventHooks.class))
-    class EventHooks_to_CCEventHooks_redirects {
-    }
+    class EventHooks_to_CCEventHooks_redirects {}
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/GlobalSet.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/GlobalSet.java
index cc817dc3..b6ec1b21 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/GlobalSet.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/dasmsets/GlobalSet.java
@@ -24,7 +24,6 @@
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ThreadedLevelLightEngine;
-import net.minecraft.server.level.TicketType;
 import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.server.level.progress.StoringChunkProgressListener;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -34,7 +33,8 @@
 
 /**
  * Contains redirects that are applied to all DASM transforms.
- * <br/><br/>
+ * <br/>
+ * <br/>
  * Redirects should only be added to this set if they are applicable in all contexts.
  */
 @RedirectSet
@@ -43,13 +43,8 @@ public interface GlobalSet extends ForgeSet {
     abstract class ChunkStatus_redirects {
         @MethodRedirect(@MethodSig("generate(Ljava/util/concurrent/Executor;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplateManager;Lnet/minecraft/server/level/ThreadedLevelLightEngine;Ljava/util/function/Function;Ljava/util/List;)Ljava/util/concurrent/CompletableFuture;"))
         public abstract CompletableFuture<ChunkResult<CloAccess>> cc_generate(
-            Executor exectutor,
-            ServerLevel level,
-            ChunkGenerator chunkGenerator,
-            StructureTemplateManager structureTemplateManager,
-            ThreadedLevelLightEngine lightEngine,
-            Function<CloAccess, CompletableFuture<ChunkResult<CloAccess>>> task,
-            List<CloAccess> cache
+                Executor exectutor, ServerLevel level, ChunkGenerator chunkGenerator, StructureTemplateManager structureTemplateManager,
+                ThreadedLevelLightEngine lightEngine, Function<CloAccess, CompletableFuture<ChunkResult<CloAccess>>> task, List<CloAccess> cache
         );
     }
 
@@ -63,23 +58,20 @@ interface ChunkProgressListener_to_CloProgressListener_redirects {
     }
 
     @TypeRedirect(from = @Ref(ChunkStatusUpdateListener.class), to = @Ref(CloStatusUpdateListener.class))
-    interface ChunkStatusUpdateListener_to_CloStatusUpdateListener_redirects { }
+    interface ChunkStatusUpdateListener_to_CloStatusUpdateListener_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkTrackingView.class), to = @Ref(CloTrackingView.class))
-    interface ChunkTrackingView_to_CloTrackingView_redirects { }
+    interface ChunkTrackingView_to_CloTrackingView_redirects {}
 
     @TypeRedirect(from = @Ref(ChunkTrackingView.Positioned.class), to = @Ref(CloTrackingView.Positioned.class))
-    abstract class ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects { }
+    abstract class ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects {}
 
     @IntraOwnerContainer(@Ref(StoringChunkProgressListener.class))
-    class StoringChunkProgressListener_redirects {
-    }
+    class StoringChunkProgressListener_redirects {}
 
     @IntraOwnerContainer(@Ref(ChunkMap.class))
-    class ChunkMap_redirects {
-    }
+    class ChunkMap_redirects {}
 
     @IntraOwnerContainer(@Ref(ServerChunkCache.class))
-    class ServerChunkCache_redirects {
-    }
+    class ServerChunkCache_redirects {}
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
index 0a79a5a1..2d481484 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
@@ -3,7 +3,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCloSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCubeSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.GlobalSet;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
index 993446fc..5cecf298 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
@@ -3,7 +3,6 @@
 import io.github.notstirred.dasm.api.annotations.Dasm;
 import io.github.notstirred.dasm.api.annotations.redirect.redirects.AddMethodToSets;
 import io.github.notstirred.dasm.api.annotations.selector.MethodSig;
-import io.github.notstirred.dasm.api.annotations.selector.Ref;
 import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ChunkToCloSet;
 import io.github.opencubicchunks.cubicchunks.mixin.dasmsets.ForgeSet;
@@ -21,7 +20,9 @@ public class CCEventHooks {
     // TODO onTrySpawnPortal?
 
     @AddMethodToSets(containers = ForgeSet.EventHooks_to_CCEventHooks_redirects.class, method = @MethodSig("fireChunkTicketLevelUpdated(Lnet/minecraft/server/level/ServerLevel;JIILnet/minecraft/server/level/ChunkHolder;)V"))
-    public static void fireChunkTicketLevelUpdated(ServerLevel level, long cloPos, int oldTicketLevel, int newTicketLevel, @Nullable ChunkHolder chunkHolder) {
+    public static void fireChunkTicketLevelUpdated(
+            ServerLevel level, long cloPos, int oldTicketLevel, int newTicketLevel, @Nullable ChunkHolder chunkHolder
+    ) {
         if (CloPos.isChunk(cloPos)) {
             EventHooks.fireChunkTicketLevelUpdated(level, cloPos, oldTicketLevel, newTicketLevel, chunkHolder);
         } else {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundForgetLevelCloPacket.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundForgetLevelCloPacket.java
index c4ba4a57..d1f69841 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundForgetLevelCloPacket.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundForgetLevelCloPacket.java
@@ -14,18 +14,17 @@
 import net.neoforged.neoforge.network.handling.IPayloadHandler;
 
 public record CCClientboundForgetLevelCloPacket(CloPos pos) implements CustomPacketPayload {
-    public static final CustomPacketPayload.Type<CCClientboundForgetLevelCloPacket> TYPE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "forget_clo"));
+    public static final CustomPacketPayload.Type<CCClientboundForgetLevelCloPacket> TYPE = new CustomPacketPayload.Type<>(
+            ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "forget_clo"));
 
-    public static final StreamCodec<ByteBuf, CCClientboundForgetLevelCloPacket> STREAM_CODEC = StreamCodec.composite(
-        CLO_POS_STREAM_CODEC, CCClientboundForgetLevelCloPacket::pos,
-        CCClientboundForgetLevelCloPacket::new
-    );
+    public static final StreamCodec<ByteBuf, CCClientboundForgetLevelCloPacket> STREAM_CODEC = StreamCodec.composite(CLO_POS_STREAM_CODEC,
+            CCClientboundForgetLevelCloPacket::pos, CCClientboundForgetLevelCloPacket::new);
 
     @Override public Type<? extends CustomPacketPayload> type() {
         return TYPE;
     }
 
-    public static class Handler implements IPayloadHandler<CCClientboundForgetLevelCloPacket>{
+    public static class Handler implements IPayloadHandler<CCClientboundForgetLevelCloPacket> {
         @Override public void handle(CCClientboundForgetLevelCloPacket payload, IPayloadContext context) {
             var clientChunkCache = ((ClientChunkCache) context.player().level().getChunkSource());
             // TODO P2: queueLightRemoval - look at vanilla packet handler
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelChunkPacket.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelChunkPacket.java
index 16cd35dd..2557d75a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelChunkPacket.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelChunkPacket.java
@@ -1,25 +1,21 @@
 package io.github.opencubicchunks.cubicchunks.network;
 
-import static io.github.opencubicchunks.cubicchunks.network.MiscStreamCodecs.CLO_POS_STREAM_CODEC;
-
 import io.github.opencubicchunks.cubicchunks.CubicChunks;
 import io.netty.buffer.ByteBuf;
-import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Level;
-import net.neoforged.neoforge.network.handling.IPayloadHandler;
 import net.neoforged.neoforge.network.handling.IPayloadContext;
+import net.neoforged.neoforge.network.handling.IPayloadHandler;
 
 public record CCClientboundLevelChunkPacket(ChunkPos pos) implements CustomPacketPayload {
-    public static final CustomPacketPayload.Type<CCClientboundLevelChunkPacket> TYPE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "level_chunk"));
+    public static final CustomPacketPayload.Type<CCClientboundLevelChunkPacket> TYPE = new CustomPacketPayload.Type<>(
+            ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "level_chunk"));
 
-    public static final StreamCodec<ByteBuf, CCClientboundLevelChunkPacket> STREAM_CODEC = StreamCodec.composite(
-        ChunkPos.STREAM_CODEC, CCClientboundLevelChunkPacket::pos,
-        CCClientboundLevelChunkPacket::new
-    );
+    public static final StreamCodec<ByteBuf, CCClientboundLevelChunkPacket> STREAM_CODEC = StreamCodec.composite(ChunkPos.STREAM_CODEC,
+            CCClientboundLevelChunkPacket::pos, CCClientboundLevelChunkPacket::new);
 
     @Override public Type<? extends CustomPacketPayload> type() {
         return TYPE;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
index 50ea40d0..fb3961ec 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
@@ -3,7 +3,6 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
@@ -55,7 +54,7 @@ private ByteBuf getWriteBuffer() {
     private static int calculateChunkSize(LevelCube cube) {
         int i = 0;
 
-        for(LevelChunkSection levelchunksection : cube.getSections()) {
+        for (LevelChunkSection levelchunksection : cube.getSections()) {
             i += levelchunksection.getSerializedSize();
         }
 
@@ -74,7 +73,8 @@ public FriendlyByteBuf getReadBuffer() {
 
     // Implement .equals for unit testing
     @Override public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) return false;
+        if (o == null || getClass() != o.getClass())
+            return false;
         CCClientboundLevelCubePacketData that = (CCClientboundLevelCubePacketData) o;
         return Objects.deepEquals(buffer, that.buffer);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubeWithLightPacket.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubeWithLightPacket.java
index cfc3b3d6..1d8e6743 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubeWithLightPacket.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubeWithLightPacket.java
@@ -26,13 +26,12 @@
 
 // TODO (P2) the name is currently a lie; no light data :)
 public record CCClientboundLevelCubeWithLightPacket(CubePos pos, CCClientboundLevelCubePacketData cubeData) implements CustomPacketPayload {
-    public static final Type<CCClientboundLevelCubeWithLightPacket> TYPE = new Type<>(ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "level_cube_with_light"));
+    public static final Type<CCClientboundLevelCubeWithLightPacket> TYPE = new Type<>(
+            ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "level_cube_with_light"));
 
     public static final StreamCodec<FriendlyByteBuf, CCClientboundLevelCubeWithLightPacket> STREAM_CODEC = StreamCodec.composite(
-        CUBE_POS_STREAM_CODEC, CCClientboundLevelCubeWithLightPacket::pos,
-        CCClientboundLevelCubePacketData.STREAM_CODEC, CCClientboundLevelCubeWithLightPacket::cubeData,
-        CCClientboundLevelCubeWithLightPacket::new
-    );
+            CUBE_POS_STREAM_CODEC, CCClientboundLevelCubeWithLightPacket::pos, CCClientboundLevelCubePacketData.STREAM_CODEC,
+            CCClientboundLevelCubeWithLightPacket::cubeData, CCClientboundLevelCubeWithLightPacket::new);
 
     @Override public Type<? extends CustomPacketPayload> type() {
         return TYPE;
@@ -43,8 +42,7 @@ public CCClientboundLevelCubeWithLightPacket(LevelCube cube) {
     }
 
     public static class Handler implements IPayloadHandler<CCClientboundLevelCubeWithLightPacket> {
-        @Override
-        public void handle(CCClientboundLevelCubeWithLightPacket payload, IPayloadContext context) {
+        @Override public void handle(CCClientboundLevelCubeWithLightPacket payload, IPayloadContext context) {
             int x = payload.pos.getX();
             int y = payload.pos.getY();
             int z = payload.pos.getZ();
@@ -58,10 +56,8 @@ private void updateLevelCube(Level level, int x, int y, int z, CCClientboundLeve
             // TODO P2 :: No block entity tags consumer
             Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> entityTagConsumer = (a) -> {};
 
-            ((ClientCubeCache)(level
-                .getChunkSource()))
-                .cc_replaceWithPacketData(
-                    x, y, z, payload.cubeData.getReadBuffer(), heightmaps, entityTagConsumer);
+            ((ClientCubeCache) (level.getChunkSource())).cc_replaceWithPacketData(x, y, z, payload.cubeData.getReadBuffer(), heightmaps,
+                    entityTagConsumer);
 
             // TODO P2 :: Vanilla does light updates at this point
 //            ClientboundLightUpdatePacketData clientboundlightupdatepacketdata = payload.getLightData();
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundSetCubeCacheCenterPacket.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundSetCubeCacheCenterPacket.java
index 545a4371..dd29332a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundSetCubeCacheCenterPacket.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundSetCubeCacheCenterPacket.java
@@ -10,17 +10,15 @@
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
-import net.neoforged.neoforge.network.handling.IPayloadHandler;
 import net.neoforged.neoforge.network.handling.IPayloadContext;
+import net.neoforged.neoforge.network.handling.IPayloadHandler;
 
 public record CCClientboundSetCubeCacheCenterPacket(CubePos pos) implements CustomPacketPayload {
-    public static final CustomPacketPayload.Type<CCClientboundSetCubeCacheCenterPacket> TYPE = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "set_cube_cache_center"));
-
+    public static final CustomPacketPayload.Type<CCClientboundSetCubeCacheCenterPacket> TYPE = new CustomPacketPayload.Type<>(
+            ResourceLocation.fromNamespaceAndPath(CubicChunks.MODID, "set_cube_cache_center"));
 
-    public static final StreamCodec<ByteBuf, CCClientboundSetCubeCacheCenterPacket> STREAM_CODEC = StreamCodec.composite(
-        CUBE_POS_STREAM_CODEC, CCClientboundSetCubeCacheCenterPacket::pos,
-        CCClientboundSetCubeCacheCenterPacket::new
-    );
+    public static final StreamCodec<ByteBuf, CCClientboundSetCubeCacheCenterPacket> STREAM_CODEC = StreamCodec.composite(CUBE_POS_STREAM_CODEC,
+            CCClientboundSetCubeCacheCenterPacket::pos, CCClientboundSetCubeCacheCenterPacket::new);
 
     @Override public Type<? extends CustomPacketPayload> type() {
         return TYPE;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
index d1488fef..1a82787c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
@@ -14,9 +14,13 @@ public static void register(final RegisterPayloadHandlersEvent event) {
         final PayloadRegistrar registrar = event.registrar(CubicChunks.MODID);
 
         // Note that by default handlers run on the main thread.
-        registrar.playToClient(CCClientboundLevelCubeWithLightPacket.TYPE, CCClientboundLevelCubeWithLightPacket.STREAM_CODEC, new CCClientboundLevelCubeWithLightPacket.Handler());
-        registrar.playToClient(CCClientboundLevelChunkPacket.TYPE, CCClientboundLevelChunkPacket.STREAM_CODEC, new CCClientboundLevelChunkPacket.Handler());
-        registrar.playToClient(CCClientboundForgetLevelCloPacket.TYPE, CCClientboundForgetLevelCloPacket.STREAM_CODEC, new CCClientboundForgetLevelCloPacket.Handler());
-        registrar.playToClient(CCClientboundSetCubeCacheCenterPacket.TYPE, CCClientboundSetCubeCacheCenterPacket.STREAM_CODEC, new CCClientboundSetCubeCacheCenterPacket.Handler());
+        registrar.playToClient(CCClientboundLevelCubeWithLightPacket.TYPE, CCClientboundLevelCubeWithLightPacket.STREAM_CODEC,
+                new CCClientboundLevelCubeWithLightPacket.Handler());
+        registrar.playToClient(CCClientboundLevelChunkPacket.TYPE, CCClientboundLevelChunkPacket.STREAM_CODEC,
+                new CCClientboundLevelChunkPacket.Handler());
+        registrar.playToClient(CCClientboundForgetLevelCloPacket.TYPE, CCClientboundForgetLevelCloPacket.STREAM_CODEC,
+                new CCClientboundForgetLevelCloPacket.Handler());
+        registrar.playToClient(CCClientboundSetCubeCacheCenterPacket.TYPE, CCClientboundSetCubeCacheCenterPacket.STREAM_CODEC,
+                new CCClientboundSetCubeCacheCenterPacket.Handler());
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/package-info.java b/src/main/java/io/github/opencubicchunks/cubicchunks/package-info.java
index cf818295..d64b6033 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/package-info.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/package-info.java
@@ -4,4 +4,4 @@
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import io.github.opencubicchunks.cc_core.annotation.MethodsReturnNonnullByDefault;
\ No newline at end of file
+import io.github.opencubicchunks.cc_core.annotation.MethodsReturnNonnullByDefault;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloHolder.java
index fdcdc085..6bee3a0c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloHolder.java
@@ -1,4 +1,3 @@
 package io.github.opencubicchunks.cubicchunks.server.level;
 
-public interface CloHolder extends GenerationCloHolder {
-}
+public interface CloHolder extends GenerationCloHolder {}
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
index ed8f725c..cba3e02c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
@@ -23,17 +23,13 @@ public interface CloTrackingView extends ChunkTrackingView {
             return false;
         }
 
-        @Override public void cc_forEach(Consumer<CloPos> action) {
-        }
+        @Override public void cc_forEach(Consumer<CloPos> action) {}
 
-        @Override
-        public boolean contains(int x, int z, boolean searchAllChunks) {
+        @Override public boolean contains(int x, int z, boolean searchAllChunks) {
             return false;
         }
 
-        @Override
-        public void forEach(Consumer<ChunkPos> action) {
-        }
+        @Override public void forEach(Consumer<ChunkPos> action) {}
     };
 
     @AddMethodToSets(containers = ChunkToCloSet.ChunkTrackingView_to_CloTrackingView_redirects.class, method = @MethodSig("of(Lnet/minecraft/world/level/ChunkPos;I)Lnet/minecraft/server/level/ChunkTrackingView;"))
@@ -42,10 +38,11 @@ static CloTrackingView cc_of(CloPos center, int viewDistanceCubes) {
     }
 
     @AddMethodToSets(containers = ChunkToCloSet.ChunkTrackingView_to_CloTrackingView_redirects.class, method = @MethodSig("difference(Lnet/minecraft/server/level/ChunkTrackingView;Lnet/minecraft/server/level/ChunkTrackingView;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"))
-    static void cc_difference(CloTrackingView oldCloTrackingView, CloTrackingView newCloTrackingView, Consumer<CloPos> chunkDropper, Consumer<CloPos> chunkMarker) {
+    static void cc_difference(
+            CloTrackingView oldCloTrackingView, CloTrackingView newCloTrackingView, Consumer<CloPos> chunkDropper, Consumer<CloPos> chunkMarker
+    ) {
         if (!oldCloTrackingView.equals(newCloTrackingView)) {
-            if (oldCloTrackingView instanceof Positioned oldPositioned
-                && newCloTrackingView instanceof Positioned newPositioned) {
+            if (oldCloTrackingView instanceof Positioned oldPositioned && newCloTrackingView instanceof Positioned newPositioned) {
                 if (oldPositioned.cc_cubeIntersects(newPositioned)) {
                     int minCubeX = Math.min(oldPositioned.minX(), newPositioned.minX());
                     int minCubeY = Math.min(oldPositioned.minY(), newPositioned.minY());
@@ -54,7 +51,7 @@ static void cc_difference(CloTrackingView oldCloTrackingView, CloTrackingView ne
                     int maxCubeY = Math.max(oldPositioned.maxY(), newPositioned.maxY());
                     int maxCubeZ = Math.max(oldPositioned.maxZ(), newPositioned.maxZ());
 
-                    for(int cubeX = minCubeX; cubeX <= maxCubeX; ++cubeX) {
+                    for (int cubeX = minCubeX; cubeX <= maxCubeX; ++cubeX) {
                         for (int cubeZ = minCubeZ; cubeZ <= maxCubeZ; ++cubeZ) {
                             for (int dx = 0; dx < CubicConstants.DIAMETER_IN_SECTIONS; dx++) {
                                 for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
@@ -91,7 +88,7 @@ static void cc_difference(CloTrackingView oldCloTrackingView, CloTrackingView ne
                     int maxCubeX = Math.max(oldPositioned.maxX(), newPositioned.maxX());
                     int maxCubeZ = Math.max(oldPositioned.maxZ(), newPositioned.maxZ());
 
-                    for(int cubeX = minCubeX; cubeX <= maxCubeX; ++cubeX) {
+                    for (int cubeX = minCubeX; cubeX <= maxCubeX; ++cubeX) {
                         for (int cubeZ = minCubeZ; cubeZ <= maxCubeZ; ++cubeZ) {
                             for (int dx = 0; dx < CubicConstants.DIAMETER_IN_SECTIONS; dx++) {
                                 for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
@@ -148,20 +145,28 @@ static boolean cc_isInViewDistance(int centerCubeX, int centerCubeY, int centerC
         return cc_isWithinDistance(centerCubeX, centerCubeY, centerCubeZ, viewDistanceCubes, cubeX, cubeY, cubeZ, false);
     }
 
-    static boolean cc_isWithinDistance(int centerCubeX, int centerCubeY, int centerCubeZ, int viewDistanceCubes, int cubeX, int cubeY, int cubeZ, boolean includeOuterChunksAdjacentToViewBorder) {
+    static boolean cc_isWithinDistance(
+            int centerCubeX, int centerCubeY, int centerCubeZ, int viewDistanceCubes, int cubeX, int cubeY, int cubeZ,
+            boolean includeOuterChunksAdjacentToViewBorder
+    ) {
         int i = includeOuterChunksAdjacentToViewBorder ? 2 : 1;
         int dx = Math.max(0, Math.abs(cubeX - centerCubeX) - i);
         int dy = Math.max(0, Math.abs(cubeY - centerCubeY) - i);
         int dz = Math.max(0, Math.abs(cubeZ - centerCubeZ) - i);
-        return dx*dx + dy*dy + dz*dz < viewDistanceCubes * viewDistanceCubes;
+        return dx * dx + dy * dy + dz * dz < viewDistanceCubes * viewDistanceCubes;
     }
 
-    static boolean cc_isWithinDistanceCubeColumn(int centerCubeX, int centerCubeZ, int viewDistanceCubes, int cubeX, int cubeZ, boolean includeOuterChunksAdjacentToViewBorder) {
+    static boolean cc_isWithinDistanceCubeColumn(
+            int centerCubeX, int centerCubeZ, int viewDistanceCubes, int cubeX, int cubeZ, boolean includeOuterChunksAdjacentToViewBorder
+    ) {
         return cc_isWithinDistance(centerCubeX, 0, centerCubeZ, viewDistanceCubes, cubeX, 0, cubeZ, includeOuterChunksAdjacentToViewBorder);
     }
 
     @Dasm(ChunkToCloSet.class)
-    record Positioned(CloPos center, @AddMethodToSets(containers = ChunkToCloSet.ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects.class, method = @MethodSig("viewDistance()I")) int viewDistanceCubes) implements CloTrackingView {
+    record Positioned(
+            CloPos center,
+            @AddMethodToSets(containers = ChunkToCloSet.ChunkTrackingView$Positioned_to_CloTrackingView$Positioned_redirects.class, method = @MethodSig("viewDistance()I")) int viewDistanceCubes
+    ) implements CloTrackingView {
         int minX() {
             return this.center.getX() - this.viewDistanceCubes - 1;
         }
@@ -186,15 +191,14 @@ int maxZ() {
             return this.center.getZ() + this.viewDistanceCubes + 1;
         }
 
-        @Override
-        public boolean contains(int chunkX, int chunkZ, boolean searchAllChunks) {
-            return cc_isWithinDistanceCubeColumn(this.center.getX(), this.center.getZ(), this.viewDistanceCubes, Coords.sectionToCube(chunkX), Coords.sectionToCube(chunkZ), searchAllChunks);
+        @Override public boolean contains(int chunkX, int chunkZ, boolean searchAllChunks) {
+            return cc_isWithinDistanceCubeColumn(this.center.getX(), this.center.getZ(), this.viewDistanceCubes, Coords.sectionToCube(chunkX),
+                    Coords.sectionToCube(chunkZ), searchAllChunks);
         }
 
-        @Override
-        public void forEach(Consumer<ChunkPos> action) {
-            for(int x = this.minX(); x <= this.maxX(); ++x) {
-                for(int z = this.minZ(); z <= this.maxZ(); ++z) {
+        @Override public void forEach(Consumer<ChunkPos> action) {
+            for (int x = this.minX(); x <= this.maxX(); ++x) {
+                for (int z = this.minZ(); z <= this.maxZ(); ++z) {
                     if (this.cc_contains(x, center.getY(), z)) {
                         for (int dx = 0; dx < CubicConstants.DIAMETER_IN_SECTIONS; dx++) {
                             for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
@@ -207,23 +211,22 @@ public void forEach(Consumer<ChunkPos> action) {
         }
 
         private boolean cc_cubeIntersects(CloTrackingView.Positioned other) {
-            return this.minX() <= other.maxX() && this.maxX() >= other.minX()
-                && this.minY() <= other.maxY() && this.maxY() >= other.minY()
-                && this.minZ() <= other.maxZ() && this.maxZ() >= other.minZ();
+            return this.minX() <= other.maxX() && this.maxX() >= other.minX() && this.minY() <= other.maxY() && this.maxY() >= other.minY()
+                    && this.minZ() <= other.maxZ() && this.maxZ() >= other.minZ();
         }
 
         private boolean cc_chunkIntersects(CloTrackingView.Positioned other) {
-            return this.minX() <= other.maxX() && this.maxX() >= other.minX()
-                && this.minZ() <= other.maxZ() && this.maxZ() >= other.minZ();
+            return this.minX() <= other.maxX() && this.maxX() >= other.minX() && this.minZ() <= other.maxZ() && this.maxZ() >= other.minZ();
         }
 
         @Override public boolean cc_contains(int cubeX, int cubeY, int cubeZ, boolean searchAllChunks) {
-            return cc_isWithinDistance(this.center.getX(), this.center.getY(), this.center.getZ(), this.viewDistanceCubes, cubeX, cubeY, cubeZ, searchAllChunks);
+            return cc_isWithinDistance(this.center.getX(), this.center.getY(), this.center.getZ(), this.viewDistanceCubes, cubeX, cubeY, cubeZ,
+                    searchAllChunks);
         }
 
         @Override public void cc_forEach(Consumer<CloPos> action) {
-            for(int x = this.minX(); x <= this.maxX(); ++x) {
-                for(int z = this.minZ(); z <= this.maxZ(); ++z) {
+            for (int x = this.minX(); x <= this.maxX(); ++x) {
+                for (int z = this.minZ(); z <= this.maxZ(); ++z) {
                     if (this.cc_contains(x, center.getY(), z)) {
                         for (int dx = 0; dx < CubicConstants.DIAMETER_IN_SECTIONS; dx++) {
                             for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
@@ -231,7 +234,7 @@ private boolean cc_chunkIntersects(CloTrackingView.Positioned other) {
                             }
                         }
                     }
-                    for(int y = this.minY(); y <= this.maxY(); ++y) {
+                    for (int y = this.minY(); y <= this.maxY(); ++y) {
                         if (this.cc_contains(x, y, z)) {
                             action.accept(CloPos.cube(x, y, z));
                         }
@@ -241,9 +244,9 @@ private boolean cc_chunkIntersects(CloTrackingView.Positioned other) {
         }
 
         private void cc_forEachCubesOnly(Consumer<CloPos> action) {
-            for(int x = this.minX(); x <= this.maxX(); ++x) {
-                for(int z = this.minZ(); z <= this.maxZ(); ++z) {
-                    for(int y = this.minY(); y <= this.maxY(); ++y) {
+            for (int x = this.minX(); x <= this.maxX(); ++x) {
+                for (int z = this.minZ(); z <= this.maxZ(); ++z) {
+                    for (int y = this.minY(); y <= this.maxY(); ++y) {
                         if (this.cc_contains(x, y, z)) {
                             action.accept(CloPos.cube(x, y, z));
                         }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
index d3be5617..e6420bcf 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
@@ -25,18 +25,17 @@ public class CubeLevel {
     private static final CubeStep FULL_CUBE_STEP = CubePyramid.CC_GENERATION_PYRAMID_CUBES.getStepTo(ChunkStatus.FULL);
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkLevel_to_CubeLevel_redirects.class, field = @FieldSig(type = @Ref(int.class), name = "RADIUS_AROUND_FULL_CHUNK"))
     public static final int RADIUS_AROUND_FULL_CUBE = FULL_CUBE_STEP.accumulatedDependencies().getRadius();
-    // TODO not sure if this one should actually be redirected? in some cases we want this MAX_LEVEL, in some cases we want the true MAX_LEVEL, which is greater.
+    // TODO not sure if this one should actually be redirected? in some cases we want this MAX_LEVEL, in some cases we want the true MAX_LEVEL, which
+    // is greater.
     public static final int MAX_LEVEL = FULL_CHUNK_LEVEL + RADIUS_AROUND_FULL_CUBE;
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkLevel_to_CubeLevel_redirects.class, method = @MethodSig("generationStatus(I)Lnet/minecraft/world/level/chunk/status/ChunkStatus;"))
-    @Nullable
-    public static ChunkStatus cubeGenerationStatus(int level) {
+    @Nullable public static ChunkStatus cubeGenerationStatus(int level) {
         return getStatusAroundFullCube(level - FULL_CHUNK_LEVEL, null);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkLevel_to_CubeLevel_redirects.class, method = @MethodSig("getStatusAroundFullChunk(ILnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/status/ChunkStatus;"))
-    @Nullable
-    @Contract("_,!null->!null;_,_->_")
+    @Nullable @Contract("_,!null->!null;_,_->_")
     public static ChunkStatus getStatusAroundFullCube(int distance, @Nullable ChunkStatus chunkStatus) {
         if (distance > RADIUS_AROUND_FULL_CUBE) {
             return chunkStatus;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/ServerCubeCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/ServerCubeCache.java
index 463fa4a8..78269c07 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/ServerCubeCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/ServerCubeCache.java
@@ -14,11 +14,10 @@
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 public interface ServerCubeCache extends CubeSource {
-    CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFuture(
-        int pX, int pY, int pZ, ChunkStatus pChunkStatus, boolean pLoad
-    );
+    CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFuture(int pX, int pY, int pZ, ChunkStatus pChunkStatus, boolean pLoad);
 
     void cc_blockChanged(BlockPos pos);
+
     void cc_onLightUpdate(LightLayer pType, SectionPos pPos);
 
     void cc_addTicket(Ticket ticket, CloPos cloPos);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/util/StaticCache3D.java b/src/main/java/io/github/opencubicchunks/cubicchunks/util/StaticCache3D.java
index c9e6624d..b3cd8821 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/util/StaticCache3D.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/util/StaticCache3D.java
@@ -47,7 +47,7 @@ private StaticCache3D(int minX, int minY, int minZ, int sizeX, int sizeY, int si
 
     public void forEach(Consumer<T> action) {
         for (Object object : this.cache) {
-            action.accept((T)object);
+            action.accept((T) object);
         }
     }
 
@@ -55,7 +55,7 @@ public T get(int x, int y, int z) {
         if (!this.contains(x, y, z)) {
             throw new IllegalArgumentException("Requested out of range value (" + x + "," + y + "," + z + ") from " + this);
         } else {
-            return (T)this.cache[this.getIndex(x, y, z)];
+            return (T) this.cache[this.getIndex(x, y, z)];
         }
     }
 
@@ -66,9 +66,9 @@ public boolean contains(int x, int y, int z) {
         return xIndex >= 0 && xIndex < this.sizeX && yIndex >= 0 && yIndex < this.sizeY && zIndex >= 0 && zIndex < this.sizeZ;
     }
 
-    @Override
-    public String toString() {
-        return String.format(Locale.ROOT, "StaticCache3D[%d, %d, %d, %d, %d, %d]", this.minX, this.minY, this.minZ, this.minX + this.sizeX, this.minY + this.sizeY, this.minZ + this.sizeZ);
+    @Override public String toString() {
+        return String.format(Locale.ROOT, "StaticCache3D[%d, %d, %d, %d, %d, %d]", this.minX, this.minY, this.minZ, this.minX + this.sizeX,
+                this.minY + this.sizeY, this.minZ + this.sizeZ);
     }
 
     private int getIndex(int x, int y, int z) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevel.java
index 2f62f94c..c9f207cd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevel.java
@@ -5,5 +5,6 @@
 
 public interface CubicLevel extends CubicLevelAccessor {
     LevelCube cc_getCubeAt(BlockPos blockPos);
+
     LevelCube cc_getCube(int x, int y, int z);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelAccessor.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelAccessor.java
index c63e5191..740ca611 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelAccessor.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelAccessor.java
@@ -5,8 +5,7 @@
 public interface CubicLevelAccessor extends CubicLevelReader {
     CubeSource cc_getCubeSource();
 
-    @Override
-    default boolean cc_hasCube(int cubeX, int cubeY, int cubeZ) {
+    @Override default boolean cc_hasCube(int cubeX, int cubeY, int cubeZ) {
         return this.cc_getCubeSource().cc_hasCube(cubeX, cubeY, cubeZ);
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
index 94f5cff1..9354ce45 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
@@ -49,9 +49,9 @@ default boolean cc_hasCubesAt(int minBlockX, int minBlockY, int minBlockZ, int m
         int minZ = Coords.blockToCube(minBlockZ);
         int maxZ = Coords.blockToCube(maxBlockZ);
 
-        for(int x = minX; x <= maxX; ++x) {
-            for(int z = minZ; z <= maxZ; ++z) {
-                for(int y = minY; y <= maxY; ++y) {
+        for (int x = minX; x <= maxX; ++x) {
+            for (int z = minZ; z <= maxZ; ++z) {
+                for (int y = minY; y <= maxY; ++y) {
                     if (!this.cc_hasCube(x, y, z)) {
                         return false;
                     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
index 23270310..ce1b9b49 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
@@ -27,98 +27,111 @@
  */
 @Dasm(ChunkInCubicContextSet.class)
 public class CCChunkStatusTasks {
-    @AddTransformToSets(ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class) @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
+    @AddTransformToSets(ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
     private static native boolean isLighted(ChunkAccess chunk);
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("passThrough(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> passThrough(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return CompletableFuture.completedFuture(chunk);
     }
 
     // We skip chunk generation steps in cubic contexts by delegating to passThrough
-    @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))// We skip chunk generation steps in cubic contexts by delegating to passThrough
+    @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;")) // We
+                                                                                                                                                                                                                                                                                                                                                                                                    // skip
+                                                                                                                                                                                                                                                                                                                                                                                                    // chunk
+                                                                                                                                                                                                                                                                                                                                                                                                    // generation
+                                                                                                                                                                                                                                                                                                                                                                                                    // steps
+                                                                                                                                                                                                                                                                                                                                                                                                    // in
+                                                                                                                                                                                                                                                                                                                                                                                                    // cubic
+                                                                                                                                                                                                                                                                                                                                                                                                    // contexts
+                                                                                                                                                                                                                                                                                                                                                                                                    // by
+                                                                                                                                                                                                                                                                                                                                                                                                    // delegating
+                                                                                                                                                                                                                                                                                                                                                                                                    // to
+                                                                                                                                                                                                                                                                                                                                                                                                    // passThrough
     public static CompletableFuture<ChunkAccess> generateStructureStarts(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("loadStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> loadStructureStarts(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateStructureReferences(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateStructureReferences(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateBiomes(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateBiomes(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateNoise(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateNoise(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateSurface(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateSurface(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateCarvers(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateCarvers(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateFeatures(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateFeatures(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("initializeLight(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> initializeLight(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("light(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> light(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateSpawn(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateSpawn(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
         return passThrough(worldGenContext, step, cache, chunk);
     }
 
     // We still want to upgrade ProtoChunks to LevelChunks normally
-    @AddTransformToSets(ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class) @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("full(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("full(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static native CompletableFuture<ChunkAccess> full(
-        WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
+            WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     );
 
     @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V"))
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
index 78f8ef95..cd55c655 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
@@ -110,7 +110,9 @@ public interface CloAccess extends BlockGetter, BiomeManager.NoiseBiomeSource, L
 
     void findBlocks(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> output);
 
-    void findBlocks(Predicate<BlockState> predicate, java.util.function.BiPredicate<BlockState, BlockPos> fineFilter, BiConsumer<BlockPos, BlockState> output);
+    void findBlocks(
+            Predicate<BlockState> predicate, java.util.function.BiPredicate<BlockState, BlockPos> fineFilter, BiConsumer<BlockPos, BlockState> output
+    );
 
     TickContainerAccess<Block> getBlockTicks();
 
@@ -138,7 +140,8 @@ public interface CloAccess extends BlockGetter, BiomeManager.NoiseBiomeSource, L
 
     NoiseChunk getOrCreateNoiseChunk(Function<CloAccess, NoiseChunk> noiseChunkCreator);
 
-    @Deprecated BiomeGenerationSettings carverBiome(Supplier<BiomeGenerationSettings> carverBiomeSettingsProvider);
+    @Deprecated
+    BiomeGenerationSettings carverBiome(Supplier<BiomeGenerationSettings> carverBiomeSettingsProvider);
 
     void fillBiomesFromNoise(BiomeResolver resolver, Climate.Sampler sampler);
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/LevelClo.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/LevelClo.java
index 345b1306..d348963f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/LevelClo.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/LevelClo.java
@@ -35,21 +35,20 @@ static LevelClo create(Level level, CloPos pos) {
             return (LevelClo) new LevelChunk(level, pos.chunkPos());
         }
     }
-    static LevelClo create(Level level,
-                           CloPos pos,
-                           UpgradeData data,
-                           LevelChunkTicks<Block> blockTicks,
-                           LevelChunkTicks<Fluid> fluidTicks,
-                           long inhabitedTime,
-                           @Nullable LevelChunkSection[] sections,
-                           @Nullable PostLoadProcessor postLoad,
-                           @Nullable BlendingData blendingData) {
+
+    static LevelClo create(
+            Level level, CloPos pos, UpgradeData data, LevelChunkTicks<Block> blockTicks, LevelChunkTicks<Fluid> fluidTicks, long inhabitedTime,
+            @Nullable LevelChunkSection[] sections, @Nullable PostLoadProcessor postLoad, @Nullable BlendingData blendingData
+    ) {
         if (pos.isCube()) {
-            return new LevelCube(level, pos.cubePos(), data, blockTicks, fluidTicks, inhabitedTime, sections, PostLoadProcessor.forCube(postLoad), blendingData);
+            return new LevelCube(level, pos.cubePos(), data, blockTicks, fluidTicks, inhabitedTime, sections, PostLoadProcessor.forCube(postLoad),
+                    blendingData);
         } else {
-            return (LevelClo) new LevelChunk(level, pos.chunkPos(), data, blockTicks, fluidTicks, inhabitedTime, sections, PostLoadProcessor.forChunk(postLoad), blendingData);
+            return (LevelClo) new LevelChunk(level, pos.chunkPos(), data, blockTicks, fluidTicks, inhabitedTime, sections,
+                    PostLoadProcessor.forChunk(postLoad), blendingData);
         }
     }
+
     static LevelClo create(ServerLevel level, ProtoClo clo, @Nullable PostLoadProcessor postLoad) {
         if (clo instanceof ProtoCube cube) {
             return new LevelCube(level, cube, PostLoadProcessor.forCube(postLoad));
@@ -62,8 +61,7 @@ static LevelClo create(ServerLevel level, ProtoClo clo, @Nullable PostLoadProces
 
     FluidState getFluidState(int x, int y, int z);
 
-    @Nullable
-    BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
+    @Nullable BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
 
     void addAndRegisterBlockEntity(BlockEntity blockEntity);
 
@@ -74,7 +72,7 @@ static LevelClo create(ServerLevel level, ProtoClo clo, @Nullable PostLoadProces
     boolean isEmpty();
 
     void replaceWithPacketData(
-        FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map, Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> outputTagConsumer
+            FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map, Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> outputTagConsumer
     );
 
     void replaceBiomes(FriendlyByteBuf buffer);
@@ -104,6 +102,7 @@ void replaceWithPacketData(
     @FunctionalInterface
     interface PostLoadProcessor {
         void run(LevelClo chunk);
+
         /**
          * vanilla expects a (LevelChunk -> void) but this PostLoadProcessor is a (LevelClo -> void), so we delegate
          */
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/ProtoClo.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/ProtoClo.java
index d2c2f064..d1f37d9b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/ProtoClo.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/ProtoClo.java
@@ -27,7 +27,10 @@
 import net.minecraft.world.ticks.ProtoChunkTicks;
 
 public interface ProtoClo extends CloAccess {
-    static ProtoClo create(CloPos cloPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, @Nullable BlendingData blendingData) {
+    static ProtoClo create(
+            CloPos cloPos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+            @Nullable BlendingData blendingData
+    ) {
         if (cloPos.isCube()) {
             return new ProtoCube(cloPos.cubePos(), upgradeData, levelHeightAccessor, biomeRegistry, blendingData);
         } else {
@@ -36,19 +39,15 @@ static ProtoClo create(CloPos cloPos, UpgradeData upgradeData, LevelHeightAccess
     }
 
     static ProtoClo create(
-        CloPos cloPos,
-        UpgradeData upgradeData,
-        @Nullable LevelChunkSection[] sections,
-        ProtoChunkTicks<Block> blockTicks,
-        ProtoChunkTicks<Fluid> liquidTicks,
-        LevelHeightAccessor levelHeightAccessor,
-        Registry<Biome> biomeRegistry,
-        @Nullable BlendingData blendingData
+            CloPos cloPos, UpgradeData upgradeData, @Nullable LevelChunkSection[] sections, ProtoChunkTicks<Block> blockTicks,
+            ProtoChunkTicks<Fluid> liquidTicks, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+            @Nullable BlendingData blendingData
     ) {
         if (cloPos.isCube()) {
             return new ProtoCube(cloPos.cubePos(), upgradeData, sections, blockTicks, liquidTicks, levelHeightAccessor, biomeRegistry, blendingData);
         } else {
-            return (ProtoClo) new ProtoChunk(cloPos.chunkPos(), upgradeData, sections, blockTicks, liquidTicks, levelHeightAccessor, biomeRegistry, blendingData);
+            return (ProtoClo) new ProtoChunk(cloPos.chunkPos(), upgradeData, sections, blockTicks, liquidTicks, levelHeightAccessor, biomeRegistry,
+                    blendingData);
         }
     }
 
@@ -62,8 +61,7 @@ static ProtoClo create(
 
     Map<BlockPos, CompoundTag> getBlockEntityNbts();
 
-    @Nullable
-    CarvingMask getCarvingMask();
+    @Nullable CarvingMask getCarvingMask();
 
     CarvingMask getOrCreateCarvingMask();
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
index 71df6eac..9318068d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
@@ -62,15 +62,13 @@ public abstract class CubeAccess implements CloAccess {
     private volatile boolean isLightCorrect;
     protected final CubePos cubePos;
     private long inhabitedTime;
-    @Nullable
-    @Deprecated
+    @Nullable @Deprecated
     private BiomeGenerationSettings carverBiomeSettings;
     // TODO (P3) NoiseChunk might need to be different
     @Nullable protected NoiseChunk noiseChunk;
 
     protected final UpgradeData upgradeData;
-    @Nullable
-    protected BlendingData blendingData;
+    @Nullable protected BlendingData blendingData;
     protected final Map<Heightmap.Types, Heightmap> heightmaps = Maps.newEnumMap(Heightmap.Types.class);
     protected ChunkSkyLightSources skyLightSources;
     private final Map<Structure, StructureStart> structureStarts = Maps.newHashMap();
@@ -82,13 +80,8 @@ public abstract class CubeAccess implements CloAccess {
 
     // Constructor signature matches ChunkAccess for DASM redirect purposes
     public CubeAccess(
-        CubePos cubePos,
-        UpgradeData upgradeData,
-        LevelHeightAccessor levelHeightAccessor,
-        Registry<Biome> biomeRegistry,
-        long inhabitedTime,
-        @Nullable LevelChunkSection[] chunkSections,
-        @Nullable BlendingData blendingData
+            CubePos cubePos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, long inhabitedTime,
+            @Nullable LevelChunkSection[] chunkSections, @Nullable BlendingData blendingData
     ) {
         this.cubePos = cubePos;
         this.upgradeData = upgradeData;
@@ -102,7 +95,8 @@ public CubeAccess(
             if (this.sections.length == chunkSections.length) {
                 System.arraycopy(chunkSections, 0, this.sections, 0, this.sections.length);
             } else {
-                CubicChunks.LOGGER.warn("Could not set level cube sections, array length is {} instead of {}", chunkSections.length, this.sections.length);
+                CubicChunks.LOGGER.warn("Could not set level cube sections, array length is {} instead of {}", chunkSections.length,
+                        this.sections.length);
             }
         }
 
@@ -117,10 +111,7 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         }
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getListenerRegistry(I)Lnet/minecraft/world/level/gameevent/GameEventListenerRegistry;"), owner = @Ref(ChunkAccess.class))
     @Override public native GameEventListenerRegistry getListenerRegistry(int sectionY);
 
     @TransformFromMethod(owner = @Ref(ChunkAccess.class), value = @MethodSig("setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState;"))
@@ -142,22 +133,13 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         return this.getMinY();
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntitiesPos()Ljava/util/Set;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntitiesPos()Ljava/util/Set;"), owner = @Ref(ChunkAccess.class))
     @Override public native Set<BlockPos> getBlockEntitiesPos();
 
-    @TransformFromMethod(
-        value = @MethodSig("getSections()[Lnet/minecraft/world/level/chunk/LevelChunkSection;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getSections()[Lnet/minecraft/world/level/chunk/LevelChunkSection;"), owner = @Ref(ChunkAccess.class))
     @Override public native LevelChunkSection[] getSections();
 
-    @TransformFromMethod(
-        value = @MethodSig("getSection(I)Lnet/minecraft/world/level/chunk/LevelChunkSection;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getSection(I)Lnet/minecraft/world/level/chunk/LevelChunkSection;"), owner = @Ref(ChunkAccess.class))
     @Override public native LevelChunkSection getSection(int index);
 
     // TODO (P2) heightmap methods on cubes
@@ -165,8 +147,7 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
         throw new UnsupportedOperationException();
     }
 
-    @Override public void setHeightmap(Heightmap.Types type, long[] data) {
-    }
+    @Override public void setHeightmap(Heightmap.Types type, long[] data) {}
 
     @Override public Heightmap getOrCreateHeightmapUnprimed(Heightmap.Types type) {
         throw new UnsupportedOperationException();
@@ -189,52 +170,28 @@ public CubePos cc_getCubePos() {
         return CloPos.cube(cubePos);
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lnet/minecraft/world/level/levelgen/structure/StructureStart;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lnet/minecraft/world/level/levelgen/structure/StructureStart;"), owner = @Ref(ChunkAccess.class))
     @Override @Nullable public native StructureStart getStartForStructure(Structure structure);
 
-    @TransformFromMethod(
-        value = @MethodSig("setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setStartForStructure(Structure structure, StructureStart structureStart);
 
-    @TransformFromMethod(
-        value = @MethodSig("getAllStarts()Ljava/util/Map;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getAllStarts()Ljava/util/Map;"), owner = @Ref(ChunkAccess.class))
     @Override public native Map<Structure, StructureStart> getAllStarts();
 
-    @TransformFromMethod(
-        value = @MethodSig("setAllStarts(Ljava/util/Map;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setAllStarts(Ljava/util/Map;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setAllStarts(Map<Structure, StructureStart> structureStarts);
 
-    @TransformFromMethod(
-        value = @MethodSig("getReferencesForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lit/unimi/dsi/fastutil/longs/LongSet;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getReferencesForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lit/unimi/dsi/fastutil/longs/LongSet;"), owner = @Ref(ChunkAccess.class))
     @Override public native LongSet getReferencesForStructure(Structure structure);
 
-    @TransformFromMethod(
-        value = @MethodSig("addReferenceForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;J)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addReferenceForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;J)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void addReferenceForStructure(Structure structure, long reference);
 
-    @TransformFromMethod(
-        value = @MethodSig("getAllReferences()Ljava/util/Map;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getAllReferences()Ljava/util/Map;"), owner = @Ref(ChunkAccess.class))
     @Override public native Map<Structure, LongSet> getAllReferences();
 
-    @TransformFromMethod(
-        value = @MethodSig("setAllReferences(Ljava/util/Map;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setAllReferences(Ljava/util/Map;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setAllReferences(Map<Structure, LongSet> structureReferencesMap);
 
     @Override public boolean isYSpaceEmpty(int startY, int endY) {
@@ -247,22 +204,13 @@ public CubePos cc_getCubePos() {
         return false;
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("markUnsaved()V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("markUnsaved()V"), owner = @Ref(ChunkAccess.class))
     @Override public native void markUnsaved();
 
-    @TransformFromMethod(
-        value = @MethodSig("tryMarkSaved()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("tryMarkSaved()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean tryMarkSaved();
 
-    @TransformFromMethod(
-        value = @MethodSig("isUnsaved()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("isUnsaved()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean isUnsaved();
 
     @Override public abstract ChunkStatus getPersistedStatus();
@@ -274,51 +222,32 @@ public CubePos cc_getCubePos() {
 
     @Override public abstract void removeBlockEntity(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void markPosForPostprocessing(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("getPostProcessing()[Lit/unimi/dsi/fastutil/shorts/ShortList;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getPostProcessing()[Lit/unimi/dsi/fastutil/shorts/ShortList;"), owner = @Ref(ChunkAccess.class))
     @Override public native ShortList[] getPostProcessing();
 
-    @TransformFromMethod(
-        value = @MethodSig("addPackedPostProcess(Lit/unimi/dsi/fastutil/shorts/ShortList;I)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addPackedPostProcess(Lit/unimi/dsi/fastutil/shorts/ShortList;I)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void addPackedPostProcess(ShortList offsets, int index);
 
-    @TransformFromMethod(
-        value = @MethodSig("setBlockEntityNbt(Lnet/minecraft/nbt/CompoundTag;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setBlockEntityNbt(Lnet/minecraft/nbt/CompoundTag;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setBlockEntityNbt(CompoundTag tag);
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntityNbt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntityNbt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"), owner = @Ref(ChunkAccess.class))
     @Override @Nullable public native CompoundTag getBlockEntityNbt(BlockPos pos);
 
     @Override @Nullable public abstract CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
 
-    @TransformFromMethod(
-        value = @MethodSig("findBlockLightSources(Ljava/util/function/BiConsumer;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("findBlockLightSources(Ljava/util/function/BiConsumer;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void findBlockLightSources(BiConsumer<BlockPos, BlockState> output);
 
-    @TransformFromMethod(
-        value = @MethodSig("findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("findBlocks(Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void findBlocks(Predicate<BlockState> predicate, BiConsumer<BlockPos, BlockState> output);
 
-    @Override public void findBlocks(Predicate<BlockState> predicate, java.util.function.BiPredicate<BlockState, BlockPos> fineFilter, BiConsumer<BlockPos, BlockState> output) {
+    @Override public void findBlocks(
+            Predicate<BlockState> predicate, java.util.function.BiPredicate<BlockState, BlockPos> fineFilter, BiConsumer<BlockPos, BlockState> output
+    ) {
         BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
 
         for (int y = 0; y < CubicConstants.DIAMETER_IN_SECTIONS; y++) {
@@ -349,78 +278,42 @@ public CubePos cc_getCubePos() {
 
     @Override public abstract TickContainerAccess<Fluid> getFluidTicks();
 
-    @TransformFromMethod(
-        value = @MethodSig("canBeSerialized()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("canBeSerialized()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean canBeSerialized();
 
     @Override public abstract ChunkAccess.PackedTicks getTicksForSerialization(long todoNameThis);
 
-    @TransformFromMethod(
-        value = @MethodSig("getUpgradeData()Lnet/minecraft/world/level/chunk/UpgradeData;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getUpgradeData()Lnet/minecraft/world/level/chunk/UpgradeData;"), owner = @Ref(ChunkAccess.class))
     @Override public native UpgradeData getUpgradeData();
 
-    @TransformFromMethod(
-        value = @MethodSig("isOldNoiseGeneration()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("isOldNoiseGeneration()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean isOldNoiseGeneration();
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlendingData()Lnet/minecraft/world/level/levelgen/blending/BlendingData;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlendingData()Lnet/minecraft/world/level/levelgen/blending/BlendingData;"), owner = @Ref(ChunkAccess.class))
     @Override @Nullable public native BlendingData getBlendingData();
 
-    @TransformFromMethod(
-        value = @MethodSig("getInhabitedTime()J"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getInhabitedTime()J"), owner = @Ref(ChunkAccess.class))
     @Override public native long getInhabitedTime();
 
-    @TransformFromMethod(
-        value = @MethodSig("incrementInhabitedTime(J)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("incrementInhabitedTime(J)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void incrementInhabitedTime(long amount);
 
-    @TransformFromMethod(
-        value = @MethodSig("setInhabitedTime(J)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setInhabitedTime(J)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setInhabitedTime(long inhabitedTime);
 
-    @TransformFromMethod(
-        value = @MethodSig("getOrCreateOffsetList([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getOrCreateOffsetList([Lit/unimi/dsi/fastutil/shorts/ShortList;I)Lit/unimi/dsi/fastutil/shorts/ShortList;"), owner = @Ref(ChunkAccess.class))
     public static native ShortList getOrCreateOffsetList(ShortList[] packedPositions, int index);
 
-    @TransformFromMethod(
-        value = @MethodSig("isLightCorrect()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("isLightCorrect()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean isLightCorrect();
 
-    @TransformFromMethod(
-        value = @MethodSig("setLightCorrect(Z)V"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setLightCorrect(Z)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setLightCorrect(boolean lightCorrect);
 
-    @TransformFromMethod(
-        value = @MethodSig("getMinY()I"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getMinY()I"), owner = @Ref(ChunkAccess.class))
     @Override public native int getMinY();
 
-    @TransformFromMethod(
-        value = @MethodSig("getHeight()I"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getHeight()I"), owner = @Ref(ChunkAccess.class))
     @Override public native int getHeight();
 
     @Override public NoiseChunk getOrCreateNoiseChunk(Function<CloAccess, NoiseChunk> noiseChunkCreator) {
@@ -439,10 +332,7 @@ public CubePos cc_getCubePos() {
         throw new UnsupportedOperationException(); // TODO P3
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("hasAnyStructureReferences()Z"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("hasAnyStructureReferences()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean hasAnyStructureReferences();
 
     @Override @Nullable public BelowZeroRetrogen getBelowZeroRetrogen() {
@@ -453,10 +343,7 @@ public CubePos cc_getCubePos() {
         return false; // Used for below-zero retrogen; not applicable to cubes
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("getHeightAccessorForGeneration()Lnet/minecraft/world/level/LevelHeightAccessor;"),
-        owner = @Ref(ChunkAccess.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getHeightAccessorForGeneration()Lnet/minecraft/world/level/LevelHeightAccessor;"), owner = @Ref(ChunkAccess.class))
     @Override public native LevelHeightAccessor getHeightAccessorForGeneration();
 
     @Override public void initializeLightSources() {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
index 7eaebbe8..e9057077 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
@@ -64,8 +64,7 @@ public class LevelCube extends CubeAccess implements LevelClo {
     // Fields matching LevelChunk
     static final Logger LOGGER = LogUtils.getLogger();
     private static final TickingBlockEntity NULL_TICKER = new TickingBlockEntity() {
-        @Override public void tick() {
-        }
+        @Override public void tick() {}
 
         @Override public boolean isRemoved() {
             return true;
@@ -95,21 +94,14 @@ public LevelCube(Level level, CubePos pos) {
     }
 
     public LevelCube(
-        Level level,
-        CubePos pos,
-        UpgradeData data,
-        LevelChunkTicks<Block> blockTicks,
-        LevelChunkTicks<Fluid> fluidTicks,
-        long inhabitedTime,
-        @Nullable LevelChunkSection[] sections,
-        @Nullable LevelCube.PostLoadProcessor postLoad,
-        @Nullable BlendingData blendingData
+            Level level, CubePos pos, UpgradeData data, LevelChunkTicks<Block> blockTicks, LevelChunkTicks<Fluid> fluidTicks, long inhabitedTime,
+            @Nullable LevelChunkSection[] sections, @Nullable LevelCube.PostLoadProcessor postLoad, @Nullable BlendingData blendingData
     ) {
         super(pos, data, level, level.registryAccess().lookupOrThrow(Registries.BIOME), inhabitedTime, sections, blendingData);
         this.level = level;
         this.gameEventListenerRegistrySections = new Int2ObjectOpenHashMap<>();
 
-        for(Heightmap.Types heightmap$types : Heightmap.Types.values()) {
+        for (Heightmap.Types heightmap$types : Heightmap.Types.values()) {
             if (ChunkStatus.FULL.heightmapsAfter().contains(heightmap$types)) {
                 // TODO (P2) heightmaps
 //                this.heightmaps.put(heightmap$types, new Heightmap(this, heightmap$types));
@@ -122,30 +114,20 @@ public LevelCube(
     }
 
     public LevelCube(ServerLevel level, ProtoCube cube, @Nullable LevelCube.PostLoadProcessor postLoad) {
-        this(
-            level,
-            cube.cc_getCubePos(),
-            cube.getUpgradeData(),
-            cube.unpackBlockTicks(),
-            cube.unpackFluidTicks(),
-            cube.getInhabitedTime(),
-            cube.getSections(),
-            postLoad,
-            cube.getBlendingData()
-        );
+        this(level, cube.cc_getCubePos(), cube.getUpgradeData(), cube.unpackBlockTicks(), cube.unpackFluidTicks(), cube.getInhabitedTime(),
+                cube.getSections(), postLoad, cube.getBlendingData());
 
         if (!Collections.disjoint(cube.pendingBlockEntities.keySet(), cube.blockEntities.keySet())) {
             LOGGER.error("Cube at {} contains duplicated block entities", cube.cc_getCubePos());
         }
 
-
-        for(BlockEntity blockentity : cube.getBlockEntities().values()) {
+        for (BlockEntity blockentity : cube.getBlockEntities().values()) {
             this.setBlockEntity(blockentity);
         }
 
         this.pendingBlockEntities.putAll(cube.getBlockEntityNbts());
 
-        for(int i = 0; i < cube.getPostProcessing().length; ++i) {
+        for (int i = 0; i < cube.getPostProcessing().length; ++i) {
             this.postProcessing[i] = cube.getPostProcessing()[i];
         }
 
@@ -221,7 +203,8 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
                 boolean isOnlyAir = chunkSection.hasOnlyAir();
                 if (wasOnlyAir != isOnlyAir) {
                     this.level.getChunkSource().getLightEngine().updateSectionStatus(pos, isOnlyAir);
-                    this.level.getChunkSource().onSectionEmptinessChanged(SectionPos.blockToSectionCoord(pos.getX()), SectionPos.blockToSectionCoord(pos.getY()), SectionPos.blockToSectionCoord(pos.getZ()), isOnlyAir);
+                    this.level.getChunkSource().onSectionEmptinessChanged(SectionPos.blockToSectionCoord(pos.getX()),
+                            SectionPos.blockToSectionCoord(pos.getY()), SectionPos.blockToSectionCoord(pos.getZ()), isOnlyAir);
                 }
 
                 if (LightEngine.hasDifferentLightProperties(this, pos, previousState, state)) {
@@ -256,18 +239,14 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
                     if (state.hasBlockEntity()) {
                         BlockEntity blockentity1 = this.getBlockEntity(pos, LevelChunk.EntityCreationType.CHECK);
                         if (blockentity1 != null && !blockentity1.isValidBlockState(state)) {
-                            LOGGER.warn(
-                                "Found mismatched block entity @ {}: type = {}, state = {}",
-                                pos,
-                                blockentity1.getType().builtInRegistryHolder().key().location(),
-                                state
-                            );
+                            LOGGER.warn("Found mismatched block entity @ {}: type = {}, state = {}", pos,
+                                    blockentity1.getType().builtInRegistryHolder().key().location(), state);
                             this.removeBlockEntity(pos);
                             blockentity1 = null;
                         }
 
                         if (blockentity1 == null) {
-                            blockentity1 = ((EntityBlock)block).newBlockEntity(pos, state);
+                            blockentity1 = ((EntityBlock) block).newBlockEntity(pos, state);
                             if (blockentity1 != null) {
                                 this.addAndRegisterBlockEntity(blockentity1);
                             }
@@ -285,7 +264,8 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     }
 
     @TransformFromMethod(value = @MethodSig("addEntity(Lnet/minecraft/world/entity/Entity;)V"), owner = @Ref(LevelChunk.class))
-    @Deprecated @Override public native void addEntity(Entity entity);
+    @Deprecated
+    @Override public native void addEntity(Entity entity);
 
     @TransformFromMethod(value = @MethodSig("createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
     @Nullable private native BlockEntity createBlockEntity(BlockPos pos);
@@ -293,11 +273,8 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
     @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)"
-            + "Lnet/minecraft/world/level/block/entity/BlockEntity;"),
-        owner = @Ref(LevelChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)"
+            + "Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
     @Nullable public native BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
 
     @TransformFromMethod(value = @MethodSig("addAndRegisterBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), owner = @Ref(LevelChunk.class))
@@ -319,10 +296,7 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @Override public native void removeBlockEntity(BlockPos pos);
 
     // TODO maybe shouldn't be dasm
-    @TransformFromMethod(
-        value = @MethodSig("removeGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"),
-        owner = @Ref(LevelChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("removeGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"), owner = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> void removeGameEventListener(T blockEntity, ServerLevel level);
 
     @TransformFromMethod(value = @MethodSig("removeGameEventListenerRegistry(I)V"), owner = @Ref(LevelChunk.class))
@@ -338,11 +312,11 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     public native boolean isEmpty();
 
     public void replaceWithPacketData(
-        FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map, Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> outputTagConsumer
+            FriendlyByteBuf buffer, Map<Heightmap.Types, long[]> map, Consumer<ClientboundLevelChunkPacketData.BlockEntityTagOutput> outputTagConsumer
     ) {
         this.clearAllBlockEntities();
 
-        for(LevelChunkSection levelchunksection : this.sections) {
+        for (LevelChunkSection levelchunksection : this.sections) {
             levelchunksection.read(buffer);
         }
 
@@ -378,17 +352,14 @@ public void postProcessGeneration(ServerLevel serverLevel) {
             }
         }
 
-        for(BlockPos blockpos1 : ImmutableList.copyOf(this.pendingBlockEntities.keySet())) {
+        for (BlockPos blockpos1 : ImmutableList.copyOf(this.pendingBlockEntities.keySet())) {
             this.getBlockEntity(blockpos1);
         }
 
         this.pendingBlockEntities.clear();
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/block/entity/BlockEntity;"),
-        owner = @Ref(LevelChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
     @Nullable private native BlockEntity promotePendingBlockEntity(BlockPos pos, CompoundTag tag);
 
     @TransformFromMethod(value = @MethodSig("unpackTicks(J)V"), owner = @Ref(LevelChunk.class))
@@ -420,39 +391,29 @@ public void unregisterTickContainerFromLevel(ServerLevel level) {}
     public native void registerAllBlockEntitiesAfterLevelLoad();
 
     // TODO (P3): GameEvent stuff is a bit concerning
-    @TransformFromMethod(
-        value = @MethodSig("addGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"),
-        owner = @Ref(LevelChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"), owner = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> void addGameEventListener(T blockEntity, ServerLevel level);
 
     @TransformFromMethod(value = @MethodSig("updateBlockEntityTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), owner = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> void updateBlockEntityTicker(T blockEntity);
 
-    @TransformFromMethod(
-        value = @MethodSig("createTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/level/block/entity/BlockEntityTicker;)"
-            + "Lnet/minecraft/world/level/block/entity/TickingBlockEntity;"),
-        owner = @Ref(LevelChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("createTicker(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/world/level/block/entity/BlockEntityTicker;)"
+            + "Lnet/minecraft/world/level/block/entity/TickingBlockEntity;"), owner = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> TickingBlockEntity createTicker(T blockEntity, BlockEntityTicker<T> ticker);
 
     // TODO forge stuff
     // FORGE START
 //    private final net.neoforged.neoforge.attachment.AttachmentHolder.AsField attachmentHolder = new net.neoforged.neoforge.attachment.AttachmentHolder.AsField();
 //
-//    @Override
-//    public boolean hasData(net.neoforged.neoforge.attachment.AttachmentType<?> type) {
+//    @Override //    public boolean hasData(net.neoforged.neoforge.attachment.AttachmentType<?> type) {
 //        return attachmentHolder.hasData(type);
 //    }
 //
-//    @Override
-//    public <T> T getData(net.neoforged.neoforge.attachment.AttachmentType<T> type) {
+//    @Override //    public <T> T getData(net.neoforged.neoforge.attachment.AttachmentType<T> type) {
 //        return attachmentHolder.getData(type);
 //    }
 //
-//    @Override
-//    @Nullable
-//    public <T> T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
+//    @Override //    @Nullable //    public <T> T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
 //        setUnsaved(true);
 //        return attachmentHolder.setData(type, data);
 //    }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
index e60fb4ec..1da14408 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
@@ -47,23 +47,27 @@
 @Dasm(ChunkToCubeSet.class)
 public class ProtoCube extends CubeAccess implements ProtoClo {
     // Fields matching ProtoChunk
-    @Nullable
-    private volatile LevelLightEngine lightEngine;
+    @Nullable private volatile LevelLightEngine lightEngine;
     private volatile ChunkStatus status;
     private final List<CompoundTag> entities;
     @Nullable private CarvingMask carvingMask;
-    @Nullable
-    private BelowZeroRetrogen belowZeroRetrogen;
+    @Nullable private BelowZeroRetrogen belowZeroRetrogen;
     private final ProtoChunkTicks<Block> blockTicks;
     private final ProtoChunkTicks<Fluid> fluidTicks;
 
     // Constructors mirroring vanilla signatures
-    public ProtoCube(CubePos cubePos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, @Nullable BlendingData blendingData) {
+    public ProtoCube(
+            CubePos cubePos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+            @Nullable BlendingData blendingData
+    ) {
         this(cubePos, upgradeData, null, new ProtoChunkTicks(), new ProtoChunkTicks(), levelHeightAccessor, biomeRegistry, blendingData);
     }
 
-    public ProtoCube(CubePos cubePos, UpgradeData upgradeData, @Nullable LevelChunkSection[] sections, ProtoChunkTicks<Block> blockTicks, ProtoChunkTicks<Fluid> liquidTicks,
-                     LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, @Nullable BlendingData blendingData) {
+    public ProtoCube(
+            CubePos cubePos, UpgradeData upgradeData, @Nullable LevelChunkSection[] sections, ProtoChunkTicks<Block> blockTicks,
+            ProtoChunkTicks<Fluid> liquidTicks, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
+            @Nullable BlendingData blendingData
+    ) {
         super(cubePos, upgradeData, levelHeightAccessor, biomeRegistry, 0L, sections, blendingData);
         this.status = ChunkStatus.EMPTY;
         this.entities = Lists.newArrayList();
@@ -71,40 +75,24 @@ public ProtoCube(CubePos cubePos, UpgradeData upgradeData, @Nullable LevelChunkS
         this.fluidTicks = liquidTicks;
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"), owner = @Ref(ProtoChunk.class))
     @Override public native TickContainerAccess<Block> getBlockTicks();
 
-    @TransformFromMethod(
-        value = @MethodSig("getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getFluidTicks()Lnet/minecraft/world/ticks/TickContainerAccess;"), owner = @Ref(ProtoChunk.class))
     @Override public native TickContainerAccess<Fluid> getFluidTicks();
 
-    @TransformFromMethod(
-        value = @MethodSig("getTicksForSerialization(J)Lnet/minecraft/world/level/chunk/ChunkAccess$PackedTicks;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getTicksForSerialization(J)Lnet/minecraft/world/level/chunk/ChunkAccess$PackedTicks;"), owner = @Ref(ProtoChunk.class))
     @Override public native ChunkAccess.PackedTicks getTicksForSerialization(long todoNameThis);
 
     // dasm + mixin
-    @TransformFromMethod(
-        value = @MethodSig("getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"), owner = @Ref(ProtoChunk.class))
     @Override public native BlockState getBlockState(BlockPos pos);
 
     // dasm + mixin
-    @TransformFromMethod(
-        value = @MethodSig("getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"), owner = @Ref(ProtoChunk.class))
     @Override public native FluidState getFluidState(BlockPos pos);
 
-    @Nullable
-    @Override public BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
+    @Nullable @Override public BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
         int x = pos.getX();
         int y = pos.getY();
         int z = pos.getZ();
@@ -123,146 +111,80 @@ public ProtoCube(CubePos cubePos, UpgradeData upgradeData, @Nullable LevelChunkS
         }
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void setBlockEntity(BlockEntity blockEntity);
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(ProtoChunk.class))
     @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntities()Ljava/util/Map;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntities()Ljava/util/Map;"), owner = @Ref(ProtoChunk.class))
     @Override public native Map<BlockPos, BlockEntity> getBlockEntities();
 
-    @TransformFromMethod(
-        value = @MethodSig("addEntity(Lnet/minecraft/nbt/CompoundTag;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addEntity(Lnet/minecraft/nbt/CompoundTag;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void addEntity(CompoundTag tag);
 
-    @TransformFromMethod(
-        value = @MethodSig("addEntity(Lnet/minecraft/world/entity/Entity;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addEntity(Lnet/minecraft/world/entity/Entity;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void addEntity(Entity entity);
 
     // setStartForStructure: ProtoChunk logic handles below-zero retrogen then calls super, so we don't need to override
 
-    @TransformFromMethod(
-        value = @MethodSig("getEntities()Ljava/util/List;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getEntities()Ljava/util/List;"), owner = @Ref(ProtoChunk.class))
     @Override public native List<CompoundTag> getEntities();
 
-    @TransformFromMethod(
-        value = @MethodSig("getPersistedStatus()Lnet/minecraft/world/level/chunk/status/ChunkStatus;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getPersistedStatus()Lnet/minecraft/world/level/chunk/status/ChunkStatus;"), owner = @Ref(ProtoChunk.class))
     @Override public native ChunkStatus getPersistedStatus();
 
-    @TransformFromMethod(
-        value = @MethodSig("setPersistedStatus(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setPersistedStatus(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void setPersistedStatus(ChunkStatus status);
 
-    @TransformFromMethod(
-        value = @MethodSig("getNoiseBiome(III)Lnet/minecraft/core/Holder;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getNoiseBiome(III)Lnet/minecraft/core/Holder;"), owner = @Ref(ProtoChunk.class))
     @Override public native Holder<Biome> getNoiseBiome(int x, int y, int z);
 
-    @TransformFromMethod(
-        value = @MethodSig("packOffsetCoordinates(Lnet/minecraft/core/BlockPos;)S"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("packOffsetCoordinates(Lnet/minecraft/core/BlockPos;)S"), owner = @Ref(ProtoChunk.class))
     public native static short packOffsetCoordinates(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("unpackOffsetCoordinates(SILnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/core/BlockPos;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("unpackOffsetCoordinates(SILnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/core/BlockPos;"), owner = @Ref(ProtoChunk.class))
     public native static BlockPos unpackOffsetCoordinates(short packedPos, int yOffset, ChunkPos chunkPos);
 
     // dasm + mixin
-    @TransformFromMethod(
-        value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void markPosForPostprocessing(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("addPackedPostProcess(Lit/unimi/dsi/fastutil/shorts/ShortList;I)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("addPackedPostProcess(Lit/unimi/dsi/fastutil/shorts/ShortList;I)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void addPackedPostProcess(ShortList offsets, int index);
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntityNbts()Ljava/util/Map;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntityNbts()Ljava/util/Map;"), owner = @Ref(ProtoChunk.class))
     @Override public native Map<BlockPos, CompoundTag> getBlockEntityNbts();
 
-    @TransformFromMethod(
-        value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag;"), owner = @Ref(ProtoChunk.class))
     @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
 
-    @TransformFromMethod(
-        value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void removeBlockEntity(BlockPos pos);
 
-    @TransformFromMethod(
-        value = @MethodSig("getCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"),
-        owner = @Ref(ProtoChunk.class))
+    @TransformFromMethod(value = @MethodSig("getCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"), owner = @Ref(ProtoChunk.class))
     @Override @Nullable public native CarvingMask getCarvingMask();
 
-    @TransformFromMethod(
-        value = @MethodSig("getOrCreateCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"),
-        owner = @Ref(ProtoChunk.class))
+    @TransformFromMethod(value = @MethodSig("getOrCreateCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"), owner = @Ref(ProtoChunk.class))
     @Override public native CarvingMask getOrCreateCarvingMask();
 
-    @TransformFromMethod(
-        value = @MethodSig("setCarvingMask(Lnet/minecraft/world/level/chunk/CarvingMask;)V"),
-        owner = @Ref(ProtoChunk.class))
+    @TransformFromMethod(value = @MethodSig("setCarvingMask(Lnet/minecraft/world/level/chunk/CarvingMask;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void setCarvingMask(CarvingMask carvingMask);
 
-    @TransformFromMethod(
-        value = @MethodSig("setLightEngine(Lnet/minecraft/world/level/lighting/LevelLightEngine;)V"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("setLightEngine(Lnet/minecraft/world/level/lighting/LevelLightEngine;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void setLightEngine(LevelLightEngine lightEngine);
 
     @Override public void setBelowZeroRetrogen(@Nullable BelowZeroRetrogen belowZeroRetrogen) {
         // Below-zero retrogen is unused in CC, hence empty method body
     }
 
-    @TransformFromMethod(
-        value = @MethodSig("unpackTicks(Lnet/minecraft/world/ticks/ProtoChunkTicks;)Lnet/minecraft/world/ticks/LevelChunkTicks;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("unpackTicks(Lnet/minecraft/world/ticks/ProtoChunkTicks;)Lnet/minecraft/world/ticks/LevelChunkTicks;"), owner = @Ref(ProtoChunk.class))
     private static native <T> LevelChunkTicks<T> unpackTicks(ProtoChunkTicks<T> ticks);
 
-    @TransformFromMethod(
-        value = @MethodSig("unpackBlockTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("unpackBlockTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"), owner = @Ref(ProtoChunk.class))
     @Override public native LevelChunkTicks<Block> unpackBlockTicks();
 
-    @TransformFromMethod(
-        value = @MethodSig("unpackFluidTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"),
-        owner = @Ref(ProtoChunk.class)
-    )
+    @TransformFromMethod(value = @MethodSig("unpackFluidTicks()Lnet/minecraft/world/ticks/LevelChunkTicks;"), owner = @Ref(ProtoChunk.class))
     @Override public native LevelChunkTicks<Fluid> unpackFluidTicks();
 
     @Override public LevelHeightAccessor getHeightAccessorForGeneration() {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
index 458278f6..78387c05 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
@@ -22,6 +22,7 @@
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.chunk.status.ChunkStatusTasks;
 import net.minecraft.world.level.chunk.status.WorldGenContext;
+
 /**
  * Equivalent of {@link ChunkStatusTasks} for cube generation.
  * <p/>
@@ -29,48 +30,60 @@
  */
 @Dasm(ChunkToCubeSet.class)
 public class CubeStatusTasks {
-    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class) @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
     private static native boolean isLighted(CubeAccess cube);
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("passThrough(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> passThrough(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return CompletableFuture.completedFuture(cube);
     }
 
     // TODO (P3) we skip cube generation steps for now by delegating to passThrough
-    @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))// We skip chunk generation steps in cubic contexts by delegating to passThrough
+    @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;")) // We
+                                                                                                                                                                                                                                                                                                                                                                                         // skip
+                                                                                                                                                                                                                                                                                                                                                                                         // chunk
+                                                                                                                                                                                                                                                                                                                                                                                         // generation
+                                                                                                                                                                                                                                                                                                                                                                                         // steps
+                                                                                                                                                                                                                                                                                                                                                                                         // in
+                                                                                                                                                                                                                                                                                                                                                                                         // cubic
+                                                                                                                                                                                                                                                                                                                                                                                         // contexts
+                                                                                                                                                                                                                                                                                                                                                                                         // by
+                                                                                                                                                                                                                                                                                                                                                                                         // delegating
+                                                                                                                                                                                                                                                                                                                                                                                         // to
+                                                                                                                                                                                                                                                                                                                                                                                         // passThrough
     public static CompletableFuture<CubeAccess> generateStructureStarts(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("loadStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> loadStructureStarts(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateStructureReferences(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateStructureReferences(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateBiomes(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateBiomes(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateNoise(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateNoise(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         // Temporary basic sinusoidal terrain, so we can generate a simple test world
         int amplitude = 20;
@@ -83,7 +96,8 @@ public static CompletableFuture<CubeAccess> generateNoise(
         for (int y = minY; y <= maxY; y++) {
             for (int x = 0; x < CubicConstants.DIAMETER_IN_BLOCKS; x++) {
                 for (int z = 0; z < CubicConstants.DIAMETER_IN_BLOCKS; z++) {
-                    if (y + Math.round((amplitude*(Math.sin((x+cubeX)/8.0+(z+cubeZ)/21.0)+Math.cos((z+cubeZ)/13.0)))/2.0) <= CubicChunks.SUPERFLAT_HEIGHT)
+                    if (y + Math.round((amplitude * (Math.sin((x + cubeX) / 8.0 + (z + cubeZ) / 21.0) + Math.cos((z + cubeZ) / 13.0)))
+                            / 2.0) <= CubicChunks.SUPERFLAT_HEIGHT)
                         cube.setBlockState(blockPos.set(x, y, z), blockState);
                 }
             }
@@ -93,53 +107,55 @@ public static CompletableFuture<CubeAccess> generateNoise(
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateSurface(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateSurface(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateCarvers(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateCarvers(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateFeatures(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateFeatures(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("initializeLight(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> initializeLight(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("light(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> light(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateSpawn(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateSpawn(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
         return passThrough(worldGenContext, step, cache, cube);
     }
 
     // Upgrade ProtoCube to LevelCube
     // dasm + mixin
-    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class) @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("full(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("full(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static native CompletableFuture<CubeAccess> full(
-        WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
+            WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     );
 
-    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class) @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V"))
+    @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class)
+    @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("postLoadProtoChunk(Lnet/minecraft/server/level/ServerLevel;Ljava/util/List;)V"))
     private static native void postLoadProtoCube(ServerLevel level, List<CompoundTag> entityTags);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
index cde4ba1e..a7d691fc 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
@@ -26,19 +26,24 @@
 
 /**
  * {@link ChunkStep} represents a single step in either chunk loading or chunk generation.
- * This class represents a single step in cube loading or generation. It is identical to {@code ChunkStep}, but stores a {@link CubeStatusTask} instead of a {@link ChunkStatusTask}.
- * @param targetStatus The status that this step corresponds to.
- * @param directDependencies The dependencies of this individual step, by radius.
- * Always includes the parent status at radius zero (except for EMPTY, which has no parent), and may have additional dependencies.
+ * This class represents a single step in cube loading or generation. It is identical to {@code ChunkStep}, but stores a {@link CubeStatusTask}
+ * instead of a {@link ChunkStatusTask}.
+ * 
+ * @param targetStatus            The status that this step corresponds to.
+ * @param directDependencies      The dependencies of this individual step, by radius.
+ *                                Always includes the parent status at radius zero (except for EMPTY, which has no parent), and may have additional
+ *                                dependencies.
  * @param accumulatedDependencies All dependencies needed to reach this step from unloaded, by radius.
- * Effectively a combination of the directDependencies of this step and all previous steps.
- * @param blockStateWriteRadius The radius of chunks that can receive blockstate writes. 0 if only the center chunk can; -1 if there are no blockstate writes. Always -1 for chunk loading.
- * @param task The chunk loading or generation task for this step.
+ *                                Effectively a combination of the directDependencies of this step and all previous steps.
+ * @param blockStateWriteRadius   The radius of chunks that can receive blockstate writes. 0 if only the center chunk can; -1 if there are no
+ *                                blockstate writes. Always -1 for chunk loading.
+ * @param task                    The chunk loading or generation task for this step.
  */
 @Dasm(ChunkToCubeSet.class)
 @TransformFromClass(sets = ChunkToCubeSet.class, value = @Ref(ChunkStep.class))
 public record CubeStep(
-    ChunkStatus targetStatus, ChunkDependencies directDependencies, ChunkDependencies accumulatedDependencies, int blockStateWriteRadius, CubeStatusTask task
+        ChunkStatus targetStatus, ChunkDependencies directDependencies, ChunkDependencies accumulatedDependencies, int blockStateWriteRadius,
+        CubeStatusTask task
 ) {
     public int getAccumulatedRadiusOf(ChunkStatus status) {
         throw new DasmFailedToApply();
@@ -75,7 +80,7 @@ protected Builder(ChunkStatus status, CubeStep parent) {
             } else {
                 this.status = status;
                 this.parent = parent;
-                this.directDependenciesByRadius = new ChunkStatus[]{parent.targetStatus};
+                this.directDependenciesByRadius = new ChunkStatus[] { parent.targetStatus };
             }
         }
 
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
index 9bcbd470..bfdd1c31 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
@@ -56,14 +56,16 @@
 import org.mockito.Mockito;
 
 public class IntegrationTestCubicChunkMap extends BaseTest {
-    private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vanillaTest, RegistryAccess registryAccess) throws IOException, NoSuchFieldException, IllegalAccessException {
+    private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vanillaTest, RegistryAccess registryAccess)
+            throws IOException, NoSuchFieldException, IllegalAccessException {
         HolderGetter<Biome> biome = registryAccess.lookupOrThrow(Registries.BIOME);
         HolderGetter<StructureSet> structureSet = registryAccess.lookupOrThrow(Registries.STRUCTURE_SET);
         HolderGetter<PlacedFeature> placedFeature = registryAccess.lookupOrThrow(Registries.PLACED_FEATURE);
         ChunkGenerator flatLevelSource = new FlatLevelSource(FlatLevelGeneratorSettings.getDefault(biome, structureSet, placedFeature));
 
         // Distance manager is responsible for updating chunk levels; we do this manually for testing
-        var distanceManagerMockedConstruction = Mockito.mockConstruction(ChunkMap.DistanceManager.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
+        var distanceManagerMockedConstruction = Mockito.mockConstruction(ChunkMap.DistanceManager.class,
+                withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
         ServerLevel serverLevelMock;
         try (var ignored = Mockito.mockConstruction(ServerChunkCache.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS))) {
             // Server level
@@ -81,22 +83,14 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
         // We seem to need an actual directory, not a mock
         LevelStorageSource.LevelStorageAccess levelStorageAccessMock = mock(Mockito.RETURNS_DEEP_STUBS);
         when(levelStorageAccessMock.getDimensionPath(any())).thenReturn(Files.createTempDirectory("cc_test"));
-        var serverChunkCache = new ServerChunkCache(
-            serverLevelMock,
-            levelStorageAccessMock,
-            mock(Mockito.RETURNS_DEEP_STUBS),
-            mock(Mockito.RETURNS_DEEP_STUBS),
-            // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
-            // (which occurs when using RETURNS_DEEP_STUBS)
-            Runnable::run,
-            flatLevelSource,
-            10, // server view distance
-            10, // simulation distance
-            false, // sync - not relevant for tests; false should be faster
-            new DummyChunkProgressListener(),
-            (a, b) -> {},
-            mock(Mockito.RETURNS_DEEP_STUBS)
-        );
+        var serverChunkCache = new ServerChunkCache(serverLevelMock, levelStorageAccessMock, mock(Mockito.RETURNS_DEEP_STUBS),
+                mock(Mockito.RETURNS_DEEP_STUBS),
+                // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
+                // (which occurs when using RETURNS_DEEP_STUBS)
+                Runnable::run, flatLevelSource, 10, // server view distance
+                10, // simulation distance
+                false, // sync - not relevant for tests; false should be faster
+                new DummyChunkProgressListener(), (a, b) -> {}, mock(Mockito.RETURNS_DEEP_STUBS));
         var f = serverLevelMock.getClass().getSuperclass().getDeclaredField("chunkSource");
         f.setAccessible(true);
         f.set(serverLevelMock, serverChunkCache);
@@ -108,8 +102,9 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
      * Load a single chunk at full status
      */
     @ExtendWith(EphemeralTestServerProvider.class)
-    @Test public void singleFullChunkVanilla(MinecraftServer server) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
+    @Test
+    public void singleFullChunkVanilla(MinecraftServer server) throws Exception {
+        try (var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
             var serverChunkCache = serverChunkCacheRef.value();
             var chunkMap = serverChunkCache.chunkMap;
 
@@ -121,14 +116,11 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
 
             for (int x = -radius; x <= radius; x++) {
                 for (int z = -radius; z <= radius; z++) {
-                    var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(
-                        ChunkPos.asLong(x, z),
-                        centerLevel + Math.max(Math.abs(x), Math.abs(z)),
-                        null,
-                        ChunkLevel.MAX_LEVEL + 1
-                    );
+                    var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(ChunkPos.asLong(x, z),
+                            centerLevel + Math.max(Math.abs(x), Math.abs(z)), null, ChunkLevel.MAX_LEVEL + 1);
                     ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                    if (x == 0 && z == 0) centerHolder = holder;
+                    if (x == 0 && z == 0)
+                        centerHolder = holder;
                 }
             }
 
@@ -147,8 +139,9 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
      * Load a single chunk at full status
      */
     @ExtendWith(EphemeralTestServerProvider.class)
-    @Test public void singleFullChunk(MinecraftServer server) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
+    @Test
+    public void singleFullChunk(MinecraftServer server) throws Exception {
+        try (var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
             var serverChunkCache = serverChunkCacheRef.value();
             var chunkMap = serverChunkCache.chunkMap;
 
@@ -160,14 +153,11 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
 
             for (int x = -radius; x <= radius; x++) {
                 for (int z = -radius; z <= radius; z++) {
-                    var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(
-                        ChunkPos.asLong(x, z),
-                        centerLevel + Math.max(Math.abs(x), Math.abs(z)),
-                        null,
-                        ChunkLevel.MAX_LEVEL + 1
-                    );
+                    var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(ChunkPos.asLong(x, z),
+                            centerLevel + Math.max(Math.abs(x), Math.abs(z)), null, ChunkLevel.MAX_LEVEL + 1);
                     ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                    if (x == 0 && z == 0) centerHolder = holder;
+                    if (x == 0 && z == 0)
+                        centerHolder = holder;
                 }
             }
 
@@ -187,8 +177,9 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
      */
 //    @LongRunTest
     @ExtendWith(EphemeralTestServerProvider.class)
-    @Test public void singleFullCube(MinecraftServer server) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
+    @Test
+    public void singleFullCube(MinecraftServer server) throws Exception {
+        try (var serverChunkCacheRef = createServerChunkCache(false, server.registryAccess())) {
             var serverChunkCache = serverChunkCacheRef.value();
             var chunkMap = serverChunkCache.chunkMap;
 
@@ -206,23 +197,17 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
                     for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                         for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
                             var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(
-                                CloPos.chunkAsLong(Coords.cubeToSection(x, sectionX), Coords.cubeToSection(z, sectionZ)),
-                                centerLevel + chunkDistance,
-                                null,
-                                ChunkLevel.MAX_LEVEL + 1
-                            );
+                                    CloPos.chunkAsLong(Coords.cubeToSection(x, sectionX), Coords.cubeToSection(z, sectionZ)),
+                                    centerLevel + chunkDistance, null, ChunkLevel.MAX_LEVEL + 1);
                             ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
                         }
                     }
                     for (int y = -radius; y <= radius; y++) {
-                        var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(
-                            CloPos.cubeAsLong(x, y, z),
-                            centerLevel + Math.max(Math.abs(y), chunkDistance),
-                            null,
-                            ChunkLevel.MAX_LEVEL + 1
-                        );
+                        var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(CloPos.cubeAsLong(x, y, z),
+                                centerLevel + Math.max(Math.abs(y), chunkDistance), null, ChunkLevel.MAX_LEVEL + 1);
                         ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                        if (x == 0 && z == 0 && y == 0) centerHolder = holder;
+                        if (x == 0 && z == 0 && y == 0)
+                            centerHolder = holder;
                     }
                 }
             }
@@ -240,16 +225,15 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
             var result = (ChunkResult<LevelCube>) (Object) future.get();
             assertTrue(result.isSuccess(), () -> "Full chunk future ChunkResult should be successful, but was " + result.getError());
             assertTrue(result.orElse(null).getPersistedStatus().isOrAfter(ChunkStatus.FULL),
-                () -> "Cube should be at full status, but has status " + result.orElse(null).getPersistedStatus());
+                    () -> "Cube should be at full status, but has status " + result.orElse(null).getPersistedStatus());
             assertInstanceOf(LevelCube.class, result.orElse(null));
             for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                 for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
                     ChunkStatus status = chunkMap.getVisibleChunkIfPresent(ChunkPos.asLong(sectionX, sectionZ)).getPersistedStatus();
                     int finalSectionX = sectionX; // java why
                     int finalSectionZ = sectionZ;
-                    assertTrue(status.isOrAfter(ChunkStatus.FULL),
-                        () -> "Chunks intersecting the center cube should be at full status, but " + finalSectionX + ", " + finalSectionZ + " has status " + status
-                    );
+                    assertTrue(status.isOrAfter(ChunkStatus.FULL), () -> "Chunks intersecting the center cube should be at full status, but "
+                            + finalSectionX + ", " + finalSectionZ + " has status " + status);
                 }
             }
 
@@ -266,8 +250,7 @@ private static void assertChunkCubeLoadOrder(ChunkMap chunkMap, Map<CloPos, List
         visibleCloMap.forEach((cloPosLong, cloHolder) -> {
             CloPos cloPos = ((CloHolder) cloHolder).cc_getCloPos();
             if (cloPos.isChunk()) {
-                chunksByCubeColumn.computeIfAbsent(cloPos.correspondingCubeCloPos(0), p -> new ArrayList<>())
-                    .add(cloHolder);
+                chunksByCubeColumn.computeIfAbsent(cloPos.correspondingCubeCloPos(0), p -> new ArrayList<>()).add(cloHolder);
             } else {
                 cubes.add(cloHolder);
             }
@@ -288,10 +271,8 @@ public static void assertChunkHolderValidForCubeHolder(ChunkHolder chunkHolder,
 
         // if chunk status is null, cube status must also be null.
         if (chunkStatus == null) {
-            assertNull(cubeStatus,
-                () -> String.format("Chunk (%s) has status null is lower than cube (%s) at status %s",
-                    ((CloHolder) chunkHolder).cc_getCloPos(), ((CloHolder) cubeHolder).cc_getCloPos(), cubeStatus)
-            );
+            assertNull(cubeStatus, () -> String.format("Chunk (%s) has status null is lower than cube (%s) at status %s",
+                    ((CloHolder) chunkHolder).cc_getCloPos(), ((CloHolder) cubeHolder).cc_getCloPos(), cubeStatus));
             return;
         }
 
@@ -301,9 +282,7 @@ public static void assertChunkHolderValidForCubeHolder(ChunkHolder chunkHolder,
         }
 
         // Neither are null, assert that statuses are valid.
-        assertTrue(chunkStatus.isOrAfter(cubeStatus),
-            () -> String.format("Chunk (%s) at status %s is lower than cube %s at status %s",
-                ((CloHolder) chunkHolder).cc_getCloPos(), chunkStatus, ((CloHolder) cubeHolder).cc_getCloPos(), cubeStatus)
-        );
+        assertTrue(chunkStatus.isOrAfter(cubeStatus), () -> String.format("Chunk (%s) at status %s is lower than cube %s at status %s",
+                ((CloHolder) chunkHolder).cc_getCloPos(), chunkStatus, ((CloHolder) cubeHolder).cc_getCloPos(), cubeStatus));
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
index 40f44817..a38aadcb 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
@@ -50,7 +50,8 @@
 /**
  * Integration tests for getting chunks and cubes from {@link ServerChunkCache}.
  * <p>
- * This test is strongly dependent on {@link DistanceManager} and {@link ChunkMap} as well; errors here should probably be ignored unless {@link IntegrationTestCubicChunkMap} passes.
+ * This test is strongly dependent on {@link DistanceManager} and {@link ChunkMap} as well; errors here should probably be ignored unless
+ * {@link IntegrationTestCubicChunkMap} passes.
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class IntegrationTestServerCubeCache extends BaseTest {
@@ -58,15 +59,18 @@ private Stream<ChunkStatus> chunkStatuses() {
         return ChunkStatus.getStatusList().stream();
     }
 
-    private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vanillaTest) throws IOException, NoSuchFieldException, IllegalAccessException {
+    private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vanillaTest)
+            throws IOException, NoSuchFieldException, IllegalAccessException {
         // Worldgen internals
         var randomStateMockedStatic = Mockito.mockStatic(RandomState.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
         NoiseBasedChunkGenerator noiseBasedChunkGeneratorMock = mock();
         when(noiseBasedChunkGeneratorMock.generatorSettings()).thenReturn(mock());
         if (vanillaTest) {
             // These methods are currently only called when running vanilla tests
-            when(noiseBasedChunkGeneratorMock.createBiomes(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
-            when(noiseBasedChunkGeneratorMock.fillFromNoise(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
+            when(noiseBasedChunkGeneratorMock.createBiomes(any(), any(), any(), any()))
+                    .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
+            when(noiseBasedChunkGeneratorMock.fillFromNoise(any(), any(), any(), any()))
+                    .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
         }
 
         ServerLevel serverLevelMock;
@@ -85,23 +89,16 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
         // We seem to need an actual directory, not a mock
         LevelStorageSource.LevelStorageAccess levelStorageAccessMock = mock(Mockito.RETURNS_DEEP_STUBS);
         when(levelStorageAccessMock.getDimensionPath(any())).thenReturn(Files.createTempDirectory("cc_test"));
-        var serverChunkCache = new ServerChunkCache(
-            serverLevelMock,
-            levelStorageAccessMock,
-            mock(Mockito.RETURNS_DEEP_STUBS),
-            mock(Mockito.RETURNS_DEEP_STUBS),
-            // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
-            // (which occurs when using RETURNS_DEEP_STUBS)
-            Runnable::run,
-            noiseBasedChunkGeneratorMock,
-            10, // server view distance
-            10, // simulation distance
-            false, // sync - not relevant for tests; false should be faster
-            // Need to mock an implementation of the interface, so that it also implements CloProgressListener
-            Mockito.<ProcessorChunkProgressListener>mock(Mockito.RETURNS_DEEP_STUBS),
-            mock(Mockito.RETURNS_DEEP_STUBS),
-            mock(Mockito.RETURNS_DEEP_STUBS)
-        );
+        var serverChunkCache = new ServerChunkCache(serverLevelMock, levelStorageAccessMock, mock(Mockito.RETURNS_DEEP_STUBS),
+                mock(Mockito.RETURNS_DEEP_STUBS),
+                // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
+                // (which occurs when using RETURNS_DEEP_STUBS)
+                Runnable::run, noiseBasedChunkGeneratorMock, 10, // server view distance
+                10, // simulation distance
+                false, // sync - not relevant for tests; false should be faster
+                // Need to mock an implementation of the interface, so that it also implements CloProgressListener
+                Mockito.<ProcessorChunkProgressListener>mock(Mockito.RETURNS_DEEP_STUBS), mock(Mockito.RETURNS_DEEP_STUBS),
+                mock(Mockito.RETURNS_DEEP_STUBS));
         var f = serverLevelMock.getClass().getSuperclass().getDeclaredField("chunkSource");
         f.setAccessible(true);
         f.set(serverLevelMock, serverChunkCache);
@@ -113,7 +110,7 @@ private CloseableReference<ServerChunkCache> createServerChunkCache(boolean vani
      * Get a single chunk in a non-cubic ServerChunkCache
      */
     public void singleGetChunkVanilla(ChunkStatus status) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(true)) {
+        try (var serverChunkCacheRef = createServerChunkCache(true)) {
             var serverChunkCache = serverChunkCacheRef.value();
             var chunkAccess = serverChunkCache.getChunk(0, 0, status, true);
             assertNotNull(chunkAccess);
@@ -126,14 +123,15 @@ public void singleGetChunkVanilla(ChunkStatus status) throws Exception {
         }
     }
 
-    @ParameterizedTest @MethodSource("chunkStatuses")
+    @ParameterizedTest
+    @MethodSource("chunkStatuses")
     public void getChunkVanilla(ChunkStatus status) throws Exception {
         singleGetChunkVanilla(status);
     }
 
     @Test
     public void getChunkNowVanilla() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(true)) {
+        try (var serverChunkCacheRef = createServerChunkCache(true)) {
             var serverChunkCache = serverChunkCacheRef.value();
             // Present chunk
             ChunkPos pos = new ChunkPos(5, -123);
@@ -155,7 +153,7 @@ public void getChunkNowVanilla() throws Exception {
 
     @Test
     public void hasChunkVanilla() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(true)) {
+        try (var serverChunkCacheRef = createServerChunkCache(true)) {
             var serverChunkCache = serverChunkCacheRef.value();
             // Non-present chunk
             ChunkPos pos = new ChunkPos(-12, 65);
@@ -181,7 +179,7 @@ public void hasChunkVanilla() throws Exception {
      * Get a single chunk in a cubic ServerChunkCache
      */
     public void singleGetChunk(ChunkStatus status) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             var chunkAccess = serverChunkCache.getChunk(0, 0, status, true);
             assertNotNull(chunkAccess);
@@ -194,7 +192,8 @@ public void singleGetChunk(ChunkStatus status) throws Exception {
         }
     }
 
-    @ParameterizedTest @MethodSource("chunkStatuses")
+    @ParameterizedTest
+    @MethodSource("chunkStatuses")
     public void getChunk(ChunkStatus status) throws Exception {
         singleGetChunk(status);
     }
@@ -204,7 +203,7 @@ public void getChunk(ChunkStatus status) throws Exception {
      */
     @Test
     public void getChunkNow() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             // Present chunk
             serverChunkCache.getChunk(5, -123, ChunkStatus.FULL, true);
@@ -228,7 +227,7 @@ public void getChunkNow() throws Exception {
      */
     @Test
     public void hasChunk() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             ChunkPos pos = new ChunkPos(-12, 65);
             // Non-present chunk
@@ -248,7 +247,7 @@ public void hasChunk() throws Exception {
      * Get a single cube in a cubic ServerChunkCache
      */
     public void singleGetCube(ChunkStatus status) throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = ((ServerCubeCache) serverChunkCacheRef.value());
             var chunkAccess = serverChunkCache.cc_getCube(0, 0, 0, status, true);
             assertNotNull(chunkAccess);
@@ -261,7 +260,8 @@ public void singleGetCube(ChunkStatus status) throws Exception {
         }
     }
 
-    @ParameterizedTest @MethodSource("chunkStatuses")
+    @ParameterizedTest
+    @MethodSource("chunkStatuses")
     public void getCube(ChunkStatus status) throws Exception {
         singleGetCube(status);
     }
@@ -271,7 +271,7 @@ public void getCube(ChunkStatus status) throws Exception {
      */
     @Test
     public void getCubeNow() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             var cubicServerChunkCache = ((ServerCubeCache) serverChunkCache);
 
@@ -326,11 +326,11 @@ public void getCubeNow() throws Exception {
      */
     @Test
     public void hasCube() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             ServerChunkCache serverChunkCache = serverChunkCacheRef.value();
             var serverCubeCache = ((ServerCubeCache) serverChunkCache);
             // Non-present cube
-            CubePos cubePos = CubePos.of(-12,  98, 65);
+            CubePos cubePos = CubePos.of(-12, 98, 65);
             assertFalse(serverCubeCache.cc_hasCube(cubePos.getX(), cubePos.getY(), cubePos.getZ()));
             // check its chunks
             for (int localChunkX = 0; localChunkX < CubicConstants.DIAMETER_IN_SECTIONS; localChunkX++) {
@@ -357,7 +357,8 @@ public void hasCube() throws Exception {
 
             // Neighbor cube, expected to be false as hasChunk checks for FULL
             cubePos = CubePos.of(cubePos.getX() - 1, cubePos.getY(), cubePos.getZ());
-            assertFalse(serverCubeCache.cc_hasCube(cubePos.getX(), cubePos.getY(), cubePos.getZ())); // Expected false as hasCube checks for full status
+            assertFalse(serverCubeCache.cc_hasCube(cubePos.getX(), cubePos.getY(), cubePos.getZ())); // Expected false as hasCube checks for full
+                                                                                                     // status
             // check its chunks
             for (int localChunkX = 0; localChunkX < CubicConstants.DIAMETER_IN_SECTIONS; localChunkX++) {
                 for (int localChunkZ = 0; localChunkZ < CubicConstants.DIAMETER_IN_SECTIONS; localChunkZ++) {
@@ -372,8 +373,9 @@ public void hasCube() throws Exception {
     /**
      * Get a cube and nearby cubes and chunks in a cubic ServerChunkCache
      */
-    @Test public void getCubeAndNeighboringCubesAndChunks() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+    @Test
+    public void getCubeAndNeighboringCubesAndChunks() throws Exception {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             var cubicServerChunkCache = ((ServerCubeCache) serverChunkCache);
             var cubeAccess = cubicServerChunkCache.cc_getCube(0, 0, 0, ChunkStatus.FULL, true);
@@ -400,13 +402,14 @@ public void hasCube() throws Exception {
         }
     }
 
-    @Test public void testAddCubicTicketWithRadius() throws Exception {
-        try(var serverChunkCacheRef = createServerChunkCache(false)) {
+    @Test
+    public void testAddCubicTicketWithRadius() throws Exception {
+        try (var serverChunkCacheRef = createServerChunkCache(false)) {
             var serverChunkCache = serverChunkCacheRef.value();
             var cubicServerChunkCache = ((ServerCubeCache) serverChunkCache);
             int spawnRadius = Coords.sectionToCube(11);
             cubicServerChunkCache.cc_addTicketWithRadius(TicketType.START, CloPos.cube(0, 0, 0), spawnRadius);
-            serverChunkCache.tick(()->true, false);
+            serverChunkCache.tick(() -> true, false);
             var cubeAccess = cubicServerChunkCache.cc_getCube(0, 0, 0, ChunkStatus.FULL, true);
             assertNotNull(cubeAccess);
             assertTrue(cubeAccess.getPersistedStatus().isOrAfter(ChunkStatus.FULL));
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
index 23b5dbc4..1f6d7864 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
@@ -6,5 +6,6 @@
 
 @Mixin(ClientChunkCache.Storage.class)
 public interface ClientChunkCache$StorageTestAccess {
-    @Invoker("inRange") boolean invokeInRange(int x, int z);
+    @Invoker("inRange")
+    boolean invokeInRange(int x, int z);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
index 23bc98c2..e1487bc4 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
@@ -9,7 +9,14 @@
 
 @Mixin(ClientChunkCache.class)
 public interface ClientChunkCacheTestAccess {
-    @Dynamic @Accessor("cc_cubeStorage") ClientCubeCache.Storage cubeStorage();
-    @Dynamic @Accessor("cc_emptyCube") LevelCube emptyCube();
-    @Accessor("storage") ClientChunkCache.Storage chunkStorage();
+    @Dynamic
+    @Accessor("cc_cubeStorage")
+    ClientCubeCache.Storage cubeStorage();
+
+    @Dynamic
+    @Accessor("cc_emptyCube")
+    LevelCube emptyCube();
+
+    @Accessor("storage")
+    ClientChunkCache.Storage chunkStorage();
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
index 8438191b..e79fd334 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
@@ -11,7 +11,9 @@
 
 @Mixin(ChunkMap.class)
 public interface ChunkMapTestAccess {
-    @Accessor("visibleChunkMap") Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunkMap();
+    @Accessor("visibleChunkMap")
+    Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunkMap();
 
-    @Invoker @Nullable ChunkHolder invokeUpdateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
+    @Invoker
+    @Nullable ChunkHolder invokeUpdateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
index 4f011bad..06e5beff 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
@@ -10,9 +10,11 @@
 
 @Mixin(ChunkTracker.class)
 public interface ChunkTrackerTestAccess {
-    @Dynamic @Invoker(remap = false, value = "cc_onSetLevel")
+    @Dynamic
+    @Invoker(remap = false, value = "cc_onSetLevel")
     void invoke_cc_onSetLevel(long pos, int level);
 
-    @Dynamic @Accessor(remap = false, value = "cc_existingCubesForCubeColumns")
+    @Dynamic
+    @Accessor(remap = false, value = "cc_existingCubesForCubeColumns")
     Long2ObjectMap<IntSet> get_cc_existingCubesForCubeColumns();
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
index 7138cb0f..e208ba8b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
@@ -7,5 +7,6 @@
 
 @Mixin(GenerationChunkHolder.class)
 public interface GenerationChunkHolderTestAccess {
-    @Invoker void invokeUpdateHighestAllowedStatus(ChunkMap chunkMap);
+    @Invoker
+    void invokeUpdateHighestAllowedStatus(ChunkMap chunkMap);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/LongRunTest.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/LongRunTest.java
index 697c5737..8de22b2d 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/LongRunTest.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/LongRunTest.java
@@ -12,5 +12,4 @@
 @Target({ TYPE, METHOD })
 @Retention(RUNTIME)
 @Tag("longRunTest")
-public @interface LongRunTest {
-}
+public @interface LongRunTest {}
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/multiplayer/TestClientCubeCache.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/multiplayer/TestClientCubeCache.java
index 597c218a..76f08920 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/multiplayer/TestClientCubeCache.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/multiplayer/TestClientCubeCache.java
@@ -22,14 +22,14 @@
 import io.github.opencubicchunks.cubicchunks.world.level.cube.LevelCube;
 import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.nbt.CompoundTag;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class TestClientCubeCache extends BaseTest {
     @Disabled // TODO disabled until we can apply client-side mixins in tests properly
-    @Test public void basicTests() {
+    @Test
+    public void basicTests() {
         ClientLevel clientLevelMock = mock(Mockito.RETURNS_DEEP_STUBS);
         when(((CanBeCubic) clientLevelMock).cc_isCubic()).thenReturn(true);
         when(clientLevelMock.getHeight()).thenReturn(384);
@@ -108,7 +108,8 @@ public class TestClientCubeCache extends BaseTest {
 
     // TODO should this one be under integration tests instead?
     // TODO disabled until we can do tests with registries (currently errors due to registries being mocked)
-    @Disabled @Test
+    @Disabled
+    @Test
     public void receiveCubePacketTest() {
         ClientLevel clientLevelMock = mock(Mockito.RETURNS_DEEP_STUBS);
         when(((CanBeCubic) clientLevelMock).cc_isCubic()).thenReturn(true);
@@ -131,17 +132,17 @@ public void receiveCubePacketTest() {
         assertThat(clientChunkCache.cc_getLoadedCubeCount()).isEqualTo(0);
         // Load first cube
         // TODO (P2) don't pass in dummy args (tag and consumer) once heightmaps etc. are implemented
-        clientChunkCache.cc_replaceWithPacketData(pos1.getX(), pos1.getY(), pos1.getZ(), packet1.cubeData().getReadBuffer(), Map.of(), (a)->{});
+        clientChunkCache.cc_replaceWithPacketData(pos1.getX(), pos1.getY(), pos1.getZ(), packet1.cubeData().getReadBuffer(), Map.of(), (a) -> {});
         assertThat(clientChunkCache.cc_getLoadedCubeCount()).isEqualTo(1);
         assertDeepEquals(clientChunkCache.cc_getCube(pos1.getX(), pos1.getY(), pos1.getZ(), false), cube1);
         assertThat(clientChunkCache.cc_getCube(pos2.getX(), pos2.getY(), pos2.getZ(), true)).isSameAs(emptyCube);
         // Load second cube
-        clientChunkCache.cc_replaceWithPacketData(pos2.getX(), pos2.getY(), pos2.getZ(), packet2.cubeData().getReadBuffer(), Map.of(), (a)->{});
+        clientChunkCache.cc_replaceWithPacketData(pos2.getX(), pos2.getY(), pos2.getZ(), packet2.cubeData().getReadBuffer(), Map.of(), (a) -> {});
         assertThat(clientChunkCache.cc_getLoadedCubeCount()).isEqualTo(2);
         assertDeepEquals(clientChunkCache.cc_getCube(pos1.getX(), pos1.getY(), pos1.getZ(), false), cube1);
         assertDeepEquals(clientChunkCache.cc_getCube(pos2.getX(), pos2.getY(), pos2.getZ(), false), cube2);
         // Replace cube1 with cube3
-        clientChunkCache.cc_replaceWithPacketData(pos1.getX(), pos1.getY(), pos1.getZ(), packet3.cubeData().getReadBuffer(), Map.of(), (a)->{});
+        clientChunkCache.cc_replaceWithPacketData(pos1.getX(), pos1.getY(), pos1.getZ(), packet3.cubeData().getReadBuffer(), Map.of(), (a) -> {});
         assertThat(clientChunkCache.cc_getLoadedCubeCount()).isEqualTo(2);
         assertDeepEquals(clientChunkCache.cc_getCube(pos1.getX(), pos1.getY(), pos1.getZ(), false), cube3);
         assertDeepEquals(clientChunkCache.cc_getCube(pos2.getX(), pos2.getY(), pos2.getZ(), false), cube2);
@@ -169,7 +170,7 @@ public void testCubeRangeContainedWithinChunkRange() {
                     for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
                         for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                             var isInRange = ((ClientChunkCache$StorageTestAccess) (Object) chunkStorage)
-                                .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ));
+                                    .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ));
                             assertTrue(isInRange);
                         }
                     }
@@ -189,7 +190,7 @@ public void testCubeRangeContainedWithinChunkRange() {
                     for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
                         for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                             assertTrue(((ClientChunkCache$StorageTestAccess) (Object) chunkStorage)
-                                .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ)));
+                                    .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ)));
                         }
                     }
                 }
@@ -207,7 +208,7 @@ public void testCubeRangeContainedWithinChunkRange() {
                     for (int sectionX = 0; sectionX < CubicConstants.DIAMETER_IN_SECTIONS; sectionX++) {
                         for (int sectionZ = 0; sectionZ < CubicConstants.DIAMETER_IN_SECTIONS; sectionZ++) {
                             assertTrue(((ClientChunkCache$StorageTestAccess) (Object) chunkStorage)
-                                .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ)));
+                                    .invokeInRange(cubeToSection(centerX + dx, sectionX), cubeToSection(centerZ + dz, sectionZ)));
                         }
                     }
                 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/renderer/cube/TestRenderCubeRegion.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/renderer/cube/TestRenderCubeRegion.java
index 161cae8b..8a47ff1b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/renderer/cube/TestRenderCubeRegion.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/client/renderer/cube/TestRenderCubeRegion.java
@@ -30,20 +30,20 @@
 public class TestRenderCubeRegion extends BaseTest {
     // These two tests are mostly just a copy of the tests in TestLevelCube
     private void singleCubeGetBlockState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         Level levelMock = mock(Answers.RETURNS_DEEP_STUBS);
         var cube = new LevelCube(levelMock, cubePos);
         Map<BlockPos, BlockState> states = new HashMap<>();
         for (int i = 0; i < 1000; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             var state = random.nextBoolean() ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState();
             states.put(pos, state);
             cube.setBlockState(pos, state);
         }
         var arr = new RenderCube[27];
         arr[RenderCubeRegion.index(-1, -1, -1, 0, 0, 0)] = new RenderCube(cube);
-        var renderCubeRegion = new RenderCubeRegion(levelMock, cubePos.getX()-1, cubePos.getY()-1, cubePos.getZ()-1, arr, null);
+        var renderCubeRegion = new RenderCubeRegion(levelMock, cubePos.getX() - 1, cubePos.getY() - 1, cubePos.getZ() - 1, arr, null);
 
         for (var pos : states.keySet()) {
             assertEquals(states.get(pos), renderCubeRegion.getBlockState(pos));
@@ -51,21 +51,21 @@ private void singleCubeGetBlockState(Random random) {
     }
 
     private void singleCubeGetFluidState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         Level levelMock = mock(Answers.RETURNS_DEEP_STUBS);
         var cube = new LevelCube(levelMock, cubePos);
         Set<BlockPos> positions = new HashSet<>();
         var state = Blocks.ANDESITE_SLAB.defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, true);
         for (int i = 0; i < 100; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             positions.add(pos);
             cube.setBlockState(pos, state);
         }
 
         var arr = new RenderCube[27];
         arr[RenderCubeRegion.index(-1, -1, -1, 0, 0, 0)] = new RenderCube(cube);
-        var renderCubeRegion = new RenderCubeRegion(levelMock, cubePos.getX()-1, cubePos.getY()-1, cubePos.getZ()-1, arr, null);
+        var renderCubeRegion = new RenderCubeRegion(levelMock, cubePos.getX() - 1, cubePos.getY() - 1, cubePos.getZ() - 1, arr, null);
 
         for (var pos : positions) {
             assertEquals(state, renderCubeRegion.getBlockState(pos));
@@ -74,7 +74,8 @@ private void singleCubeGetFluidState(Random random) {
     }
 
     @Disabled // TODO disabled until we can apply client-side mixins in tests properly
-    @Test public void testSingleCubeGetBlockAndFluidState() {
+    @Test
+    public void testSingleCubeGetBlockAndFluidState() {
         var random = new Random(-511);
         for (int i = 0; i < 100; i++) {
             singleCubeGetBlockState(random);
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/misc/TestVanillaCubicParity.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/misc/TestVanillaCubicParity.java
index 5db3981a..3c1fbb3c 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/misc/TestVanillaCubicParity.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/misc/TestVanillaCubicParity.java
@@ -31,7 +31,8 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestVanillaCubicParity extends BaseTest {
     private static String stringifyMethod(Method method) {
-        return method.getName() + "(" + Arrays.stream(method.getParameterTypes()).map(Class::getName).collect(Collectors.joining(", ")) + ") -> " + method.getReturnType().getName();
+        return method.getName() + "(" + Arrays.stream(method.getParameterTypes()).map(Class::getName).collect(Collectors.joining(", ")) + ") -> "
+                + method.getReturnType().getName();
     }
 
     private static boolean isStatic(Method method) {
@@ -44,30 +45,18 @@ private void testStaticParity(Class<?> vanillaClass, Class<?> cubicClass) {
 
     private void testStaticParity(Class<?> vanillaClass, Class<?> cubicClass, Stream<Method> excludes) {
         // TODO we currently only compare method names; need to be able to apply DASM translation since static methods may have differing signatures
-        var excludesSet = excludes
-            .map(Method::getName)
-            .collect(Collectors.toSet());
-        var vanillaMethods = Arrays.stream(vanillaClass.getMethods())
-            .filter(method -> method.getDeclaringClass() == vanillaClass && isStatic(method))
-            .map(Method::getName)
-            .filter(s -> !excludesSet.contains(s))
-            .collect(Collectors.toSet());
-        Arrays.stream(cubicClass.getMethods())
-            .filter(method -> method.getDeclaringClass() == cubicClass && isStatic(method))
-            .map(Method::getName)
-            .forEach(vanillaMethods::remove); // We don't care about static methods that exist on the CC class but not the vanilla class.
+        var excludesSet = excludes.map(Method::getName).collect(Collectors.toSet());
+        var vanillaMethods = Arrays.stream(vanillaClass.getMethods()).filter(method -> method.getDeclaringClass() == vanillaClass && isStatic(method))
+                .map(Method::getName).filter(s -> !excludesSet.contains(s)).collect(Collectors.toSet());
+        Arrays.stream(cubicClass.getMethods()).filter(method -> method.getDeclaringClass() == cubicClass && isStatic(method)).map(Method::getName)
+                .forEach(vanillaMethods::remove); // We don't care about static methods that exist on the CC class but not the vanilla class.
         assertTrue(vanillaMethods.isEmpty(), () -> String.format("""
-            Expected parity in static methods between %s %s and %s %s.
-            Extra methods in %s:
-                %s
-            
-            """,
-            vanillaClass.isInterface() ? "interface" : "class",
-            vanillaClass.getName(),
-            cubicClass.isInterface() ? "interface" : "class",
-            cubicClass.getName(),
-            vanillaClass.getSimpleName(),
-            vanillaMethods.isEmpty() ? "[none]" : String.join("\n    ", vanillaMethods)));
+                Expected parity in static methods between %s %s and %s %s.
+                Extra methods in %s:
+                    %s
+
+                """, vanillaClass.isInterface() ? "interface" : "class", vanillaClass.getName(), cubicClass.isInterface() ? "interface" : "class",
+                cubicClass.getName(), vanillaClass.getSimpleName(), vanillaMethods.isEmpty() ? "[none]" : String.join("\n    ", vanillaMethods)));
     }
 
     private void testParityIncludingAncestors(Class<?> vanillaClass, Class<?> cubicClass) {
@@ -75,113 +64,72 @@ private void testParityIncludingAncestors(Class<?> vanillaClass, Class<?> cubicC
     }
 
     private void testParityIncludingAncestors(Class<?> vanillaClass, Class<?> cubicClass, Stream<Method> excludes) {
-        var excludesSet = excludes
-            .map(TestVanillaCubicParity::stringifyMethod)
-            .collect(Collectors.toSet());
+        var excludesSet = excludes.map(TestVanillaCubicParity::stringifyMethod).collect(Collectors.toSet());
         var vanillaMethods = Arrays.stream(vanillaClass.getMethods())
-            .filter(method -> method.getDeclaringClass() != Object.class && !isStatic(method))
-            .map(TestVanillaCubicParity::stringifyMethod)
-            .filter(s -> !excludesSet.contains(s))
-            .collect(Collectors.toSet());
-        var cubicMethods = Arrays.stream(cubicClass.getMethods())
-            .filter(method -> method.getDeclaringClass() != Object.class && !isStatic(method))
-            .map(TestVanillaCubicParity::stringifyMethod)
-            .filter(methodString -> !vanillaMethods.remove(methodString)) // Filter methodStrings that are NOT in vanillaMethods
-            .toList();
+                .filter(method -> method.getDeclaringClass() != Object.class && !isStatic(method)).map(TestVanillaCubicParity::stringifyMethod)
+                .filter(s -> !excludesSet.contains(s)).collect(Collectors.toSet());
+        var cubicMethods = Arrays.stream(cubicClass.getMethods()).filter(method -> method.getDeclaringClass() != Object.class && !isStatic(method))
+                .map(TestVanillaCubicParity::stringifyMethod).filter(methodString -> !vanillaMethods.remove(methodString)) // Filter methodStrings
+                                                                                                                           // that are NOT in
+                                                                                                                           // vanillaMethods
+                .toList();
         assertTrue(vanillaMethods.isEmpty() && cubicMethods.isEmpty(), () -> String.format("""
-            Expected parity in non-static methods between %s %s and %s %s.
-            Extra methods in %s:
-                %s
-            Extra methods in %s:
-                %s
-            
-            """,
-            vanillaClass.isInterface() ? "interface" : "class",
-            vanillaClass.getName(),
-            cubicClass.isInterface() ? "interface" : "class",
-            cubicClass.getName(),
-            vanillaClass.getSimpleName(),
-            vanillaMethods.isEmpty() ? "[none]" : String.join("\n    ", vanillaMethods),
-            cubicClass.getSimpleName(),
-            cubicMethods.isEmpty() ? "[none]" : String.join("\n    ", cubicMethods)));
+                Expected parity in non-static methods between %s %s and %s %s.
+                Extra methods in %s:
+                    %s
+                Extra methods in %s:
+                    %s
+
+                """, vanillaClass.isInterface() ? "interface" : "class", vanillaClass.getName(), cubicClass.isInterface() ? "interface" : "class",
+                cubicClass.getName(), vanillaClass.getSimpleName(), vanillaMethods.isEmpty() ? "[none]" : String.join("\n    ", vanillaMethods),
+                cubicClass.getSimpleName(), cubicMethods.isEmpty() ? "[none]" : String.join("\n    ", cubicMethods)));
     }
 
-    @Test public void testChunkAccessParity() throws NoSuchMethodException {
-        testParityIncludingAncestors(
-            ChunkAccess.class,
-            CloAccess.class,
-            Stream.concat(Stream.of(
-                    ChunkAccess.class.getMethod("getPos"),
-                    // TODO need to check existence; these would fail on Fabric
-                    ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
-                    ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
-                    ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"),
-                    ChunkAccess.class.getDeclaredMethod("getLevel")
-            ), Arrays.stream(IAttachmentHolder.class.getMethods()))
-        );
-        testStaticParity(
-            ChunkAccess.class,
-            CubeAccess.class
-        );
+    @Test
+    public void testChunkAccessParity() throws NoSuchMethodException {
+        testParityIncludingAncestors(ChunkAccess.class, CloAccess.class, Stream.concat(Stream.of(ChunkAccess.class.getMethod("getPos"),
+                // TODO need to check existence; these would fail on Fabric
+                ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
+                ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
+                ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"), ChunkAccess.class.getDeclaredMethod("getLevel")),
+                Arrays.stream(IAttachmentHolder.class.getMethods())));
+        testStaticParity(ChunkAccess.class, CubeAccess.class);
     }
 
-    @Test public void testLevelChunkParity() throws NoSuchMethodException {
-        testParityIncludingAncestors(
-            LevelChunk.class,
-            LevelClo.class,
-            Stream.concat(Stream.of(
-                    ChunkAccess.class.getMethod("getPos"),
-                    // TODO need to check existence; these would fail on Fabric
-                    ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
-                    ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
-                    ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"),
-                    LevelChunk.class.getMethod("getAuxLightManager", ChunkPos.class),
-                    LevelChunk.class.getMethod("setUnsavedListener", LevelChunk.UnsavedListener.class)
-            ), Arrays.stream(IAttachmentHolder.class.getMethods()))
-        );
-        testStaticParity(
-            LevelChunk.class,
-            LevelCube.class
-        );
+    @Test
+    public void testLevelChunkParity() throws NoSuchMethodException {
+        testParityIncludingAncestors(LevelChunk.class, LevelClo.class, Stream.concat(Stream.of(ChunkAccess.class.getMethod("getPos"),
+                // TODO need to check existence; these would fail on Fabric
+                ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
+                ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
+                ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"), LevelChunk.class.getMethod("getAuxLightManager", ChunkPos.class),
+                LevelChunk.class.getMethod("setUnsavedListener", LevelChunk.UnsavedListener.class)),
+                Arrays.stream(IAttachmentHolder.class.getMethods())));
+        testStaticParity(LevelChunk.class, LevelCube.class);
     }
 
-    @Test public void testProtoChunkParity() throws NoSuchMethodException {
-        testParityIncludingAncestors(
-            ProtoChunk.class,
-            ProtoClo.class,
-            Stream.concat(Stream.of(
-                    ChunkAccess.class.getMethod("getPos"),
-                    // TODO need to check existence; these would fail on Fabric
-                    ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
-                    ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
-                    ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"),
-                    ChunkAccess.class.getDeclaredMethod("getLevel")
-            ), Arrays.stream(IAttachmentHolder.class.getMethods()))
+    @Test
+    public void testProtoChunkParity() throws NoSuchMethodException {
+        testParityIncludingAncestors(ProtoChunk.class, ProtoClo.class, Stream.concat(Stream.of(ChunkAccess.class.getMethod("getPos"),
+                // TODO need to check existence; these would fail on Fabric
+                ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
+                ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
+                ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"), ChunkAccess.class.getDeclaredMethod("getLevel")),
+                Arrays.stream(IAttachmentHolder.class.getMethods()))
 //                IAttachmentHolder.class.getMethods()
         );
-        testStaticParity(
-            ProtoChunk.class,
-            ProtoCube.class
-        );
+        testStaticParity(ProtoChunk.class, ProtoCube.class);
     }
 
-    @Test public void testImposterProtoChunkParity() throws NoSuchMethodException {
-        testParityIncludingAncestors(
-            ImposterProtoChunk.class,
-            ImposterProtoClo.class,
-            Stream.concat(Stream.of(
-                    ChunkAccess.class.getMethod("getPos"),
-                    ImposterProtoChunk.class.getMethod("getWrapped"),
-                    // TODO need to check existence; these would fail on Fabric
-                    ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
-                    ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
-                    ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"),
-                    ChunkAccess.class.getDeclaredMethod("getLevel")
-            ), Arrays.stream(IAttachmentHolder.class.getMethods()))
-        );
-        testStaticParity(
-            ImposterProtoChunk.class,
-            ImposterProtoCube.class
-        );
+    @Test
+    public void testImposterProtoChunkParity() throws NoSuchMethodException {
+        testParityIncludingAncestors(ImposterProtoChunk.class, ImposterProtoClo.class,
+                Stream.concat(Stream.of(ChunkAccess.class.getMethod("getPos"), ImposterProtoChunk.class.getMethod("getWrapped"),
+                        // TODO need to check existence; these would fail on Fabric
+                        ChunkAccess.class.getDeclaredMethod("writeAttachmentsToNBT", HolderLookup.Provider.class),
+                        ChunkAccess.class.getDeclaredMethod("readAttachmentsFromNBT", HolderLookup.Provider.class, CompoundTag.class),
+                        ChunkAccess.class.getDeclaredMethod("getAttachmentHolder"), ChunkAccess.class.getDeclaredMethod("getLevel")),
+                        Arrays.stream(IAttachmentHolder.class.getMethods())));
+        testStaticParity(ImposterProtoChunk.class, ImposterProtoCube.class);
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/network/TestCCClientboundLevelCubeWithLightPacket.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/network/TestCCClientboundLevelCubeWithLightPacket.java
index 58327dc4..dc25a16f 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/network/TestCCClientboundLevelCubeWithLightPacket.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/network/TestCCClientboundLevelCubeWithLightPacket.java
@@ -52,7 +52,6 @@ public void serdeTest() {
         assertDeepEquals(CCClientboundLevelCubeWithLightPacket.STREAM_CODEC.decode(buf2), packet2);
     }
 
-
     @Disabled // TODO disabled until we can apply client-side mixins in tests properly
     @Test
     public void handlerTest() {
@@ -75,6 +74,7 @@ public void handlerTest() {
 
         handler.handle(packet, payloadContextMock);
 
-        ((ClientCubeCache) verify(clientChunkCacheMock, times(1))).cc_replaceWithPacketData(eq(pos.getX()), eq(pos.getY()), eq(pos.getZ()), any(), any(), any());
+        ((ClientCubeCache) verify(clientChunkCacheMock, times(1))).cc_replaceWithPacketData(eq(pos.getX()), eq(pos.getY()), eq(pos.getZ()), any(),
+                any(), any());
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/TestMinecraftServer.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/TestMinecraftServer.java
index eae67144..6fe1dc7f 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/TestMinecraftServer.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/TestMinecraftServer.java
@@ -23,33 +23,37 @@
 import org.mockito.MockedConstruction;
 import org.mockito.Mockito;
 
-
 // TODO :: These tests don't work, because mocking the minecraft server is extremely hard. If anyone can figure it out, please re-enable these tests.
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestMinecraftServer extends BaseTest {
     private CloseableReference<IntegratedServer> setupServer() {
         WorldStem worldStemMock = mock(WorldStem.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
         when(worldStemMock.registries().compositeAccess().lookupOrThrow(Registries.LEVEL_STEM).containsKey(LevelStem.OVERWORLD)).thenReturn(true);
-        MockedConstruction<ServerFunctionManager> serverFunctionManagerMockedConstruction = Mockito.mockConstruction(ServerFunctionManager.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
-        return new CloseableReference<>(
-           new IntegratedServer(mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), worldStemMock, mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS)),
-            serverFunctionManagerMockedConstruction
-        );
+        MockedConstruction<ServerFunctionManager> serverFunctionManagerMockedConstruction = Mockito.mockConstruction(ServerFunctionManager.class,
+                withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
+        return new CloseableReference<>(new IntegratedServer(mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS),
+                mock(RETURNS_DEEP_STUBS), worldStemMock, mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS)),
+                serverFunctionManagerMockedConstruction);
     }
 
-    @Test @Disabled public void testSetInitialSpawnVanilla() throws Exception {
+    @Test
+    @Disabled
+    public void testSetInitialSpawnVanilla() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
-            ((MarkableAsCubic)serverLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) serverLevelReference.value()).cc_setCubic();
             try (CloseableReference<IntegratedServer> server = setupServer()) {
-                ((MinecraftServerTestAccess)server.value()).invoke_setInitialSpawn(serverLevelReference.value(), mock(RETURNS_DEEP_STUBS), false, false);
+                ((MinecraftServerTestAccess) server.value()).invoke_setInitialSpawn(serverLevelReference.value(), mock(RETURNS_DEEP_STUBS), false,
+                        false);
             }
         }
     }
 
-    @Test @Disabled void testPrepareLevelsVanilla() throws Exception {
+    @Test
+    @Disabled
+    void testPrepareLevelsVanilla() throws Exception {
         try (CloseableReference<IntegratedServer> server = setupServer()) {
-            ((MarkableAsCubic)server.value().overworld()).cc_setCubic();
-            ((MinecraftServerTestAccess)server.value()).invoke_prepareLevels(mock(RETURNS_DEEP_STUBS));
+            ((MarkableAsCubic) server.value().overworld()).cc_setCubic();
+            ((MinecraftServerTestAccess) server.value()).invoke_prepareLevels(mock(RETURNS_DEEP_STUBS));
         }
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloGenerationTask.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloGenerationTask.java
index 19fb9740..a2a36e3c 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloGenerationTask.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloGenerationTask.java
@@ -7,9 +7,9 @@
 import net.minecraft.server.level.ServerChunkCache;
 
 /**
- * We do not unit test {@link ChunkGenerationTask} as it is very tightly coupled with {@link ChunkHolder}, {@link ChunkMap} and {@link ServerChunkCache}.
+ * We do not unit test {@link ChunkGenerationTask} as it is very tightly coupled with {@link ChunkHolder}, {@link ChunkMap} and
+ * {@link ServerChunkCache}.
  *
  * @see IntegrationTestCubicChunkMap integration tests
  */
-public class TestCloGenerationTask {
-}
+public class TestCloGenerationTask {}
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloHolder.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloHolder.java
index bd8731dc..3e45eca6 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloHolder.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloHolder.java
@@ -8,7 +8,8 @@
 import net.minecraft.server.level.ServerChunkCache;
 
 /**
- * We do not unit test {@link GenerationChunkHolder} or {@link ChunkHolder} as it is very tightly coupled with {@link ChunkGenerationTask}, {@link ChunkMap} and {@link ServerChunkCache}.
+ * We do not unit test {@link GenerationChunkHolder} or {@link ChunkHolder} as it is very tightly coupled with {@link ChunkGenerationTask},
+ * {@link ChunkMap} and {@link ServerChunkCache}.
  *
  * @see IntegrationTestCubicChunkMap integration tests
  */
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloTrackingView.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloTrackingView.java
index 09dc2b5a..eab46fbb 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloTrackingView.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCloTrackingView.java
@@ -16,7 +16,8 @@
 
 public class TestCloTrackingView extends BaseTest {
     // TODO might be possible to test this class more thoroughly, but this should be sufficient for now - non-trivial methods have full coverage
-    @Test public void basicTests() {
+    @Test
+    public void basicTests() {
         var originPos = CloPos.cube(0, 0, 0);
         var originChunk = CloPos.chunk(0, 0);
         var origin = CloTrackingView.cc_of(originPos, 1);
@@ -90,12 +91,14 @@ private void checkDifference(CloTrackingView before, CloTrackingView after, Set<
         assertThat(eAdded).allMatch(added::contains);
     }
 
-    @Test public void testDifferenceRandomized() {
+    @Test
+    public void testDifferenceRandomized() {
         var random = new Random(120829);
 
         for (int i = 0; i < 100; i++) {
-            var pos1 = CloPos.cube(random.nextInt(10000)-5000, random.nextInt(10000)-5000, random.nextInt(10000)-5000);
-            var pos2 = CloPos.cube(pos1.getX() + random.nextInt(20)-10, pos1.getY() + random.nextInt(20)-10, pos1.getZ() + random.nextInt(20)-10);
+            var pos1 = CloPos.cube(random.nextInt(10000) - 5000, random.nextInt(10000) - 5000, random.nextInt(10000) - 5000);
+            var pos2 = CloPos.cube(pos1.getX() + random.nextInt(20) - 10, pos1.getY() + random.nextInt(20) - 10,
+                    pos1.getZ() + random.nextInt(20) - 10);
             int r1 = random.nextInt(0, 10);
             int r2 = random.nextInt(0, 10);
             var track1 = CloTrackingView.cc_of(pos1, r1);
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkMap.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkMap.java
index e1ea7595..a01c7070 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkMap.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkMap.java
@@ -7,7 +7,8 @@
 import net.minecraft.server.level.ServerChunkCache;
 
 /**
- * We do not unit test {@link ChunkMap} as it is very tightly coupled with {@link ChunkGenerationTask}, {@link ChunkHolder} and {@link ServerChunkCache}.
+ * We do not unit test {@link ChunkMap} as it is very tightly coupled with {@link ChunkGenerationTask}, {@link ChunkHolder} and
+ * {@link ServerChunkCache}.
  *
  * @see IntegrationTestCubicChunkMap integration tests
  */
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
index efab277a..bddc6586 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
@@ -7,9 +7,9 @@
 import java.util.List;
 import java.util.Random;
 
-import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cc_core.api.CubePos;
 import io.github.opencubicchunks.cc_core.api.CubicConstants;
+import io.github.opencubicchunks.cc_core.world.level.CloPos;
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
 import io.github.opencubicchunks.cubicchunks.mixin.test.common.server.level.ChunkTrackerTestAccess;
 import io.github.opencubicchunks.cubicchunks.testutils.BaseTest;
@@ -32,8 +32,8 @@ static class TestCubicTracker extends ChunkTracker {
 
         protected TestCubicTracker(int levelCount, int expectedUpdatesByLevel, int expectedPropagationLevels) {
             super(levelCount, expectedUpdatesByLevel, expectedPropagationLevels);
-            this.maxLevel = levelCount-1;
-            this.chunks.defaultReturnValue((byte) (levelCount-1));
+            this.maxLevel = levelCount - 1;
+            this.chunks.defaultReturnValue((byte) (levelCount - 1));
         }
 
         @Override protected int getLevelFromSource(long pos) {
@@ -46,8 +46,10 @@ protected TestCubicTracker(int levelCount, int expectedUpdatesByLevel, int expec
 
         @Override protected void setLevel(long pos, int level) {
             ((ChunkTrackerTestAccess) this).invoke_cc_onSetLevel(pos, level);
-            if (level >= maxLevel) chunks.remove(pos);
-            else chunks.put(pos, (byte) level);
+            if (level >= maxLevel)
+                chunks.remove(pos);
+            else
+                chunks.put(pos, (byte) level);
         }
 
         public void runAllUpdates() {
@@ -61,14 +63,14 @@ public void addSource(long pos, int level) {
 
         public void removeSource(long pos) {
             this.sources.remove(pos);
-            this.update(pos, maxLevel+1, false);
+            this.update(pos, maxLevel + 1, false);
         }
     }
 
     private void addAndTestCubeSources(List<CloPos> srcPosClo, TestCubicTracker tracker, Random rand, int numSourcesAdded) {
         if (numSourcesAdded == 0) {
             for (int i = 0; i < numSourcesAdded; i++) {
-                srcPosClo.add(CloPos.cube(rand.nextInt(0, 20)-10, rand.nextInt(0, 20)-10, rand.nextInt(0, 20)-10));
+                srcPosClo.add(CloPos.cube(rand.nextInt(0, 20) - 10, rand.nextInt(0, 20) - 10, rand.nextInt(0, 20) - 10));
                 tracker.addSource(srcPosClo.get(srcPosClo.size() - 1).asLong(), 0);
             }
             tracker.runAllUpdates();
@@ -88,7 +90,7 @@ private void removeAndTestCubeSources(List<CloPos> srcPosClo, TestCubicTracker t
                 }
             }
             for (int i = 0; i < srcPosCloToRemove.size(); i++) {
-                srcPosClo.remove((int)srcPosCloToRemove.get(i));
+                srcPosClo.remove((int) srcPosCloToRemove.get(i));
             }
             tracker.runAllUpdates();
         }
@@ -99,14 +101,14 @@ private void removeAndTestCubeSources(List<CloPos> srcPosClo, TestCubicTracker t
 
     private void testSourceCubePropagation(List<CloPos> srcPosClo, TestCubicTracker tracker, Random rand) {
         for (int i = 0; i < 100; i++) {
-            var testPos = CubePos.of(rand.nextInt(0, 20)-10, rand.nextInt(0, 20)-10, rand.nextInt(0, 20)-10);
+            var testPos = CubePos.of(rand.nextInt(0, 20) - 10, rand.nextInt(0, 20) - 10, rand.nextInt(0, 20) - 10);
             // Minimum distance from all sources should be the level
             var dist = Integer.MAX_VALUE;
             for (int j = 0; j < srcPosClo.size(); j++) {
                 dist = Math.min(dist, Misc.chebyshevDistance(srcPosClo.get(j).cubePos(), testPos));
             }
             assertEquals(Math.min(7, dist), tracker.getLevel(CloPos.cube(testPos).asLong()),
-                String.format("Level at cube %d %d %d", testPos.getX(), testPos.getY(), testPos.getZ()));
+                    String.format("Level at cube %d %d %d", testPos.getX(), testPos.getY(), testPos.getZ()));
         }
     }
 
@@ -117,13 +119,15 @@ private void testSourceColumnPropagation(List<CloPos> srcPosClo, TestCubicTracke
         }
         for (int i = 0; i < 100; i++) {
             var testPos = CloPos.cube(rand.nextInt(0, 20) - 10, 0, rand.nextInt(0, 20) - 10);
-            var testCol = testPos.correspondingChunkCloPos(rand.nextInt(0, CubicConstants.DIAMETER_IN_SECTIONS), rand.nextInt(0, CubicConstants.DIAMETER_IN_SECTIONS));
+            var testCol = testPos.correspondingChunkCloPos(rand.nextInt(0, CubicConstants.DIAMETER_IN_SECTIONS),
+                    rand.nextInt(0, CubicConstants.DIAMETER_IN_SECTIONS));
             // Minimum distance from all sources should be the level
             var dist = Integer.MAX_VALUE;
             for (int j = 0; j < srcPosClo.size(); j++) {
                 dist = Math.min(dist, Misc.chebyshevDistance(srcPosY0[j], testPos.cubePos()));
             }
-            assertEquals(Math.min(7, dist), tracker.getLevel(testCol.asLong()), String.format("Level at chunk %d %d.", testCol.getX(), testCol.getZ()));
+            assertEquals(Math.min(7, dist), tracker.getLevel(testCol.asLong()),
+                    String.format("Level at chunk %d %d.", testCol.getX(), testCol.getZ()));
         }
     }
 
@@ -151,9 +155,9 @@ public void testCubeSources(int initialSourceCount, int numPhases, int seed, flo
         var srcPosClo = new ArrayList<CloPos>();
         addAndTestCubeSources(srcPosClo, tracker, rand, initialSourceCount);
 
-        for(int i = 0; i < numPhases; i++) {
+        for (int i = 0; i < numPhases; i++) {
             testIntersectionAndPropagation(srcPosClo, tracker, rand);
-            if(numPhases % 2 == 0) {
+            if (numPhases % 2 == 0) {
                 removeAndTestCubeSources(srcPosClo, tracker, rand, chanceToRemovePerPhase);
             } else {
                 addAndTestCubeSources(srcPosClo, tracker, rand, numSourcesToAddPerPhase);
@@ -168,55 +172,63 @@ public void testCubeSources(int initialSourceCount, int numPhases, int seed, flo
         assertThat(tracker.chunks).withFailMessage("Tracker should be empty after removing all sources.").isEmpty();
     }
 
-    @Test public void testSingleCubeSource() {
+    @Test
+    public void testSingleCubeSource() {
         testCubeSources(1, 1, 333, 0, 0);
     }
 
-    @Test public void testMultipleCubeSources() {
+    @Test
+    public void testMultipleCubeSources() {
         testCubeSources(10, 4, 666, 0.5f, 5);
     }
 
     /**
      * This scenario tests an implementation detail, but it is important
-     * that {@link io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level.MixinChunkTracker#cc_existingCubesForCubeColumns} is updated correctly
+     * that {@link io.github.opencubicchunks.cubicchunks.mixin.core.common.server.level.MixinChunkTracker#cc_existingCubesForCubeColumns} is updated
+     * correctly
      * to prevent memory leaks.
-     * <br><br>
+     * <br>
+     * <br>
      * May have to be updated if the implementation of MixinChunkTracker changes.
      */
-    @Test public void testExistingCubesForCubeColumns() {
+    @Test
+    public void testExistingCubesForCubeColumns() {
         var tracker = new TestCubicTracker(8, 16, 256);
         ((MarkableAsCubic) tracker).cc_setCubic();
         var existingCubesForCubeColumns = ((ChunkTrackerTestAccess) tracker).get_cc_existingCubesForCubeColumns();
         var srcPos = CloPos.cube(1, 0, 0);
         tracker.addSource(srcPos.asLong(), 0);
         tracker.runAllUpdates();
-        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13*13);
+        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13 * 13);
         var srcPos2 = CloPos.cube(1, 1, 0);
         tracker.addSource(srcPos2.asLong(), 0);
         tracker.runAllUpdates();
-        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13*13);
+        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13 * 13);
         var srcPos3 = CloPos.cube(1, 1, 0);
         var srcPos4 = CloPos.cube(2, 1, 0);
         tracker.addSource(srcPos3.asLong(), 0);
         tracker.addSource(srcPos4.asLong(), 0);
         tracker.runAllUpdates();
-        assertThat(existingCubesForCubeColumns.size()).isEqualTo(14*13);
+        assertThat(existingCubesForCubeColumns.size()).isEqualTo(14 * 13);
         tracker.removeSource(srcPos.asLong());
         tracker.removeSource(srcPos2.asLong());
         tracker.removeSource(srcPos3.asLong());
         tracker.runAllUpdates();
-        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13*13);
+        assertThat(existingCubesForCubeColumns.size()).isEqualTo(13 * 13);
         tracker.removeSource(srcPos4.asLong());
         tracker.runAllUpdates();
         assertThat(existingCubesForCubeColumns).withFailMessage("Tracker should be empty after removing all sources.").isEmpty();
     }
 
     /**
-     * This scenario tests a single chunk source. Chunk sources won't be allowed in future implementations, but it is good to make sure they don't break everything.
-     * <br><br>
+     * This scenario tests a single chunk source. Chunk sources won't be allowed in future implementations, but it is good to make sure they don't
+     * break everything.
+     * <br>
+     * <br>
      * // TODO: A chunk should never be allowed to be a source. It should be an assert in the future.
      */
-    @Test public void testSingleChunkSource() {
+    @Test
+    public void testSingleChunkSource() {
         var tracker = new TestCubicTracker(8, 16, 256);
         ((MarkableAsCubic) tracker).cc_setCubic();
         var srcPos = CloPos.chunk(-4, 3);
@@ -228,7 +240,8 @@ public void testCubeSources(int initialSourceCount, int numPhases, int seed, flo
         for (int i = 0; i < 1000; i++) {
             var testPos = CloPos.chunk(srcPos.getX() + rand.nextInt(0, 20) - 10, srcPos.getZ() + rand.nextInt(0, 20) - 10);
             var dist = Misc.chebyshevDistance(srcPos.chunkPos(), testPos.chunkPos());
-            assertEquals(Math.min(7, dist), tracker.getLevel(testPos.asLong()), String.format("Level at chunk %d %d.", testPos.getX(), testPos.getZ()));
+            assertEquals(Math.min(7, dist), tracker.getLevel(testPos.asLong()),
+                    String.format("Level at chunk %d %d.", testPos.getX(), testPos.getZ()));
         }
         tracker.removeSource(srcPos.asLong());
         tracker.runAllUpdates();
@@ -238,7 +251,7 @@ public void testCubeSources(int initialSourceCount, int numPhases, int seed, flo
     private void addAndTestVanillaChunkSources(List<CloPos> srcPosClo, TestCubicTracker tracker, Random rand, int numSourcesAdded) {
         if (numSourcesAdded == 0) {
             for (int i = 0; i < numSourcesAdded; i++) {
-                srcPosClo.add(CloPos.chunk(rand.nextInt(0, 20)-10, rand.nextInt(0, 20)-10));
+                srcPosClo.add(CloPos.chunk(rand.nextInt(0, 20) - 10, rand.nextInt(0, 20) - 10));
                 tracker.addSource(srcPosClo.get(srcPosClo.size() - 1).toLong(), 0);
             }
             tracker.runAllUpdates();
@@ -258,7 +271,7 @@ private void removeAndTestVanillaChunkSources(List<CloPos> srcPosClo, TestCubicT
                 }
             }
             for (int i = 0; i < srcPosToRemove.size(); i++) {
-                srcPosClo.remove((int)srcPosToRemove.get(i));
+                srcPosClo.remove((int) srcPosToRemove.get(i));
             }
             tracker.runAllUpdates();
         }
@@ -286,10 +299,10 @@ private void testChunkSourcesVanilla(int initialSourceCount, int numPhases, int
         var rand = new Random(seed);
         var srcPosClo = new ArrayList<CloPos>(initialSourceCount);
 
-        for(int i = 0; i < numPhases; i++) {
+        for (int i = 0; i < numPhases; i++) {
             testVanillaChunkSourcePropagation(srcPosClo, tracker, rand);
-            if(initialSourceCount == 1) {
-                if(numPhases % 2 == 0) {
+            if (initialSourceCount == 1) {
+                if (numPhases % 2 == 0) {
                     removeAndTestVanillaChunkSources(srcPosClo, tracker, rand, chanceToRemovePerPhase);
                 } else {
                     addAndTestVanillaChunkSources(srcPosClo, tracker, rand, numSourcesToAddPerPhase);
@@ -298,11 +311,13 @@ private void testChunkSourcesVanilla(int initialSourceCount, int numPhases, int
         }
     }
 
-    @Test public void testSingleChunkSourceVanilla() {
+    @Test
+    public void testSingleChunkSourceVanilla() {
         testChunkSourcesVanilla(1, 1, 727, 0.5f, 5);
     }
 
-    @Test public void testMultipleChunkSourcesVanilla() {
+    @Test
+    public void testMultipleChunkSourcesVanilla() {
         testChunkSourcesVanilla(10, 4, 999, 0.5f, 5);
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicClientLevel.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicClientLevel.java
index 440f5696..d9256e79 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicClientLevel.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicClientLevel.java
@@ -3,10 +3,8 @@
 import io.github.opencubicchunks.cubicchunks.testutils.BaseTest;
 import org.junit.jupiter.api.TestInstance;
 
-
 /**
  * This test class is for testing {@link io.github.opencubicchunks.cubicchunks.mixin.core.client.multiplayer.MixinClientLevel}
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
-public class TestCubicClientLevel extends BaseTest {
-}
+public class TestCubicClientLevel extends BaseTest {}
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
index 70c64244..68779924 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
@@ -41,17 +41,17 @@ public TestDistanceManager(TicketStorage ticketStorage, Executor executor, Execu
             super(ticketStorage, executor, executor2);
         }
 
-        @Override
-        protected boolean isChunkToRemove(long chunkPos) {
+        @Override protected boolean isChunkToRemove(long chunkPos) {
             return false;
         }
 
-        @Nullable
-        @Override
-        protected ChunkHolder getChunk(long chunkPos) { return null; }
-        @Nullable
-        @Override
-        protected ChunkHolder updateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel) { return null; }
+        @Nullable @Override protected ChunkHolder getChunk(long chunkPos) {
+            return null;
+        }
+
+        @Nullable @Override protected ChunkHolder updateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel) {
+            return null;
+        }
     }
 
     static class ServerPlayerAndPosition {
@@ -67,34 +67,31 @@ static class ServerPlayerAndPosition {
     private DistanceManager setupDistanceManager(TicketStorage ticketStorage) {
         var mainThread = Thread.currentThread();
         var mainThreadExecutor = // Based on ServerChunkCache.MainThreadExecutor
-            new BlockableEventLoop<>("test_event_loop") {
-                @Override
-                public Runnable wrapRunnable(Runnable runnable) {
-                    return runnable;
-                }
-
-                @Override
-                protected boolean shouldRun(Runnable runnable) {
-                    return true;
-                }
-
-                @Override
-                protected boolean scheduleExecutables() {
-                    return true;
-                }
-
-                @Override
-                protected Thread getRunningThread() {
-                    return mainThread;
-                }
-            };
+                new BlockableEventLoop<>("test_event_loop") {
+                    @Override public Runnable wrapRunnable(Runnable runnable) {
+                        return runnable;
+                    }
+
+                    @Override protected boolean shouldRun(Runnable runnable) {
+                        return true;
+                    }
+
+                    @Override protected boolean scheduleExecutables() {
+                        return true;
+                    }
+
+                    @Override protected Thread getRunningThread() {
+                        return mainThread;
+                    }
+                };
         // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
         // (which occurs when using RETURNS_DEEP_STUBS)
         DistanceManager distanceManager = new TestDistanceManager(ticketStorage, Runnable::run, mainThreadExecutor);
         return distanceManager;
     }
 
-    @Test public void testUpdateChunkForcedVanilla() {
+    @Test
+    public void testUpdateChunkForcedVanilla() {
         var ticketStorage = new TicketStorage();
         DistanceManager distanceManager = setupDistanceManager(ticketStorage);
         ticketStorage.updateChunkForced(ChunkPos.ZERO, true);
@@ -102,7 +99,8 @@ protected Thread getRunningThread() {
         assertTrue(distanceManager.inEntityTickingRange(ChunkPos.ZERO.toLong()), "ChunkPos.ZERO is not in entity ticking range");
     }
 
-    @Test public void testUpdateChunkForced() {
+    @Test
+    public void testUpdateChunkForced() {
         var ticketStorage = new TicketStorage();
         DistanceManager distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
@@ -122,11 +120,14 @@ private void addAndTestPlayersVanilla(DistanceManager distanceManager, List<Serv
         }
 
         for (ServerPlayerAndPosition player : players) {
-            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(player.pos.chunk().toLong()), player.pos.chunk().toLong() + " has no players nearby");
+            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(player.pos.chunk().toLong()),
+                    player.pos.chunk().toLong() + " has no players nearby");
         }
     }
 
-    private void removeAndTestPlayersVanilla(DistanceManager distanceManager, List<ServerPlayerAndPosition> players, float chanceToRemove, Random rand) {
+    private void removeAndTestPlayersVanilla(
+            DistanceManager distanceManager, List<ServerPlayerAndPosition> players, float chanceToRemove, Random rand
+    ) {
         if (chanceToRemove != 0) {
             List<ServerPlayerAndPosition> playersToRemove = new ArrayList<>();
             for (int i = 0; i < players.size(); i++) {
@@ -140,7 +141,8 @@ private void removeAndTestPlayersVanilla(DistanceManager distanceManager, List<S
         }
 
         for (ServerPlayerAndPosition player : players) {
-            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(player.pos.chunk().toLong()), player.pos.chunk().toLong() + " has no players nearby");
+            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(player.pos.chunk().toLong()),
+                    player.pos.chunk().toLong() + " has no players nearby");
         }
     }
 
@@ -150,8 +152,7 @@ private void testAddAndRemoveVanilla(DistanceManager distanceManager, int iterat
         for (int i = 0; i < iterations; i++) {
             if (i % 2 == 0) {
                 addAndTestPlayersVanilla(distanceManager, players, numToAdd, rand);
-            }
-            else {
+            } else {
                 removeAndTestPlayersVanilla(distanceManager, players, chanceToRemove, rand);
             }
         }
@@ -168,7 +169,8 @@ private void addAndTestPlayers(DistanceManager distanceManager, List<ServerPlaye
         }
 
         for (ServerPlayerAndPosition player : players) {
-            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(CloPos.section(player.pos).toLong()), CloPos.section(player.pos).toLong() + " has no players nearby");
+            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(CloPos.section(player.pos).toLong()),
+                    CloPos.section(player.pos).toLong() + " has no players nearby");
         }
     }
 
@@ -186,7 +188,8 @@ private void removeAndTestPlayers(DistanceManager distanceManager, List<ServerPl
         }
 
         for (ServerPlayerAndPosition player : players) {
-            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(CloPos.section(player.pos).toLong()), CloPos.section(player.pos).toLong() + " has no players nearby");
+            assertEquals(TriState.TRUE, distanceManager.hasPlayersNearby(CloPos.section(player.pos).toLong()),
+                    CloPos.section(player.pos).toLong() + " has no players nearby");
         }
     }
 
@@ -196,40 +199,44 @@ private void testAddAndRemove(DistanceManager distanceManager, int iterations, i
         for (int i = 0; i < iterations; i++) {
             if (i % 2 == 0) {
                 addAndTestPlayers(distanceManager, players, numToAdd, rand);
-            }
-            else {
+            } else {
                 removeAndTestPlayers(distanceManager, players, chanceToRemove, rand);
             }
         }
     }
 
-    @Test public void testSinglePlayerVanilla() {
+    @Test
+    public void testSinglePlayerVanilla() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         testAddAndRemoveVanilla(distanceManager, 2, 1, 0.0f);
     }
 
-    @Test public void testMultiplePlayersVanilla() {
+    @Test
+    public void testMultiplePlayersVanilla() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         testAddAndRemoveVanilla(distanceManager, 100, 200, 0.5f);
     }
 
-    @Test public void testSinglePlayer() {
+    @Test
+    public void testSinglePlayer() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
         testAddAndRemove(distanceManager, 2, 1, 0.0f);
     }
 
-    @Test public void testMultiplePlayers() {
+    @Test
+    public void testMultiplePlayers() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
         testAddAndRemove(distanceManager, 50, 50, 0.5f);
     }
 
-    @Test public void testAddRemoveTicketsVanilla() {
+    @Test
+    public void testAddRemoveTicketsVanilla() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ticketStorage.addTicket(new Ticket(TicketType.START, 0), new ChunkPos(0, 0));
@@ -242,7 +249,8 @@ private void testAddAndRemove(DistanceManager distanceManager, int iterations, i
         assertFalse(distanceManager.hasTickets());
     }
 
-    @Test public void testAddRemoveTickets() {
+    @Test
+    public void testAddRemoveTickets() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
@@ -257,22 +265,26 @@ private void testAddAndRemove(DistanceManager distanceManager, int iterations, i
     }
 
     // Tests for PlayerTicketTracker
-    // TODO: The two functions being tested are complex and confusing, and I don't know how to test them at this moment beyond verifying they don't crash anything.
+    // TODO: The two functions being tested are complex and confusing, and I don't know how to test them at this moment beyond verifying they don't
+    // crash anything.
 
-    @Test public void testOnLevelChangeVanilla() {
+    @Test
+    public void testOnLevelChangeVanilla() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         // Update view distance calls onLevelChange
         ((CubicDistanceManagerTestAccess) distanceManager).get_playerTicketManager().updateViewDistance(10);
     }
 
-    @Test public void testRunAllUpdatesVanilla() {
+    @Test
+    public void testRunAllUpdatesVanilla() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((CubicDistanceManagerTestAccess) distanceManager).get_playerTicketManager().runAllUpdates();
     }
 
-    @Test public void testOnLevelChange() {
+    @Test
+    public void testOnLevelChange() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
@@ -280,13 +292,12 @@ private void testAddAndRemove(DistanceManager distanceManager, int iterations, i
         ((CubicDistanceManagerTestAccess) distanceManager).get_playerTicketManager().updateViewDistance(10);
     }
 
-    @Test public void testRunAllUpdates() {
+    @Test
+    public void testRunAllUpdates() {
         var ticketStorage = new TicketStorage();
         var distanceManager = setupDistanceManager(ticketStorage);
         ((MarkableAsCubic) distanceManager).cc_setCubic();
         ((CubicDistanceManagerTestAccess) distanceManager).get_playerTicketManager().runAllUpdates();
     }
 
-
-
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicServerLevel.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicServerLevel.java
index 13fb9c19..2b8296ee 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicServerLevel.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicServerLevel.java
@@ -1,6 +1,5 @@
 package io.github.opencubicchunks.cubicchunks.test.server.level;
 
-
 import static io.github.opencubicchunks.cubicchunks.testutils.Misc.setupServerLevel;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
@@ -20,35 +19,41 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestCubicServerLevel extends BaseTest {
     // TODO: Phase 3 - This needs a more rigorous test down the line when we actually care about entities
-    @Test public void testVanillaSpawningAllowed() throws Exception {
+    @Test
+    public void testVanillaSpawningAllowed() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
             assertFalse(serverLevelReference.value().areEntitiesActuallyLoadedAndTicking(new ChunkPos(0, 0)));
         }
     }
 
     // TODO: Phase 3 - This is part of the neoforge API and will need a more rigorous test when we need to support their API
-    @Test public void testVanillaInvalidateCapabilities() throws Exception {
+    @Test
+    public void testVanillaInvalidateCapabilities() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
             serverLevelReference.value().invalidateCapabilities(new ChunkPos(0, 0));
         }
     }
 
     // TODO: Stub.
-    @Test public void testVanillaTickChunk() throws Exception {
+    @Test
+    public void testVanillaTickChunk() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
             serverLevelReference.value().tickChunk(new LevelChunk(serverLevelReference.value(), new ChunkPos(0, 0)), 10);
         }
     }
 
     // TODO: Stub. This test hangs. Maybe due to ForcedChunksSavedData?
-    @Test @Disabled public void testVanillaSetChunkForced() throws Exception{
+    @Test
+    @Disabled
+    public void testVanillaSetChunkForced() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
             serverLevelReference.value().setChunkForced(0, 0, true);
         }
     }
 
     // TODO: Stub.
-    @Test public void testVanillaIsPositionEntityTicking() throws Exception {
+    @Test
+    public void testVanillaIsPositionEntityTicking() throws Exception {
         try (CloseableReference<ServerLevel> serverLevelReference = setupServerLevel()) {
             assertFalse(serverLevelReference.value().isPositionEntityTicking(BlockPos.ZERO));
         }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestPlayerRespawnLogic.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestPlayerRespawnLogic.java
index 6fb9041f..19e31c50 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestPlayerRespawnLogic.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestPlayerRespawnLogic.java
@@ -10,4 +10,3 @@
 public class TestPlayerRespawnLogic extends BaseTest {
     // TODO: There are no tests here because the only way to test this is with integration tests.
 }
-
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/entity/TestEntity.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/entity/TestEntity.java
index 02a3efc2..f51e5f25 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/entity/TestEntity.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/entity/TestEntity.java
@@ -26,7 +26,8 @@
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestEntity extends BaseTest {
-    @Test public void testCubePos() {
+    @Test
+    public void testCubePos() {
         Level level = mock();
         when(((CanBeCubic) level).cc_isCubic()).thenReturn(true);
         when(level.enabledFeatures()).thenReturn(FeatureFlags.DEFAULT_FLAGS);
@@ -34,7 +35,7 @@ public class TestEntity extends BaseTest {
         var entity = EntityType.GIANT.create(level, EntitySpawnReason.MOB_SUMMONED);
         var random = new Random(742);
         for (int i = 0; i < 1000; i++) {
-            var pos = new BlockPos(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+            var pos = new BlockPos(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
             entity.setPos(pos.getX(), pos.getY(), pos.getZ());
             assertEquals(CubePos.from(pos), ((EntityCubePosGetter) entity).cc_cubePosition());
         }
@@ -42,8 +43,10 @@ public class TestEntity extends BaseTest {
 
     // TODO (P2) test teleport methods
 
-    // Not really a unit test since it depends on CubicLevelReader, but touchingUnloadedChunk is essentially just a wrapper around LevelReader.hasChunksAt anyway
-    @Test public void testTouchingUnloadedChunk() {
+    // Not really a unit test since it depends on CubicLevelReader, but touchingUnloadedChunk is essentially just a wrapper around
+    // LevelReader.hasChunksAt anyway
+    @Test
+    public void testTouchingUnloadedChunk() {
         var random = new Random(743);
         var cubePositions = new LongAVLTreeSet();
         for (int x = -5; x <= 5; x++) {
@@ -59,18 +62,23 @@ public class TestEntity extends BaseTest {
         var levelReader = new TestCubicLevelReader.DummyLevelReader(mock(), cubePositions);
         when(((CanBeCubic) level).cc_isCubic()).thenReturn(true);
         when(level.enabledFeatures()).thenReturn(FeatureFlags.DEFAULT_FLAGS);
-        when(((CubicLevelReader) level).cc_hasCubesAt(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt())).then(AdditionalAnswers.delegatesTo(levelReader));
+        when(((CubicLevelReader) level).cc_hasCubesAt(anyInt(), anyInt(), anyInt(), anyInt(), anyInt(), anyInt()))
+                .then(AdditionalAnswers.delegatesTo(levelReader));
         var entity = EntityType.GIANT.create(level, EntitySpawnReason.MOB_SUMMONED);
         for (int i = 0; i < 500; i++) {
-            var cubePos = CubePos.of(random.nextInt(10)-5, random.nextInt(10)-5, random.nextInt(10)-5);
+            var cubePos = CubePos.of(random.nextInt(10) - 5, random.nextInt(10) - 5, random.nextInt(10) - 5);
             // Horizontal center of cube, at bottom
-            var blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS/2, 1, CubicConstants.DIAMETER_IN_BLOCKS/2);
+            var blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS / 2, 1, CubicConstants.DIAMETER_IN_BLOCKS / 2);
             entity.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
             assertEquals(!cubePositions.contains(cubePos.asLong()), entity.touchingUnloadedChunk());
             // Horizontal center of cube, at top (overlapping cube above)
-            blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS/2, CubicConstants.DIAMETER_IN_BLOCKS - 1, CubicConstants.DIAMETER_IN_BLOCKS/2);
+            blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS / 2, CubicConstants.DIAMETER_IN_BLOCKS - 1,
+                    CubicConstants.DIAMETER_IN_BLOCKS / 2);
             entity.setPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-            assertEquals(!(cubePositions.contains(cubePos.asLong()) && cubePositions.contains(CubePos.asLong(cubePos.getX(), cubePos.getY() + 1, cubePos.getZ()))), entity.touchingUnloadedChunk());
+            assertEquals(
+                    !(cubePositions.contains(cubePos.asLong())
+                            && cubePositions.contains(CubePos.asLong(cubePos.getX(), cubePos.getY() + 1, cubePos.getZ()))),
+                    entity.touchingUnloadedChunk());
         }
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
index f25a9bc0..63ce2508 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
@@ -46,7 +46,8 @@ static BlockGetter mockBlockGetter(BlockState state) {
         }
     }
 
-    @Test public void testSimpleCCBlockCollisions() {
+    @Test
+    public void testSimpleCCBlockCollisions() {
         Level level = mock();
         when(((CanBeCubic) level).cc_isCubic()).thenReturn(true);
         var blockGetter = DummyBlockGetter.mockBlockGetter(Blocks.STONE.defaultBlockState());
@@ -61,19 +62,23 @@ static BlockGetter mockBlockGetter(BlockState state) {
         var random = new Random(-8);
         for (int i = 0; i < 500; i++) {
             // We don't generate positions on the edge of the cube here since BlockCollisions tries to reach into neighboring cubes in that case
-            var blockPos = cubePos.asBlockPos(random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS-1), random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS-1), random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS-1));
+            var blockPos = cubePos.asBlockPos(random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS - 1),
+                    random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS - 1), random.nextInt(1, CubicConstants.DIAMETER_IN_BLOCKS - 1));
             int[] c = new int[] { 0 };
-            var blockCollisions = new BlockCollisions<Void>(level, (Entity) null, AABB.unitCubeFromLowerCorner(new Vec3(blockPos.getX(), blockPos.getY(), blockPos.getZ())).inflate(-0.2), false, (pos, voxelShape) -> {
-                assertEquals(blockPos, pos);
-                c[0]++;
-                return null;
-            });
+            var blockCollisions = new BlockCollisions<Void>(level, (Entity) null,
+                    AABB.unitCubeFromLowerCorner(new Vec3(blockPos.getX(), blockPos.getY(), blockPos.getZ())).inflate(-0.2), false,
+                    (pos, voxelShape) -> {
+                        assertEquals(blockPos, pos);
+                        c[0]++;
+                        return null;
+                    });
             blockCollisions.forEachRemaining((v) -> {});
             assertEquals(1, c[0], "block collision callback should be called exactly once");
         }
     }
 
-    @Test public void testCCBlockCollisionsAcrossCubeBorders() {
+    @Test
+    public void testCCBlockCollisionsAcrossCubeBorders() {
         Level level = mock();
         when(((CanBeCubic) level).cc_isCubic()).thenReturn(true);
         var emptyBlockGetter = DummyBlockGetter.mockBlockGetter(Blocks.AIR.defaultBlockState());
@@ -85,18 +90,21 @@ static BlockGetter mockBlockGetter(BlockState state) {
         when(((CubicLevel) level).cc_getCubeForCollisions(anyInt(), anyInt(), anyInt())).then(AdditionalAnswers.delegatesTo(cubeGetter));
 
         var cubePos = CubePos.of(-3, -1, -8);
-        var blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS-1, CubicConstants.DIAMETER_IN_BLOCKS-1, CubicConstants.DIAMETER_IN_BLOCKS-1);
+        var blockPos = cubePos.asBlockPos(CubicConstants.DIAMETER_IN_BLOCKS - 1, CubicConstants.DIAMETER_IN_BLOCKS - 1,
+                CubicConstants.DIAMETER_IN_BLOCKS - 1);
         // AABB that reaches across the corner between 8 cubes
-        var aabb = AABB.unitCubeFromLowerCorner(new Vec3(blockPos.getX()+0.5, blockPos.getY()+0.5, blockPos.getZ()+0.5)).inflate(-0.2);
+        var aabb = AABB.unitCubeFromLowerCorner(new Vec3(blockPos.getX() + 0.5, blockPos.getY() + 0.5, blockPos.getZ() + 0.5)).inflate(-0.2);
         int[] c = new int[] { 0 };
         var blockCollisions = new BlockCollisions<Void>(level, (Entity) null, aabb, false, (pos, voxelShape) -> {
             var collidedCubePos = CubePos.from(pos);
             System.out.println(pos + " " + collidedCubePos);
-            assertEquals(1, ((collidedCubePos.getX() + collidedCubePos.getY() + collidedCubePos.getZ()) & 1), "should only collide with positions in solid cubes");
+            assertEquals(1, ((collidedCubePos.getX() + collidedCubePos.getY() + collidedCubePos.getZ()) & 1),
+                    "should only collide with positions in solid cubes");
             c[0]++;
             return null;
         });
         blockCollisions.forEachRemaining((v) -> {});
-        assertEquals(4, c[0], "block collision callback should be called exactly four times (four of eight cubes are solid at corner of 3d checkerboard");
+        assertEquals(4, c[0],
+                "block collision callback should be called exactly four times (four of eight cubes are solid at corner of 3d checkerboard");
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevel.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevel.java
index 2d49046e..86efd9a2 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevel.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevel.java
@@ -13,7 +13,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
 
 import io.github.opencubicchunks.cubicchunks.MarkableAsCubic;
 import io.github.opencubicchunks.cubicchunks.testutils.BaseTest;
@@ -29,7 +28,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.TickRateManager;
 import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
@@ -37,7 +35,6 @@
 import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.item.alchemy.PotionBrewing;
 import net.minecraft.world.item.crafting.RecipeAccess;
-import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.level.ExplosionDamageCalculator;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
@@ -71,9 +68,7 @@
 
 /**
  * Tests for {@link CubicLevel}.
- *
  * Currently only tests that the methods exist and don't throw exceptions or hang.
- *
  * The unit tests will not be further developed. We are just going to integration test this class once we have enough working functionality elsewhere.
  */
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -82,36 +77,37 @@ public static class TestLevel extends Level {
         ChunkSource mockChunkSource = mock(ChunkSource.class, RETURNS_DEEP_STUBS);
 
         public TestLevel(
-            WritableLevelData levelData,
-            ResourceKey<Level> dimension,
-            RegistryAccess registryAccess,
-            Holder<DimensionType> dimensionTypeRegistration,
-            boolean isClientSide,
-            boolean isDebug,
-            long biomeZoomSeed,
-            int maxChainedNeighborUpdates
+                WritableLevelData levelData, ResourceKey<Level> dimension, RegistryAccess registryAccess,
+                Holder<DimensionType> dimensionTypeRegistration, boolean isClientSide, boolean isDebug, long biomeZoomSeed,
+                int maxChainedNeighborUpdates
         ) {
             super(levelData, dimension, registryAccess, dimensionTypeRegistration, isClientSide, isDebug, biomeZoomSeed, maxChainedNeighborUpdates);
-            when(((CubeSource)mockChunkSource).cc_getCube(anyInt(), anyInt(), anyInt(), anyBoolean())).thenReturn(mock(LevelCube.class));
-            when(((CubeSource)mockChunkSource).cc_getCube(anyInt(), anyInt(), anyInt(), any(), anyBoolean())).thenReturn(mock(LevelCube.class));
+            when(((CubeSource) mockChunkSource).cc_getCube(anyInt(), anyInt(), anyInt(), anyBoolean())).thenReturn(mock(LevelCube.class));
+            when(((CubeSource) mockChunkSource).cc_getCube(anyInt(), anyInt(), anyInt(), any(), anyBoolean())).thenReturn(mock(LevelCube.class));
         }
 
         @Override public void sendBlockUpdated(BlockPos pos, BlockState oldState, BlockState newState, int flags) {
 
         }
 
-        @Override public void playSeededSound(@Nullable Entity entity, double x, double y, double z, Holder<SoundEvent> sound, SoundSource source, float volume, float pitch, long seed) {
+        @Override public void playSeededSound(
+                @Nullable Entity entity, double x, double y, double z, Holder<SoundEvent> sound, SoundSource source, float volume, float pitch,
+                long seed
+        ) {
 
         }
 
-        @Override public void playSeededSound(@Nullable Entity entity, Entity sourceEntity, Holder<SoundEvent> sound, SoundSource source, float volume, float pitch, long seed) {
+        @Override public void playSeededSound(
+                @Nullable Entity entity, Entity sourceEntity, Holder<SoundEvent> sound, SoundSource source, float volume, float pitch, long seed
+        ) {
 
         }
 
-        @Override
-        public void explode(@Nullable Entity source, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator damageCalculator, double x, double y, double z, float radius,
-                            boolean fire, ExplosionInteraction explosionInteraction, ParticleOptions smallExplosionParticles, ParticleOptions largeExplosionParticles,
-                            Holder<SoundEvent> explosionSound) {
+        @Override public void explode(
+                @Nullable Entity source, @Nullable DamageSource damageSource, @Nullable ExplosionDamageCalculator damageCalculator, double x,
+                double y, double z, float radius, boolean fire, ExplosionInteraction explosionInteraction, ParticleOptions smallExplosionParticles,
+                ParticleOptions largeExplosionParticles, Holder<SoundEvent> explosionSound
+        ) {
 
         }
 
@@ -216,16 +212,20 @@ public void explode(@Nullable Entity source, @Nullable DamageSource damageSource
         }
 
         // This overrides CubicLevel.hasCube
-        @SuppressWarnings("unused") public boolean cc_hasCube(int x, int y, int z) {
+        @SuppressWarnings("unused")
+        public boolean cc_hasCube(int x, int y, int z) {
             return true;
         }
     }
 
     private CloseableReference<TestLevel> setupTestLevel() {
-        MockedStatic<RandomState> randomStateMockedStatic = Mockito.mockStatic(RandomState.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
+        MockedStatic<RandomState> randomStateMockedStatic = Mockito.mockStatic(RandomState.class,
+                withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
         ChunkGenerator noiseBasedChunkGeneratorMock = mock(ChunkGenerator.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
-        when(noiseBasedChunkGeneratorMock.createBiomes(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
-        when(noiseBasedChunkGeneratorMock.fillFromNoise(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
+        when(noiseBasedChunkGeneratorMock.createBiomes(any(), any(), any(), any()))
+                .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
+        when(noiseBasedChunkGeneratorMock.fillFromNoise(any(), any(), any(), any()))
+                .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[3]));
         LevelStem levelStemMock = mock(RETURNS_DEEP_STUBS);
         when(levelStemMock.type().value().height()).thenReturn(384);
         LevelStorageSource.LevelStorageAccess levelStorageAccessMock = mock(RETURNS_DEEP_STUBS);
@@ -238,102 +238,108 @@ private CloseableReference<TestLevel> setupTestLevel() {
         when(holderMock.unwrapKey()).thenReturn(Optional.of(ResourceKey.create(mock(), mock())));
         when(holderMock.value()).thenReturn(mock(DimensionType.class));
         return new CloseableReference<>(
-            new TestLevel(mock(RETURNS_DEEP_STUBS),
-                mock(RETURNS_DEEP_STUBS),
-                mock(RETURNS_DEEP_STUBS),
-                holderMock,
-                false,
-                false,
-                0,
-                0),
-            randomStateMockedStatic);
+                new TestLevel(mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), holderMock, false, false, 0, 0),
+                randomStateMockedStatic);
     }
 
-    @Test public void testGetCubeAt() throws Exception {
+    @Test
+    public void testGetCubeAt() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             ((CubicLevel) testLevelReference.value()).cc_getCubeAt(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testGetCube() throws Exception {
+    @Test
+    public void testGetCube() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             ((CubicLevel) testLevelReference.value()).cc_getCube(0, 0, 0);
         }
     }
 
-    @Test public void testGetCubeCubeAccess() throws Exception {
+    @Test
+    public void testGetCubeCubeAccess() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             ((CubicLevel) testLevelReference.value()).cc_getCube(0, 0, 0, ChunkStatus.FULL, true);
         }
     }
 
-    @Test public void testSetBlock() throws Exception {
+    @Test
+    public void testSetBlock() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).setBlock(new BlockPos(0, 0, 0), mock(BlockState.class), 0);
         }
     }
 
-    @Test public void testGetBlockState() throws Exception {
+    @Test
+    public void testGetBlockState() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).getBlockState(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testGetBlockEntity() throws Exception {
+    @Test
+    public void testGetBlockEntity() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).getBlockEntity(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testGetFluidState() throws Exception {
+    @Test
+    public void testGetFluidState() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).getFluidState(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testSetBlockEntity() throws Exception {
+    @Test
+    public void testSetBlockEntity() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).setBlockEntity(mock(BlockEntity.class, RETURNS_DEEP_STUBS));
         }
     }
 
-    @Test public void testRemoveBlockEntity() throws Exception {
+    @Test
+    public void testRemoveBlockEntity() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).removeBlockEntity(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testIsLoaded() throws Exception {
+    @Test
+    public void testIsLoaded() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
-            ((MarkableAsCubic)testLevelReference.value()).cc_setCubic();
+            ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).isLoaded(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void testLoadedAndEntityCanStandOnFace() throws Exception {
+    @Test
+    public void testLoadedAndEntityCanStandOnFace() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).loadedAndEntityCanStandOnFace(new BlockPos(0, 0, 0), mock(Entity.class), Direction.UP);
         }
     }
 
-    @Test public void testBlockEntityChanged() throws Exception {
+    @Test
+    public void testBlockEntityChanged() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).blockEntityChanged(new BlockPos(0, 0, 0));
         }
     }
 
-    @Test public void getCurrentDifficultyAt() throws Exception {
+    @Test
+    public void getCurrentDifficultyAt() throws Exception {
         try (CloseableReference<TestLevel> testLevelReference = setupTestLevel()) {
             ((MarkableAsCubic) testLevelReference.value()).cc_setCubic();
             (testLevelReference.value()).getCurrentDifficultyAt(new BlockPos(0, 0, 0));
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevelReader.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevelReader.java
index 35cc8744..1187f44b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevelReader.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestCubicLevelReader.java
@@ -24,6 +24,7 @@ public class TestCubicLevelReader extends BaseTest {
     public static class DummyLevelReader implements CubicLevelReader {
         private CubeAccess ca;
         private LongSet cubePositions;
+
         public DummyLevelReader(CubeAccess ca, LongSet cubePositions) {
             this.ca = ca;
             this.cubePositions = cubePositions;
@@ -39,7 +40,8 @@ public DummyLevelReader(CubeAccess ca, LongSet cubePositions) {
     }
 
     // This test is pretty trivial since it just tests methods that are effectively wrappers for hasCube and getCube
-    @Test public void testSingleCubeMethods() {
+    @Test
+    public void testSingleCubeMethods() {
         var random = new Random(9264);
         var cubePositions = new LongAVLTreeSet();
         for (int x = -5; x <= 5; x++) {
@@ -54,7 +56,7 @@ public DummyLevelReader(CubeAccess ca, LongSet cubePositions) {
         var levelReader = new DummyLevelReader(mock(), cubePositions);
         var radius = 6 * CubicConstants.DIAMETER_IN_BLOCKS;
         for (int i = 0; i < 500; i++) {
-            var pos = new BlockPos(random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius);
+            var pos = new BlockPos(random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius);
             var expectedResult = cubePositions.contains(CubePos.asLong(pos));
             assertEquals(expectedResult, levelReader.cc_getCube(pos) != null);
             assertEquals(expectedResult, levelReader.cc_hasCubeAt(pos));
@@ -62,7 +64,8 @@ public DummyLevelReader(CubeAccess ca, LongSet cubePositions) {
     }
     // TODO (P2): test cc_getCubeForCollisions
 
-    @Test public void testHasCubesAt() {
+    @Test
+    public void testHasCubesAt() {
         var random = new Random(9264);
         var cubePositions = new LongAVLTreeSet();
         for (int x = -4; x <= 4; x++) {
@@ -76,14 +79,13 @@ public DummyLevelReader(CubeAccess ca, LongSet cubePositions) {
         var radius = 6 * CubicConstants.DIAMETER_IN_BLOCKS;
 
         for (int i = 0; i < 2000; i++) {
-            var pos1 = new BlockPos(random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius);
-            var pos2 = new BlockPos(random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius, random.nextInt(2*radius)-radius);
+            var pos1 = new BlockPos(random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius);
+            var pos2 = new BlockPos(random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius, random.nextInt(2 * radius) - radius);
             var minPos = new BlockPos(Math.min(pos1.getX(), pos2.getX()), Math.min(pos1.getY(), pos2.getY()), Math.min(pos1.getZ(), pos2.getZ()));
             var maxPos = new BlockPos(Math.max(pos1.getX(), pos2.getX()), Math.max(pos1.getY(), pos2.getY()), Math.max(pos1.getZ(), pos2.getZ()));
-            var expectedResult =
-                    Coords.blockToCube(minPos.getX()) >= -4 && Coords.blockToCube(maxPos.getX()) <= 4 &&
-                    Coords.blockToCube(minPos.getY()) >= -4 && Coords.blockToCube(maxPos.getY()) <= 4 &&
-                    Coords.blockToCube(minPos.getZ()) >= -4 && Coords.blockToCube(maxPos.getZ()) <= 4;
+            var expectedResult = Coords.blockToCube(minPos.getX()) >= -4 && Coords.blockToCube(maxPos.getX()) <= 4
+                    && Coords.blockToCube(minPos.getY()) >= -4 && Coords.blockToCube(maxPos.getY()) <= 4 && Coords.blockToCube(minPos.getZ()) >= -4
+                    && Coords.blockToCube(maxPos.getZ()) <= 4;
             assertEquals(expectedResult, levelReader.cc_hasCubesAt(minPos, maxPos));
         }
     }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
index 503e0522..99bbc2cc 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
@@ -24,9 +24,9 @@
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.UpgradeData;
+import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.gameevent.GameEventListenerRegistry;
 import net.minecraft.world.level.levelgen.blending.BlendingData;
 import net.minecraft.world.level.material.Fluid;
@@ -39,10 +39,10 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestCubeAccess extends BaseTest {
     static class CubeAccessTestImpl extends CubeAccess {
-        public CubeAccessTestImpl(CubePos cubePos, UpgradeData upgradeData,
-                                  LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry,
-                                  long inhabitedTime, @Nullable LevelChunkSection[] chunkSections,
-                                  @Nullable BlendingData blendingData) {
+        public CubeAccessTestImpl(
+                CubePos cubePos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, long inhabitedTime,
+                @Nullable LevelChunkSection[] chunkSections, @Nullable BlendingData blendingData
+        ) {
             super(cubePos, upgradeData, levelHeightAccessor, biomeRegistry, inhabitedTime, chunkSections, blendingData);
         }
 
@@ -104,13 +104,15 @@ public CubeAccessTestImpl(CubePos cubePos, UpgradeData upgradeData,
     }
 
     private void findBlocks(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         var cubeAccess = new CubeAccessTestImpl(cubePos, mock(), mock(), mock(), 0L, new LevelChunkSection[CubicConstants.SECTION_COUNT], mock());
         Set<BlockPos> visitedPositions = new HashSet<>();
         Set<BlockPos> expectedPositions = new HashSet<>();
         for (int i = 0; i < 1000; i++) {
-            BlockPos pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
-            if (!visitedPositions.add(pos)) continue;
+            BlockPos pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            if (!visitedPositions.add(pos))
+                continue;
             if (random.nextBoolean()) {
                 cubeAccess.setBlockState(pos, Blocks.STONE.defaultBlockState());
                 expectedPositions.add(pos);
@@ -123,7 +125,8 @@ private void findBlocks(Random random) {
         assertEquals(expectedPositions, foundPositions);
     }
 
-    @Test public void testFindBlocks() {
+    @Test
+    public void testFindBlocks() {
         var random = new Random(-99);
         for (int i = 0; i < 100; i++) {
             findBlocks(random);
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestLevelCube.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestLevelCube.java
index 028ab770..b481a711 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestLevelCube.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestLevelCube.java
@@ -36,12 +36,12 @@ public class TestLevelCube extends BaseTest {
     // TODO (P2 or P3) postProcessGeneration - currently a method stub
 
     private void simpleGetSetBlockState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         var cube = new LevelCube(mock(Answers.RETURNS_DEEP_STUBS), cubePos);
         Map<BlockPos, BlockState> states = new HashMap<>();
         for (int i = 0; i < 1000; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             var state = random.nextBoolean() ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState();
             states.put(pos, state);
             cube.setBlockState(pos, state);
@@ -54,13 +54,13 @@ private void simpleGetSetBlockState(Random random) {
 
     // Mojang's fluid stuff is so jank and half-implemented
     private void fluidState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         var cube = new LevelCube(mock(Answers.RETURNS_DEEP_STUBS), cubePos);
         Set<BlockPos> positions = new HashSet<>();
         var state = Blocks.ANDESITE_SLAB.defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, true);
         for (int i = 0; i < 100; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             positions.add(pos);
             cube.setBlockState(pos, state);
         }
@@ -72,9 +72,9 @@ private void fluidState(Random random) {
     }
 
     private void methodCallsAndBlockEntities(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
-        var pos = cubePos
-            .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
+        var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
         var cube = new LevelCube(mock(Answers.RETURNS_DEEP_STUBS), cubePos);
         BlockState state1 = spy(Blocks.FURNACE.defaultBlockState());
         BlockState state2 = spy(Blocks.STONE.defaultBlockState());
@@ -91,7 +91,8 @@ private void methodCallsAndBlockEntities(Random random) {
         verify(state2, times(1)).onPlace(any(), eq(pos), eq(state1), eq(false));
     }
 
-    @Test public void testGetSetBlockStateAndFluidState() {
+    @Test
+    public void testGetSetBlockStateAndFluidState() {
         var random = new Random(-102);
         for (int i = 0; i < 100; i++) {
             simpleGetSetBlockState(random);
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestProtoCube.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestProtoCube.java
index ad21a1cf..e7bc20e9 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestProtoCube.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestProtoCube.java
@@ -33,18 +33,19 @@ private ProtoCube makeProtoCube(CubePos cubePos) {
         when(heightAccessor.getMaxY()).thenReturn(1 << 24);
         when(heightAccessor.getHeight()).thenReturn(1 << 25);
         when(heightAccessor.isOutsideBuildHeight(any())).thenReturn(false);
-        return new ProtoCube(cubePos, mock(Answers.RETURNS_DEEP_STUBS), heightAccessor, mock(Answers.RETURNS_DEEP_STUBS), mock(Answers.RETURNS_DEEP_STUBS));
+        return new ProtoCube(cubePos, mock(Answers.RETURNS_DEEP_STUBS), heightAccessor, mock(Answers.RETURNS_DEEP_STUBS),
+                mock(Answers.RETURNS_DEEP_STUBS));
     }
 
     // TODO markPosForPostprocessing - need to figure out what it actually does in order to test it
 
     private void simpleGetSetBlockState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         var cube = makeProtoCube(cubePos);
         Map<BlockPos, BlockState> states = new HashMap<>();
         for (int i = 0; i < 1000; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             var state = random.nextBoolean() ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState();
             states.put(pos, state);
             cube.setBlockState(pos, state);
@@ -57,13 +58,13 @@ private void simpleGetSetBlockState(Random random) {
 
     // Mojang's fluid stuff is so jank and half-implemented
     private void fluidState(Random random) {
-        CubePos cubePos = CubePos.of(random.nextInt(20000)-10000, random.nextInt(20000)-10000, random.nextInt(20000)-10000);
+        CubePos cubePos = CubePos.of(random.nextInt(20000) - 10000, random.nextInt(20000) - 10000, random.nextInt(20000) - 10000);
         var cube = makeProtoCube(cubePos);
         Set<BlockPos> positions = new HashSet<>();
         var state = Blocks.ANDESITE_SLAB.defaultBlockState().setValue(BlockStateProperties.WATERLOGGED, true);
         for (int i = 0; i < 100; i++) {
-            var pos = cubePos
-                .asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
+            var pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
+                    random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
             positions.add(pos);
             cube.setBlockState(pos, state);
         }
@@ -74,11 +75,12 @@ private void fluidState(Random random) {
         }
     }
 
-    @Test public void testGetSetBlockStateAndFluidState() {
+    @Test
+    public void testGetSetBlockStateAndFluidState() {
         var random = new Random(-102);
         for (int i = 0; i < 100; i++) {
             simpleGetSetBlockState(random);
             fluidState(random);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/CloseableReference.java b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/CloseableReference.java
index eba7ea23..059384da 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/CloseableReference.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/CloseableReference.java
@@ -3,22 +3,25 @@
 /**
  * A record wrapping a value and storing any {@link AutoCloseable}s that need to be closed once the value is no longer in use.
  * <br>
- * This is necessary because Java does not have multi-return; if a function returns the value, it also needs a way to return the associated {@link AutoCloseable}s.
- * <br><br>
+ * This is necessary because Java does not have multi-return; if a function returns the value, it also needs a way to return the associated
+ * {@link AutoCloseable}s.
+ * <br>
+ * <br>
  * This should be used with try with resources as follows:
+ * 
  * <pre>
  * {@code
  * // createFooReference() returns CloseableReference<Foo>
- * try(var fooReference = createFooReference()) {
+ * try (var fooReference = createFooReference()) {
  *     var foo = fooReference.value();
  *     // code using foo
  * }
  * }
  * </pre>
- * @param value The value that is referenced
+ * 
+ * @param value   The value that is referenced
  * @param toClose Instances of {@link AutoCloseable} that must be closed when value is no longer in use
- * @param <T> The type of the referenced value
- *
+ * @param <T>     The type of the referenced value
  * @author Builderb0y
  */
 public record CloseableReference<T>(T value, AutoCloseable... toClose) implements AutoCloseable {
@@ -28,8 +31,7 @@ public record CloseableReference<T>(T value, AutoCloseable... toClose) implement
         for (AutoCloseable closeable : this.toClose) {
             try {
                 closeable.close();
-            }
-            catch (Throwable throwable) {
+            } catch (Throwable throwable) {
                 if (e == null) {
                     e = new Exception();
                 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
index 9f2f1dc6..3afaaeac 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
@@ -36,15 +36,19 @@ public class Misc {
     public static int chebyshevDistance(Vec3i a, Vec3i b) {
         return Math.max(Math.max(Math.abs(a.getX() - b.getX()), Math.abs(a.getY() - b.getY())), Math.abs(a.getZ() - b.getZ()));
     }
+
     public static int chebyshevDistance(ChunkPos a, ChunkPos b) {
         return Math.max(Math.abs(a.x - b.x), Math.abs(a.z - b.z));
     }
 
     public static CloseableReference<ServerLevel> setupServerLevel() {
-        MockedStatic<RandomState> randomStateMockedStatic = Mockito.mockStatic(RandomState.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
+        MockedStatic<RandomState> randomStateMockedStatic = Mockito.mockStatic(RandomState.class,
+                withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
         ChunkGenerator noiseBasedChunkGeneratorMock = mock(ChunkGenerator.class, withSettings().defaultAnswer(Answers.RETURNS_DEEP_STUBS));
-        when(noiseBasedChunkGeneratorMock.createBiomes(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[4]));
-        when(noiseBasedChunkGeneratorMock.fillFromNoise(any(),any(),any(),any())).thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[4]));
+        when(noiseBasedChunkGeneratorMock.createBiomes(any(), any(), any(), any()))
+                .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[4]));
+        when(noiseBasedChunkGeneratorMock.fillFromNoise(any(), any(), any(), any()))
+                .thenAnswer(i -> CompletableFuture.completedFuture(i.getArguments()[4]));
         LevelStem levelStemMock = mock(Mockito.RETURNS_DEEP_STUBS);
         when(levelStemMock.type().value().height()).thenReturn(384);
         LevelStorageSource.LevelStorageAccess levelStorageAccessMock = mock(Mockito.RETURNS_DEEP_STUBS);
@@ -53,23 +57,13 @@ public static CloseableReference<ServerLevel> setupServerLevel() {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return new CloseableReference<>(
-            new ServerLevel(mock(RETURNS_DEEP_STUBS),
+        return new CloseableReference<>(new ServerLevel(mock(RETURNS_DEEP_STUBS),
                 // We run everything on the main thread as Mockito has race conditions when multiple threads call into it
                 // (which occurs when using RETURNS_DEEP_STUBS)
-                Runnable::run,
-                levelStorageAccessMock,
-                mock(RETURNS_DEEP_STUBS),
-                mock(RETURNS_DEEP_STUBS),
-                levelStemMock,
+                Runnable::run, levelStorageAccessMock, mock(RETURNS_DEEP_STUBS), mock(RETURNS_DEEP_STUBS), levelStemMock,
                 // Need to mock an implementation of the interface, so that it also implements CloProgressListener
-                Mockito.<LoggerChunkProgressListener>mock(RETURNS_DEEP_STUBS),
-                false,
-                0,
-                List.of(),
-                false,
-                mock(RETURNS_DEEP_STUBS)),
-            randomStateMockedStatic);
+                Mockito.<LoggerChunkProgressListener>mock(RETURNS_DEEP_STUBS), false, 0, List.of(), false, mock(RETURNS_DEEP_STUBS)),
+                randomStateMockedStatic);
     }
 
     /**
@@ -83,7 +77,8 @@ public static LevelCube generateRandomLevelCube(Level level, CubePos pos, Random
                 for (int y = 0; y < CubicConstants.SECTION_DIAMETER; y++) {
                     for (int z = 0; z < CubicConstants.SECTION_DIAMETER; z++) {
                         if (random.nextBoolean()) {
-                            section.setBlockState(x, y, z, random.nextBoolean() ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState(), false);
+                            section.setBlockState(x, y, z, random.nextBoolean() ? Blocks.STONE.defaultBlockState() : Blocks.DIRT.defaultBlockState(),
+                                    false);
                         }
                     }
                 }
@@ -93,9 +88,6 @@ public static LevelCube generateRandomLevelCube(Level level, CubePos pos, Random
     }
 
     public static <T> void assertDeepEquals(@Nullable T actual, @Nullable T expected) {
-        assertThat(actual)
-            .usingRecursiveComparison()
-            .usingOverriddenEquals()
-            .isEqualTo(expected);
+        assertThat(actual).usingRecursiveComparison().usingOverriddenEquals().isEqualTo(expected);
     }
 }

From 101e10c66ab36e704c7c09e0e12cb09e68b82285 Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Sun, 15 Jun 2025 21:39:35 +1200
Subject: [PATCH 4/6] fix checkstyle issues

---
 .../client/multiplayer/ClientCubeCache.java   |  2 +-
 .../renderer/cube/RenderCubeRegion.java       |  6 ++-
 .../cubicchunks/config/CommonConfig.java      |  3 +-
 .../cubicchunks/config/ServerConfig.java      | 52 ++++++++++---------
 .../cubicchunks/mixin/ASMConfigPlugin.java    | 18 +++++--
 .../multiplayer/MixinClientChunkCache.java    |  8 +--
 .../renderer/MixinSectionOcclusionGraph.java  | 12 +++--
 .../core/client/renderer/MixinViewArea.java   | 12 +++--
 .../chunk/MixinRenderRegionCache.java         |  2 +-
 ...SectionRenderDispatcher$RenderSection.java |  9 ++--
 .../level/MixinChunkGenerationTask.java       |  9 ++--
 .../common/server/level/MixinChunkMap.java    |  6 ++-
 .../server/level/MixinChunkTracker.java       | 13 +++--
 .../server/level/MixinDistanceManager.java    | 12 +++--
 .../level/MixinPlayerTicketTracker.java       |  3 +-
 .../server/level/MixinServerChunkCache.java   |  4 +-
 .../common/server/level/MixinServerLevel.java |  3 +-
 .../core/common/world/entity/MixinEntity.java |  3 +-
 .../world/level/MixinBlockCollisions.java     |  6 ++-
 .../core/common/world/level/MixinLevel.java   |  8 +--
 .../level/lighting/MixinLevelLightEngine.java |  9 ++--
 .../CCCommonHooks.java                        |  2 +
 .../CCEventHooks.java                         |  2 +
 .../EventConstructorDelegates.java            |  2 +
 .../CCClientboundLevelCubePacketData.java     | 19 ++++---
 .../cubicchunks/network/CCNetworkHandler.java |  2 +
 .../cubicchunks/network/MiscStreamCodecs.java |  2 +
 .../server/level/CloTrackingView.java         |  1 +
 .../cubicchunks/server/level/CubeLevel.java   |  2 +
 .../level/progress/CloProgressListener.java   |  4 +-
 .../world/level/CubicLevelReader.java         |  4 +-
 .../chunk/status/CCChunkStatusTasks.java      | 15 ++----
 .../world/level/cube/CubeAccess.java          |  4 ++
 .../world/level/cube/LevelCube.java           | 16 +++---
 .../world/level/cube/ProtoCube.java           |  4 +-
 .../level/cube/status/CubeStatusTasks.java    | 19 +++----
 .../world/level/cube/status/CubeStep.java     | 16 +++---
 .../level/IntegrationTestCubicChunkMap.java   |  9 ++--
 .../level/IntegrationTestServerCubeCache.java |  3 +-
 .../level/MinecraftServerTestAccess.java      |  2 +-
 .../server/level/TestCubicChunkTracker.java   |  5 +-
 .../level/TestCubicDistanceManager.java       |  2 +-
 .../test/world/level/TestBlockCollisions.java |  3 +-
 .../test/world/level/cube/TestCubeAccess.java |  5 +-
 .../cubicchunks/testutils/Misc.java           |  2 +
 45 files changed, 205 insertions(+), 140 deletions(-)

diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
index 2c39baaf..c039cddd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
@@ -1,6 +1,6 @@
 package io.github.opencubicchunks.cubicchunks.client.multiplayer;
 
-import static io.github.notstirred.dasm.api.annotations.transform.Visibility.*;
+import static io.github.notstirred.dasm.api.annotations.transform.Visibility.PUBLIC;
 
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReferenceArray;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
index 39f93754..9d42540f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
@@ -19,6 +19,10 @@
  * in the center of the 3x3x3.
  */
 public class RenderCubeRegion extends RenderChunkRegion {
+    private static final int DIAMETER = 3;
+    private static final int DIAMETER_SQUARED = DIAMETER * DIAMETER;
+    public static final int CUBE_COUNT = DIAMETER * DIAMETER * DIAMETER;
+
     private final int minCubeX;
     private final int minCubeY;
     private final int minCubeZ;
@@ -54,6 +58,6 @@ private RenderCube getCube(int cubeX, int cubeY, int cubeZ) {
     }
 
     public static int index(int minCubeX, int minCubeY, int minCubeZ, int cubeX, int cubeY, int cubeZ) {
-        return cubeX - minCubeX + (cubeZ - minCubeZ) * 3 + (cubeY - minCubeY) * 9;
+        return cubeX - minCubeX + (cubeZ - minCubeZ) * DIAMETER + (cubeY - minCubeY) * DIAMETER_SQUARED;
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java b/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
index 62dde8e5..6d9fd141 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/config/CommonConfig.java
@@ -15,6 +15,7 @@ public class CommonConfig extends BaseConfig {
 
     private static final String KEY_GENERAL = "general";
     private static final String KEY_VERTICAL_VIEW_DISTANCE = KEY_GENERAL + ".verticalViewDistance";
+    private static final int DEFAULT_VERTICAL_VIEW_DISTANCE = 8;
     private static final String KEY_GENERATE_NEW_WORLDS_AS_CC = KEY_GENERAL + ".generateNewWorldsAsCC";
 
     private final CommentedConfig config;
@@ -26,7 +27,7 @@ private CommonConfig(CommentedConfig config) {
     private static CommentedConfig createDefaultConfig() {
         Config.setInsertionOrderPreserved(true);
         var config = CommentedConfig.inMemory();
-        config.set(KEY_VERTICAL_VIEW_DISTANCE, 8);
+        config.set(KEY_VERTICAL_VIEW_DISTANCE, DEFAULT_VERTICAL_VIEW_DISTANCE);
         // TODO more detailed config comment?
         config.setComment(KEY_VERTICAL_VIEW_DISTANCE, """
                  The vertical view distance for players in Cubic Chunks dimensions (similar to vanilla render distance for the horizontal axes).\
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
index 4e5a9377..419ecf79 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
@@ -36,8 +36,9 @@ private ServerConfig(CommentedConfig config) {
     }
 
     private static WorldStyle worldStyleFromString(String string) {
-        if (string.equals("VANILLA"))
+        if (string.equals("VANILLA")) {
             return WorldStyle.CHUNK;
+        }
         return WorldStyle.valueOf(string);
     }
 
@@ -78,32 +79,33 @@ private static File getConfigPath(Path worldFolder) {
 
     private static void createConfig(Path worldFolder) {
         File configPath = getConfigPath(worldFolder);
-        if (configPath.exists())
+        if (configPath.exists()) {
             return;
+        }
         configPath.getParentFile().mkdirs();
         write(configPath, createDefaultConfig());
     }
-    /*
-     * @Nullable public static ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
-     * File configPath = getConfigPath(((LevelStorageAccessAccess) levelStorageAccess).getLevelPath());
-     * if (configPath.exists()) {
-     * var config = createDefaultConfig();
-     * read(configPath, config);
-     * var serverConfig = new ServerConfig(config);
-     * // Write the config again in case any keys were missing or invalid
-     * write(configPath, config);
-     * return serverConfig;
-     * }
-     * return null;
-     * }
-     * public static void generateConfigIfNecessary(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
-     * if (CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
-     * CubicChunks.LOGGER.info("New worlds are configured to generate as CC; creating CC config file");
-     * var rootFolderPath = ((LevelStorageAccessAccess) levelStorageAccess).getLevelPath();
-     * ServerConfig.createConfig(rootFolderPath);
-     * } else {
-     * CubicChunks.LOGGER.info("New worlds are configured to NOT generate as CC; no Cubic Chunks data will be created");
-     * }
-     * }
-     */
+
+//    @Nullable public static ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
+//        File configPath = getConfigPath(((LevelStorageAccessAccess) levelStorageAccess).getLevelPath());
+//        if (configPath.exists()) {
+//            var config = createDefaultConfig();
+//            read(configPath, config);
+//            var serverConfig = new ServerConfig(config);
+//            // Write the config again in case any keys were missing or invalid
+//            write(configPath, config);
+//            return serverConfig;
+//        }
+//        return null;
+//    }
+//
+//    public static void generateConfigIfNecessary(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
+//        if (CubicChunks.config().shouldGenerateNewWorldsAsCC()) {
+//            CubicChunks.LOGGER.info("New worlds are configured to generate as CC; creating CC config file");
+//            var rootFolderPath = ((LevelStorageAccessAccess) levelStorageAccess).getLevelPath();
+//            ServerConfig.createConfig(rootFolderPath);
+//        } else {
+//            CubicChunks.LOGGER.info("New worlds are configured to NOT generate as CC; no Cubic Chunks data will be created");
+//        }
+//    }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
index 22829eca..9dfd18ae 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
@@ -57,6 +57,7 @@ public class ASMConfigPlugin implements IMixinConfigPlugin {
 
     private final Logger logger = LogManager.getLogger("dasm");
 
+    @SuppressWarnings("checkstyle:EmptyCatchBlock") // <-- TODO stirred's problem not mine :)
     public ASMConfigPlugin() {
         boolean developmentEnvironment = false;
         try {
@@ -177,8 +178,9 @@ public ASMConfigPlugin() {
             throw new RuntimeException(e);
         }
         // If no DASM transformation happened to this class, we can skip removing the prefixed methods
-        if (!(wasTransformed | dasmTransformedInPreApply.get(mixinClassName + "|" + targetClassName)))
+        if (!(wasTransformed | dasmTransformedInPreApply.get(mixinClassName + "|" + targetClassName))) {
             return;
+        }
 
         // Find all DASM-added method nodes and their corresponding MixinMerged method nodes
         record PrefixMethodPair(MethodNode dasmAddedMethod, MethodNode mixinAddedMethod) {}
@@ -248,8 +250,13 @@ private boolean transformClass(String targetClassName, ClassNode targetClass, St
             throws DasmException {
         Either<ClassTransform, Collection<MethodTransform>> target = null;
         switch (stage) {
-            case PRE_APPLY -> target = preApplyTargets.get(mixinClassName + "|" + targetClassName);
-            case POST_APPLY -> target = postApplyTargets.get(mixinClassName + "|" + targetClassName);
+            case PRE_APPLY -> {
+                target = preApplyTargets.get(mixinClassName + "|" + targetClassName);
+            }
+            case POST_APPLY -> {
+                target = postApplyTargets.get(mixinClassName + "|" + targetClassName);
+            }
+            default -> throw new IllegalStateException("Unknown enum variant: " + stage);
         }
         if (target == null) {
             return false;
@@ -294,9 +301,12 @@ private void handleError(List<Notification> notifications) {
                 case ERROR:
                     logger.error(notification.message);
                     break;
+                default:
+                    throw new IllegalStateException("Unknown enum variant: " + notification.kind);
             }
         }
-        if (notifications.stream().anyMatch(n -> n.kind == Notification.Kind.ERROR))
+        if (notifications.stream().anyMatch(n -> n.kind == Notification.Kind.ERROR)) {
             throw Util.pauseInIde(new RuntimeException("DASM Failure, please see log output"));
+        }
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
index dc977f60..36ba1ff7 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/multiplayer/MixinClientChunkCache.java
@@ -98,9 +98,10 @@ private static boolean cc_isValidCube(@Nullable LevelCube chunk, int x, int y, i
     }
 
     @Override public void cc_replaceBiomes(int x, int y, int z, FriendlyByteBuf buffer) {
-        if (true)
-            throw new UnsupportedOperationException("don't remove this exception until packet integration tests are added for this method"); // TODO
-                                                                                                                                             // (P2)
+        if (true) {
+            // TODO (P2)
+            throw new UnsupportedOperationException("don't remove this exception until packet integration tests are added for this method");
+        }
         if (!this.cc_cubeStorage.inRange(x, y, z)) {
             LOGGER.warn("Ignoring cube since it's not in the view range: {}, {}, {}", x, y, z);
         } else {
@@ -179,6 +180,7 @@ private static boolean cc_isValidCube(@Nullable LevelCube chunk, int x, int y, i
         throw new IllegalStateException("mixin failed to apply");
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber") // <-- TODO it's unclear what the 3 represents in vanilla?
     private static int cc_calculateChunkViewDistance(int cubeViewDistance) {
         int cubeStorageRange = calculateStorageRange(cubeViewDistance);
         // TODO this radius might be larger than it needs to be? coordinate maths is difficult
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
index 35418ca6..9586569c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
@@ -54,8 +54,9 @@ private void cc_addNeighbors(SectionOcclusionGraph.GraphEvents graphEvents, Cube
         for (int dx = -1; dx <= 1; dx++) {
             for (int dz = -1; dz <= 1; dz++) {
                 for (int dy = -1; dy <= 1; dy++) {
-                    if (dx == 0 && dy == 0 && dz == 0)
+                    if (dx == 0 && dy == 0 && dz == 0) {
                         continue;
+                    }
                     access.cc_chunksWhichReceivedNeighbors().add(CubePos.asLong(cubeX + dx, cubeY + dy, cubeZ + dz));
                 }
             }
@@ -75,15 +76,17 @@ private void cc_addNeighbors(SectionOcclusionGraph.GraphEvents graphEvents, Cube
 
     @WrapOperation(method = "runUpdates", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;sectionToChunk(J)J"))
     private long cc_onRunUpdates_sectionToChunk(long sectionPosLong, Operation<Long> original) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return original.call(sectionPosLong);
+        }
         return CubePos.asLong(SectionPos.x(sectionPosLong), SectionPos.y(sectionPosLong), SectionPos.z(sectionPosLong));
     }
 
     @Inject(method = "isInViewDistance", at = @At("HEAD"), cancellable = true)
     private void cc_onIsInViewDistance(long originSectionPosLong, long sectionPosLong, CallbackInfoReturnable<Boolean> cir) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return;
+        }
         int originCubeX = Coords.blockToCube(SectionPos.x(originSectionPosLong));
         int originCubeY = Coords.blockToCube(SectionPos.y(originSectionPosLong));
         int originCubeZ = Coords.blockToCube(SectionPos.z(originSectionPosLong));
@@ -99,8 +102,9 @@ private void cc_onGetRelativeFrom(
             long sectionPosLong, SectionRenderDispatcher.RenderSection section, Direction direction,
             CallbackInfoReturnable<SectionRenderDispatcher.RenderSection> cir
     ) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return;
+        }
         // Same as vanilla logic but we don't manually check Y coordinates since that's handled by isInViewDistance now
         long sectionPosLong2 = section.getNeighborSectionNode(direction);
         if (!this.isInViewDistance(sectionPosLong, sectionPosLong2)) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
index 05de0506..1fd0bef2 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinViewArea.java
@@ -32,8 +32,9 @@ public abstract class MixinViewArea {
     // This could be multiple more specific injects, but overwriting the method is probably cleaner
     @Inject(method = "setViewDistance", at = @At("HEAD"), cancellable = true)
     private void cc_onSetViewDistance(int renderDistanceChunks, CallbackInfo ci) {
-        if (!((CanBeCubic) level).cc_isCubic())
+        if (!((CanBeCubic) level).cc_isCubic()) {
             return;
+        }
         ci.cancel();
         int i = renderDistanceChunks * 2 + 1;
         this.sectionGridSizeX = i;
@@ -44,8 +45,9 @@ private void cc_onSetViewDistance(int renderDistanceChunks, CallbackInfo ci) {
 
     @WrapOperation(method = "createSections", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getMinSectionY()I"))
     private int cc_onCreateSections_getMinY(Level instance, Operation<Integer> original) {
-        if (!((CanBeCubic) level).cc_isCubic())
+        if (!((CanBeCubic) level).cc_isCubic()) {
             return original.call(instance);
+        }
         return 0; // I don't really understand the logic here, but returning 0 makes the Y axis behave equivalently to X and Z, which *should* be what
                   // we want
     }
@@ -53,8 +55,9 @@ private int cc_onCreateSections_getMinY(Level instance, Operation<Integer> origi
     // TODO can we do this without fully overwriting the method?
     @Inject(method = "getRenderSection(III)Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;", at = @At("HEAD"), cancellable = true)
     private void cc_onGetRenderSection(int sectionX, int sectionY, int sectionZ, CallbackInfoReturnable<SectionRenderDispatcher.RenderSection> cir) {
-        if (!((CanBeCubic) level).cc_isCubic())
+        if (!((CanBeCubic) level).cc_isCubic()) {
             return;
+        }
         if (!this.cc_containsSection(sectionX, sectionY, sectionZ)) {
             cir.setReturnValue(null);
             return;
@@ -69,8 +72,9 @@ private void cc_onGetRenderSection(int sectionX, int sectionY, int sectionZ, Cal
     // I don't really understand the coordinate maths here, but we replicate it for the Y axis
     @Inject(method = "repositionCamera", at = @At("HEAD"), cancellable = true)
     private void cc_onRepositionCamera(SectionPos newSectionPos, CallbackInfo ci) {
-        if (!((CanBeCubic) level).cc_isCubic())
+        if (!((CanBeCubic) level).cc_isCubic()) {
             return;
+        }
         ci.cancel();
         for (int sectionX = 0; sectionX < this.sectionGridSizeX; sectionX++) {
             int i1 = newSectionPos.x() - this.viewDistance;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
index 14123815..d9936cc7 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
@@ -49,7 +49,7 @@ public abstract class MixinRenderRegionCache implements CubicRenderRegionCache {
         int cubeEndX = centerCubeX + 1;
         int cubeEndY = centerCubeY + 1;
         int cubeEndZ = centerCubeZ + 1;
-        RenderCube[] renderCubes = new RenderCube[27];
+        RenderCube[] renderCubes = new RenderCube[RenderCubeRegion.CUBE_COUNT];
 
         for (int cubeX = cubeStartX; cubeX <= cubeEndX; ++cubeX) {
             for (int cubeY = cubeStartY; cubeY <= cubeEndY; ++cubeY) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
index 7e5defa1..60e348ea 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
@@ -53,13 +53,15 @@ private void cc_onDoesChunkExistAt(long sectionPosLong, CallbackInfoReturnable<B
      */
     @Inject(method = "hasAllNeighbors", cancellable = true, at = @At(value = "INVOKE", ordinal = 0, target = "Lnet/minecraft/client/renderer/chunk/SectionRenderDispatcher$RenderSection;doesChunkExistAt(J)Z"))
     private void cc_onHasAllNeighbors(CallbackInfoReturnable<Boolean> cir) {
-        if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic())
+        if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic()) {
             return;
+        }
         for (int dx = -1; dx <= 1; dx++) {
             for (int dy = -1; dy <= 1; dy++) {
                 for (int dz = -1; dz <= 1; dz++) {
-                    if (dx == 0 && dy == 0 && dz == 0)
+                    if (dx == 0 && dy == 0 && dz == 0) {
                         continue;
+                    }
                     if (!this.doesChunkExistAt(SectionPos.offset(this.sectionNode, dx, dy, dz))) {
                         cir.setReturnValue(false);
                         return;
@@ -78,8 +80,9 @@ private void cc_onHasAllNeighbors(CallbackInfoReturnable<Boolean> cir) {
     @Nullable private RenderChunkRegion cc_onCreateCompileTask_createRegion(
             RenderRegionCache instance, Level level, SectionPos sectionPos, boolean bool, Operation<RenderChunkRegion> original
     ) {
-        if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic())
+        if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic()) {
             return original.call(instance, level, sectionPos, bool);
+        }
         return ((CubicRenderRegionCache) instance).cc_createRegion(level, sectionPos, bool);
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
index 8918b783..e6543157 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
@@ -165,6 +165,7 @@ private void cc_onReleaseClaim(CallbackInfo ci) {
     /**
      * When loading a cube, check cube dependencies as well when determining if generation is required
      */
+    @SuppressWarnings("checkstyle:CyclomaticComplexity") // <-- copies structure of vanilla method
     @Inject(method = "canLoadWithoutGeneration", at = @At("HEAD"), cancellable = true)
     private void cc_onCanLoadWithoutGeneration(CallbackInfoReturnable<Boolean> cir) {
         if (cc_cubePos == null) {
@@ -216,15 +217,16 @@ private void cc_onCanLoadWithoutGeneration(CallbackInfoReturnable<Boolean> cir)
 
     @Inject(method = "getCenter", at = @At("HEAD"), cancellable = true)
     private void cc_onGetCenter(CallbackInfoReturnable<GenerationChunkHolder> cir) {
-        if (cc_cubePos != null)
+        if (cc_cubePos != null) {
             cir.setReturnValue(this.cc_cubeCache.get(this.cc_cubePos.getX(), this.cc_cubePos.getY(), this.cc_cubePos.getZ()));
+        }
     }
 
     /**
      * Cubic equivalent of {@code scheduleLayer}; schedules both cubes and chunks at given statuses (Chunk status will be higher to preserve load
      * order invariants)
      */
-    // TODO this could be two methods I guess? does it matter?
+    @SuppressWarnings("checkstyle:CyclomaticComplexity") // <-- TODO this could be two methods
     private void cc_scheduleLayer(@Nullable ChunkStatus chunkStatus, @Nullable ChunkStatus cubeStatus, boolean needsGeneration) {
         try (Zone zone = Profiler.get().zone("scheduleLayer")) {
             zone.addText(() -> String.format("Chunk: %s, Cube: %s", chunkStatus == null ? "null" : chunkStatus.getName(),
@@ -264,8 +266,9 @@ private void cc_scheduleLayer(@Nullable ChunkStatus chunkStatus, @Nullable Chunk
 
     @Inject(method = "scheduleLayer", at = @At("HEAD"))
     private void cc_onScheduleLayer(ChunkStatus status, boolean needsGeneration, CallbackInfo ci) {
-        if (cc_cubePos == null)
+        if (cc_cubePos == null) {
             return;
+        }
         throw new IllegalStateException("shouldn't call vanilla scheduleLayer for cube generation task");
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
index a28aa6b4..fbe31d95 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
@@ -195,6 +195,7 @@ private native CompletableFuture<ChunkResult<List<CloAccess>>> cc_getChunkRangeF
     /**
      * Cubes require different adjacency logic compared to Chunks
      */
+    @SuppressWarnings("checkstyle:CyclomaticComplexity") // <-- TODO this method is just a bit of a disaster
     @Dynamic
     @Inject(method = "cc_dasm$cc_getChunkRangeFuture", at = @At("HEAD"), cancellable = true)
     private void cc_onGetChunkRangeFuture(
@@ -204,8 +205,9 @@ private void cc_onGetChunkRangeFuture(
         // Note that statusByRadius sometimes isn't actually correct for cubes beyond the first few steps, but getChunkRangeFuture is only called with
         // parameters for which it's correct within the radius
         CloPos pos = ((CloHolder) cloHolder).cc_getCloPos();
-        if (!pos.isCube())
+        if (!pos.isCube()) {
             return;
+        }
         // The vanilla method has an early exit for radius=0 here; this is not valid for cubes because even if radius=0 we still depend on chunks that
         // neighbor the cube
         int cubeDiameter = radius * 2 + 1;
@@ -590,5 +592,5 @@ public void cc_onFullChunkStatusChange(CubePos cubePos, FullChunkStatus fullChun
 
     @AddTransformToSets(ChunkToCloSet.ChunkMap_redirects.class)
     @TransformFromMethod(@MethodSig("waitForLightBeforeSending(Lnet/minecraft/world/level/ChunkPos;I)V"))
-    public native void cc_waitForLightBeforeSending(CloPos cloPos, int p_301130_);
+    public native void cc_waitForLightBeforeSending(CloPos cloPos, int radius);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
index e828c1b9..d897c9d0 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkTracker.java
@@ -55,8 +55,9 @@ protected MixinChunkTracker() {
 
     @Redirect(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/world/level/ChunkPos;INVALID_CHUNK_POS:J"))
     private long cc_sentinelValue() {
-        if (cc_isCubic)
+        if (cc_isCubic) {
             return CloPos.INVALID_CLO_POS;
+        }
         return ChunkPos.INVALID_CHUNK_POS;
     }
 
@@ -64,8 +65,9 @@ private long cc_sentinelValue() {
     private int cc_dontIncrementLevelOnCubeChunkEdge(
             int constant, @Local(ordinal = 0, argsOnly = true) long startPos, @Local(ordinal = 1, argsOnly = true) long endPos
     ) {
-        if (cc_isCubic && CloPos.isCube(startPos) && CloPos.isChunk(endPos))
+        if (cc_isCubic && CloPos.isCube(startPos) && CloPos.isChunk(endPos)) {
             return 0;
+        }
         return constant;
     }
 
@@ -88,10 +90,12 @@ private void cc_onCheckNeighborsAfterUpdate(long pos, int level, boolean isDecre
      * if we did do that, then a single column could potentially load an infinite amount of cubes. So only
      * cubes can propagate to a column, or cubes propagating to cubes.
      */
+    @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:JavaNCSS" }) // <-- TODO can this be improved?
     @Inject(method = "getComputedLevel", at = @At("HEAD"), cancellable = true)
     private void cc_onGetComputedLevel(long pos, long excludedSourcePos, int level, CallbackInfoReturnable<Integer> cir) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return;
+        }
         if (CloPos.isChunk(pos)) {
             int out = level;
 
@@ -195,7 +199,8 @@ protected void cc_onSetLevel(long pos, int level) {
                 }
             } else {
                 if (cubes == null) {
-                    cc_existingCubesForCubeColumns.put(key, cubes = new IntOpenHashSet());
+                    cubes = new IntOpenHashSet();
+                    cc_existingCubesForCubeColumns.put(key, cubes);
                 }
                 cubes.add(CloPos.extractY(pos));
             }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
index ccee35f9..5640f485 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinDistanceManager.java
@@ -57,8 +57,9 @@ public abstract class MixinDistanceManager implements MarkableAsCubic {
      */
     @WrapWithCondition(method = "addPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/TicketStorage;addTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     private boolean cc_replaceTicketTypeOnAddPlayer(TicketStorage instance, Ticket ticket, ChunkPos chunkPos, SectionPos sectionPos) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return true;
+        }
         CloPos cloPos = CloPos.section(sectionPos);
         ((CubicTicketStorage) instance).cc_addTicket(ticket, cloPos);
         return false;
@@ -70,8 +71,9 @@ private boolean cc_replaceTicketTypeOnAddPlayer(TicketStorage instance, Ticket t
      */
     @WrapWithCondition(method = "removePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/TicketStorage;removeTicket(Lnet/minecraft/server/level/Ticket;Lnet/minecraft/world/level/ChunkPos;)V"))
     private boolean cc_replaceTicketTypeOnRemovePlayer(TicketStorage instance, Ticket ticket, ChunkPos chunkPos, SectionPos sectionPos) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return true;
+        }
         CloPos cloPos = CloPos.section(sectionPos);
         ((CubicTicketStorage) instance).cc_removeTicket(ticket, cloPos);
         return false;
@@ -82,8 +84,9 @@ private boolean cc_replaceTicketTypeOnRemovePlayer(TicketStorage instance, Ticke
      */
     @WrapOperation(method = "addPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;toLong()J"))
     private long cc_replaceTicketTypeOnAddPlayer(ChunkPos chunkPos, Operation<Long> original, SectionPos sectionPos) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return original.call(chunkPos);
+        }
         return CloPos.section(sectionPos).toLong();
     }
 
@@ -92,8 +95,9 @@ private long cc_replaceTicketTypeOnAddPlayer(ChunkPos chunkPos, Operation<Long>
      */
     @WrapOperation(method = "removePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/ChunkPos;toLong()J"))
     private long cc_replaceTicketTypeOnRemovePlayer(ChunkPos chunkPos, Operation<Long> original, SectionPos sectionPos) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return original.call(chunkPos);
+        }
         return CloPos.section(sectionPos).toLong();
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
index 3105dd1b..57a39fbd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinPlayerTicketTracker.java
@@ -27,8 +27,9 @@ public abstract class MixinPlayerTicketTracker extends MixinFixedPlayerDistanceC
     private boolean cc_onRunAllUpdates(
             ThrottlingChunkTaskDispatcher instance, ChunkPos chunkPos, IntSupplier intSupplier, int i, IntConsumer intConsumer
     ) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return true;
+        }
         ((CloTaskDispatcher) ((DistanceManagerAccess) this$0).cc_ticketDispatcher()).cc_onLevelChange(CloPos.fromLong(chunkPos.toLong()), intSupplier,
                 i, intConsumer);
         return false;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
index 70c4d6ef..2dc9e93d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
@@ -105,7 +105,7 @@ public abstract class MixinServerChunkCache extends MixinChunkSource implements
 
     @Shadow @Nullable private NaturalSpawner.SpawnState lastSpawnState;
 
-    @Shadow protected abstract void getFullChunk(long p_8371_, Consumer<LevelChunk> p_8372_);
+    @Shadow protected abstract void getFullChunk(long chunkPos, Consumer<LevelChunk> fullChunkGetter);
 
     @Shadow @Final private Set<ChunkHolder> chunkHoldersToBroadcast;
 
@@ -191,7 +191,7 @@ private void cc_onClearCache(CallbackInfo ci) {
         } else {
             completablefuture = CompletableFuture
                     .supplyAsync(() -> this.cc_getCubeFutureMainThread(pX, chunkY, pZ, pChunkStatus, pLoad), this.mainThreadProcessor)
-                    .thenCompose(p_8413_ -> p_8413_);
+                    .thenCompose(future -> future);
         }
 
         return completablefuture;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
index ec1fbb8d..88860352 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerLevel.java
@@ -85,8 +85,7 @@ private void cc_onSetDefaultSpawnPos_addicketWithRadius(
     public void cc_tickClo(LevelClo levelClo, int randomTickSpeed) {
         if (levelClo instanceof LevelCube levelCube) {
             cc_tickCube(levelCube, randomTickSpeed);
-        }
-        {
+        } else {
             // TODO (P2) chunk ticking for anything that still needs to happen on chunks (probably just the forge event for mods?)
         }
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
index e6def584..2a22fb96 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/entity/MixinEntity.java
@@ -72,8 +72,9 @@ private void cc_onSetPosRaw(double x, double y, double z, CallbackInfo ci) {
     // In cubic levels, check for unloaded cubes instead of chunks
     @Inject(method = "touchingUnloadedChunk", at = @At("HEAD"), cancellable = true)
     private void cc_onTouchingUnloadedChunk(CallbackInfoReturnable<Boolean> cir) {
-        if (!((CanBeCubic) this.level).cc_isCubic())
+        if (!((CanBeCubic) this.level).cc_isCubic()) {
             return;
+        }
         AABB aabb = this.getBoundingBox().inflate(1.0);
         int minX = Mth.floor(aabb.minX);
         int maxX = Mth.ceil(aabb.maxX);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
index 22ea5605..ea704db3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
@@ -36,8 +36,9 @@ private void cc_onInit(
             CallbackInfo ci
     ) {
         // TODO probably don't cast without an instanceof check in production - for dev it's fine since it will tell us we're missing something
-        if (((CanBeCubic) collisionGetter).cc_isCubic())
+        if (((CanBeCubic) collisionGetter).cc_isCubic()) {
             cc_isCubic = true;
+        }
     }
 
     @Nullable private BlockGetter cc_getCube(int x, int y, int z) {
@@ -59,8 +60,9 @@ private void cc_onInit(
     @Nullable private BlockGetter cc_onComputeNext_getChunk(
             BlockCollisions instance, int x, int z, Operation<BlockGetter> original, @Local(ordinal = 1) int y
     ) {
-        if (!cc_isCubic)
+        if (!cc_isCubic) {
             return original.call(instance, x, z);
+        }
         return cc_getCube(x, y, z);
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
index 196281b6..48876716 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
@@ -45,7 +45,7 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(Level.class)
 public abstract class MixinLevel implements CubicLevel, MarkableAsCubic, LevelAccessor {
-    @Shadow @Nullable public abstract ChunkAccess getChunk(int p_46502_, int p_46503_, ChunkStatus p_46504_, boolean p_46505_);
+    @Shadow @Nullable public abstract ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus requestedStatus, boolean forceLoad);
 
     @Shadow public abstract long getDayTime();
 
@@ -114,11 +114,11 @@ private BlockState cc_replaceLevelChunkInSetBlockState(
 
     @WrapWithCondition(method = "setBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;II)Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
     private boolean cc_replaceLevelChunkInMarkAndNotifyBlock(
-            Level level, BlockPos blockPos, LevelChunk levelChunk, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46607_,
+            Level level, BlockPos blockPos, LevelChunk levelChunk, BlockState blockStatePrev, BlockState blockStateNew, int flags, int recursionLeft,
             @Share("levelCube") LocalRef<LevelCube> levelCubeLocalRef
     ) {
         if (cc_isCubic) {
-            this.cc_markAndNotifyBlock(blockPos, levelCubeLocalRef.get(), blockStatePrev, blockStateNew, flags, p_46607_);
+            this.cc_markAndNotifyBlock(blockPos, levelCubeLocalRef.get(), blockStatePrev, blockStateNew, flags, recursionLeft);
             return false;
         }
         return true;
@@ -128,7 +128,7 @@ private boolean cc_replaceLevelChunkInMarkAndNotifyBlock(
     @TransformFromMethod(useRedirectSets = {
         ChunkToCubeSet.class }, value = @MethodSig("markAndNotifyBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/block/state/BlockState;II)V"))
     public native void cc_markAndNotifyBlock(
-            BlockPos blockPos, @Nullable LevelCube levelCube, BlockState blockStatePrev, BlockState blockStateNew, int flags, int p_46608_
+            BlockPos blockPos, @Nullable LevelCube levelCube, BlockState blockStatePrev, BlockState blockStateNew, int flags, int recursionLeft
     );
 
     // getBlockState
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
index 50f664ff..71c9ccec 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/lighting/MixinLevelLightEngine.java
@@ -3,6 +3,7 @@
 import io.github.opencubicchunks.cubicchunks.CanBeCubic;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelHeightAccessor;
+import net.minecraft.world.level.block.LightBlock;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -19,13 +20,15 @@ public class MixinLevelLightEngine {
 
     @Inject(method = "lightOnInColumn", at = @At("HEAD"), cancellable = true)
     private void cc_onLightOnInColumn(long columnPos, CallbackInfoReturnable<Boolean> cir) {
-        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic())
+        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic()) {
             cir.setReturnValue(true);
+        }
     }
 
     @Inject(method = "getRawBrightness", at = @At("HEAD"), cancellable = true)
     private void cc_onGetRawBrightness(BlockPos blockPos, int amount, CallbackInfoReturnable<Integer> cir) {
-        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic())
-            cir.setReturnValue(15);
+        if (((CanBeCubic) this.levelHeightAccessor).cc_isCubic()) {
+            cir.setReturnValue(LightBlock.MAX_LEVEL);
+        }
     }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
index 2d481484..7c386621 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCCommonHooks.java
@@ -14,6 +14,8 @@
 
 @Dasm(GlobalSet.class)
 public class CCCommonHooks {
+    private CCCommonHooks() {}
+
     @AddMethodToSets(containers = ChunkToCubeSet.CommonHooks_to_CCCommonHooks_redirects.class, method = @MethodSig("onChunkUnload(Lnet/minecraft/world/entity/ai/village/poi/PoiManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V"))
     public static void onCubeUnload(PoiManager poiManager, CubeAccess cubeAccess) {
         // TODO (P2) save/load: once PoiManager cubic methods are implemented, this method can be a dasm copy
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
index 5cecf298..eff053c3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/CCEventHooks.java
@@ -16,6 +16,8 @@
 
 @Dasm(ForgeSet.class)
 public class CCEventHooks {
+    private CCEventHooks() {}
+
     // TODO onCreateWorldSpawn?
     // TODO onTrySpawnPortal?
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/EventConstructorDelegates.java b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/EventConstructorDelegates.java
index 6346c645..aa19e9c8 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/EventConstructorDelegates.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/movetoforgesourcesetlater/EventConstructorDelegates.java
@@ -8,6 +8,8 @@
 
 // In DASM-copied code we redirect forge event construction to factory methods on this class, allowing for easier control (e.g. not firing events for cubic equivalents of vanilla things)
 public class EventConstructorDelegates {
+    private EventConstructorDelegates() {}
+
     public static Event create_ChunkEvent$Load(LevelClo levelClo, boolean newChunk) {
         if (levelClo instanceof LevelChunk chunk) {
             return new ChunkEvent.Load(chunk, newChunk);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
index fb3961ec..5365c030 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCClientboundLevelCubePacketData.java
@@ -12,6 +12,8 @@
 
 // TODO block entities - see ClientboundLevelChunkPacketData
 public class CCClientboundLevelCubePacketData {
+    private static final int TWO_MEGABYTES = 2097152;
+
     private final byte[] buffer;
 
     public static final StreamCodec<FriendlyByteBuf, CCClientboundLevelCubePacketData> STREAM_CODEC = new StreamCodec<>() {
@@ -29,19 +31,19 @@ public CCClientboundLevelCubePacketData(LevelCube cube) {
         extractChunkData(new FriendlyByteBuf(this.getWriteBuffer()), cube);
     }
 
-    public CCClientboundLevelCubePacketData(final FriendlyByteBuf buffer) {
-        int i = buffer.readVarInt();
-        if (i > 2097152) {
+    public CCClientboundLevelCubePacketData(final FriendlyByteBuf byteBuf) {
+        int i = byteBuf.readVarInt();
+        if (i > TWO_MEGABYTES) {
             throw new RuntimeException("Cube Packet trying to allocate too much memory on read.");
         } else {
             this.buffer = new byte[i];
-            buffer.readBytes(this.buffer);
+            byteBuf.readBytes(this.buffer);
         }
     }
 
-    public void write(final FriendlyByteBuf buffer) {
-        buffer.writeVarInt(this.buffer.length);
-        buffer.writeBytes(this.buffer);
+    public void write(final FriendlyByteBuf byteBuf) {
+        byteBuf.writeVarInt(this.buffer.length);
+        byteBuf.writeBytes(this.buffer);
     }
 
     // TODO could maybe dasm copy these from ClientboundLevelChunkPacketData?
@@ -73,8 +75,9 @@ public FriendlyByteBuf getReadBuffer() {
 
     // Implement .equals for unit testing
     @Override public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass())
+        if (o == null || getClass() != o.getClass()) {
             return false;
+        }
         CCClientboundLevelCubePacketData that = (CCClientboundLevelCubePacketData) o;
         return Objects.deepEquals(buffer, that.buffer);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
index 1a82787c..0d3e10e5 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/CCNetworkHandler.java
@@ -8,6 +8,8 @@
 
 @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
 public class CCNetworkHandler {
+    private CCNetworkHandler() {}
+
     @SubscribeEvent
     public static void register(final RegisterPayloadHandlersEvent event) {
         // Sets the current network version
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/network/MiscStreamCodecs.java b/src/main/java/io/github/opencubicchunks/cubicchunks/network/MiscStreamCodecs.java
index 1c6f29b1..9b6a296b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/network/MiscStreamCodecs.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/network/MiscStreamCodecs.java
@@ -6,6 +6,8 @@
 import net.minecraft.network.codec.StreamCodec;
 
 public class MiscStreamCodecs {
+    private MiscStreamCodecs() {}
+
     // TODO where should these go? can't go on CloPos/CubePos because they're in core
     public static final StreamCodec<ByteBuf, CloPos> CLO_POS_STREAM_CODEC = new StreamCodec<>() {
         public CloPos decode(ByteBuf buffer) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
index cba3e02c..9faa865f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CloTrackingView.java
@@ -37,6 +37,7 @@ static CloTrackingView cc_of(CloPos center, int viewDistanceCubes) {
         return new CloTrackingView.Positioned(center, viewDistanceCubes);
     }
 
+    @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:JavaNCSS" }) // <-- copies structure of vanilla method
     @AddMethodToSets(containers = ChunkToCloSet.ChunkTrackingView_to_CloTrackingView_redirects.class, method = @MethodSig("difference(Lnet/minecraft/server/level/ChunkTrackingView;Lnet/minecraft/server/level/ChunkTrackingView;Ljava/util/function/Consumer;Ljava/util/function/Consumer;)V"))
     static void cc_difference(
             CloTrackingView oldCloTrackingView, CloTrackingView newCloTrackingView, Consumer<CloPos> chunkDropper, Consumer<CloPos> chunkMarker
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
index e6420bcf..696d0e8e 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
@@ -21,6 +21,8 @@
  */
 @Dasm(GlobalSet.class)
 public class CubeLevel {
+    private CubeLevel() {}
+
     private static final int FULL_CHUNK_LEVEL = 33;
     private static final CubeStep FULL_CUBE_STEP = CubePyramid.CC_GENERATION_PYRAMID_CUBES.getStepTo(ChunkStatus.FULL);
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkLevel_to_CubeLevel_redirects.class, field = @FieldSig(type = @Ref(int.class), name = "RADIUS_AROUND_FULL_CHUNK"))
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/progress/CloProgressListener.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/progress/CloProgressListener.java
index 7116bd24..8856ea1e 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/progress/CloProgressListener.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/progress/CloProgressListener.java
@@ -9,12 +9,12 @@
 public interface CloProgressListener {
     void cc_updateSpawnPos(CloPos center);
 
-    void cc_onStatusChange(CloPos chunkPosition, @Nullable ChunkStatus newStatus);
-
     default void cc_updateSpawnPos(CubePos center) {
         cc_updateSpawnPos(CloPos.cube(center));
     }
 
+    void cc_onStatusChange(CloPos chunkPosition, @Nullable ChunkStatus newStatus);
+
     default void cc_onStatusChange(CubePos chunkPosition, @Nullable ChunkStatus newStatus) {
         cc_onStatusChange(CloPos.cube(chunkPosition), newStatus);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
index 9354ce45..b1641cab 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
@@ -9,10 +9,10 @@
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 public interface CubicLevelReader extends CubicCollisionGetter {
-    @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus chunkStatus, boolean forceLoad);
-
     boolean cc_hasCube(int cubeX, int cubeY, int cubeZ);
 
+    @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus chunkStatus, boolean forceLoad);
+
     @Nullable default CubeAccess cc_getCube(BlockPos blockPos) {
         return this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()), Coords.blockToCube(blockPos.getZ()));
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
index ce1b9b49..1958572d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunk/status/CCChunkStatusTasks.java
@@ -27,6 +27,8 @@
  */
 @Dasm(ChunkInCubicContextSet.class)
 public class CCChunkStatusTasks {
+    private CCChunkStatusTasks() {}
+
     @AddTransformToSets(ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class)
     @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
     private static native boolean isLighted(ChunkAccess chunk);
@@ -39,18 +41,7 @@ public static CompletableFuture<ChunkAccess> passThrough(
     }
 
     // We skip chunk generation steps in cubic contexts by delegating to passThrough
-    @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;")) // We
-                                                                                                                                                                                                                                                                                                                                                                                                    // skip
-                                                                                                                                                                                                                                                                                                                                                                                                    // chunk
-                                                                                                                                                                                                                                                                                                                                                                                                    // generation
-                                                                                                                                                                                                                                                                                                                                                                                                    // steps
-                                                                                                                                                                                                                                                                                                                                                                                                    // in
-                                                                                                                                                                                                                                                                                                                                                                                                    // cubic
-                                                                                                                                                                                                                                                                                                                                                                                                    // contexts
-                                                                                                                                                                                                                                                                                                                                                                                                    // by
-                                                                                                                                                                                                                                                                                                                                                                                                    // delegating
-                                                                                                                                                                                                                                                                                                                                                                                                    // to
-                                                                                                                                                                                                                                                                                                                                                                                                    // passThrough
+    @AddMethodToSets(containers = ChunkInCubicContextSet.ChunkStatusTasks_to_CCChunkStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<ChunkAccess> generateStructureStarts(
             WorldGenContext worldGenContext, ChunkStep step, StaticCache2D<GenerationChunkHolder> cache, ChunkAccess chunk
     ) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
index 9318068d..f653ad19 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
@@ -313,6 +313,10 @@ public CubePos cc_getCubePos() {
     @TransformFromMethod(value = @MethodSig("getMinY()I"), owner = @Ref(ChunkAccess.class))
     @Override public native int getMinY();
 
+    // these are two semantically different methods that happen to share a name;
+    // one is for accessing heightmaps, and the other for getting height of the world.
+    // we match the method ordering of the vanilla ChunkAccess class, which doesn't group them.
+    @SuppressWarnings("checkstyle:OverloadMethodsDeclarationOrder")
     @TransformFromMethod(value = @MethodSig("getHeight()I"), owner = @Ref(ChunkAccess.class))
     @Override public native int getHeight();
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
index e9057077..50ded94a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
@@ -185,15 +185,16 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @Override public native FluidState getFluidState(int x, int y, int z);
 
     // TODO might be dasm-able eventually, if we get more powerful mixin tools
+    @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) // <-- copies structure of vanilla method
     @Nullable @Override public BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
         var chunkSection = this.getSection(Coords.blockToIndex(pos));
         boolean wasOnlyAir = chunkSection.hasOnlyAir();
         if (wasOnlyAir && state.isAir()) {
             return null;
         } else {
-            int sectionLocalX = pos.getX() & 15;
-            int sectionLocalY = pos.getY() & 15;
-            int sectionLocalZ = pos.getZ() & 15;
+            int sectionLocalX = pos.getX() & SectionPos.SECTION_MASK;
+            int sectionLocalY = pos.getY() & SectionPos.SECTION_MASK;
+            int sectionLocalZ = pos.getZ() & SectionPos.SECTION_MASK;
             var previousState = chunkSection.setBlockState(sectionLocalX, sectionLocalY, sectionLocalZ, state);
             if (previousState == state) {
                 return null;
@@ -212,8 +213,8 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
                 }
 
                 boolean flag4 = !previousState.is(block);
-                boolean flag2 = (flags & 64) != 0;
-                boolean flag3 = (flags & 256) == 0;
+                boolean flag2 = (flags & Block.UPDATE_MOVE_BY_PISTON) != 0;
+                boolean flag3 = (flags & Block.UPDATE_SKIP_BLOCK_ENTITY_SIDEEFFECTS) == 0;
                 if (flag4 && previousState.hasBlockEntity()) {
                     if (!this.level.isClientSide && flag3) {
                         BlockEntity blockentity = this.level.getBlockEntity(pos);
@@ -232,7 +233,7 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
                 if (!chunkSection.getBlockState(sectionLocalX, sectionLocalY, sectionLocalZ).is(block)) {
                     return null;
                 } else {
-                    if (!this.level.isClientSide && !this.level.captureBlockSnapshots && (flags & 512) == 0) {
+                    if (!this.level.isClientSide && !this.level.captureBlockSnapshots && (flags & Block.UPDATE_SKIP_ON_PLACE) == 0) {
                         state.onPlace(this.level, pos, previousState, flag2);
                     }
 
@@ -299,8 +300,9 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @TransformFromMethod(value = @MethodSig("removeGameEventListener(Lnet/minecraft/world/level/block/entity/BlockEntity;Lnet/minecraft/server/level/ServerLevel;)V"), owner = @Ref(LevelChunk.class))
     private native <T extends BlockEntity> void removeGameEventListener(T blockEntity, ServerLevel level);
 
+    // TODO sectionY is definitely wrong here
     @TransformFromMethod(value = @MethodSig("removeGameEventListenerRegistry(I)V"), owner = @Ref(LevelChunk.class))
-    private native void removeGameEventListenerRegistry(int p_283355_);
+    private native void removeGameEventListenerRegistry(int sectionY);
 
     @TransformFromMethod(value = @MethodSig("removeBlockEntityTicker(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(LevelChunk.class))
     private native void removeBlockEntityTicker(BlockPos pos);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
index 1da14408..37dace16 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
@@ -141,10 +141,10 @@ public ProtoCube(
     @Override public native Holder<Biome> getNoiseBiome(int x, int y, int z);
 
     @TransformFromMethod(value = @MethodSig("packOffsetCoordinates(Lnet/minecraft/core/BlockPos;)S"), owner = @Ref(ProtoChunk.class))
-    public native static short packOffsetCoordinates(BlockPos pos);
+    public static native short packOffsetCoordinates(BlockPos pos);
 
     @TransformFromMethod(value = @MethodSig("unpackOffsetCoordinates(SILnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/core/BlockPos;"), owner = @Ref(ProtoChunk.class))
-    public native static BlockPos unpackOffsetCoordinates(short packedPos, int yOffset, ChunkPos chunkPos);
+    public static native BlockPos unpackOffsetCoordinates(short packedPos, int yOffset, ChunkPos chunkPos);
 
     // dasm + mixin
     @TransformFromMethod(value = @MethodSig("markPosForPostprocessing(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(ProtoChunk.class))
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
index 78387c05..eb89c007 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStatusTasks.java
@@ -30,6 +30,8 @@
  */
 @Dasm(ChunkToCubeSet.class)
 public class CubeStatusTasks {
+    private CubeStatusTasks() {}
+
     @AddTransformToSets(ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class)
     @TransformFromMethod(owner = @Ref(ChunkStatusTasks.class), value = @MethodSig("isLighted(Lnet/minecraft/world/level/chunk/ChunkAccess;)Z"))
     private static native boolean isLighted(CubeAccess cube);
@@ -42,18 +44,7 @@ public static CompletableFuture<CubeAccess> passThrough(
     }
 
     // TODO (P3) we skip cube generation steps for now by delegating to passThrough
-    @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;")) // We
-                                                                                                                                                                                                                                                                                                                                                                                         // skip
-                                                                                                                                                                                                                                                                                                                                                                                         // chunk
-                                                                                                                                                                                                                                                                                                                                                                                         // generation
-                                                                                                                                                                                                                                                                                                                                                                                         // steps
-                                                                                                                                                                                                                                                                                                                                                                                         // in
-                                                                                                                                                                                                                                                                                                                                                                                         // cubic
-                                                                                                                                                                                                                                                                                                                                                                                         // contexts
-                                                                                                                                                                                                                                                                                                                                                                                         // by
-                                                                                                                                                                                                                                                                                                                                                                                         // delegating
-                                                                                                                                                                                                                                                                                                                                                                                         // to
-                                                                                                                                                                                                                                                                                                                                                                                         // passThrough
+    @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateStructureStarts(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateStructureStarts(
             WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
     ) {
@@ -81,6 +72,7 @@ public static CompletableFuture<CubeAccess> generateBiomes(
         return passThrough(worldGenContext, step, cache, cube);
     }
 
+    @SuppressWarnings("checkstyle:MagicNumber") // hardcoded terrain generation; the constants are arbitrary
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkStatusTasks_to_CubeStatusTasks_redirects.class, method = @MethodSig("generateNoise(Lnet/minecraft/world/level/chunk/status/WorldGenContext;Lnet/minecraft/world/level/chunk/status/ChunkStep;Lnet/minecraft/util/StaticCache2D;Lnet/minecraft/world/level/chunk/ChunkAccess;)Ljava/util/concurrent/CompletableFuture;"))
     public static CompletableFuture<CubeAccess> generateNoise(
             WorldGenContext worldGenContext, CubeStep step, StaticCache3D<GenerationChunkHolder> cache, CubeAccess cube
@@ -97,8 +89,9 @@ public static CompletableFuture<CubeAccess> generateNoise(
             for (int x = 0; x < CubicConstants.DIAMETER_IN_BLOCKS; x++) {
                 for (int z = 0; z < CubicConstants.DIAMETER_IN_BLOCKS; z++) {
                     if (y + Math.round((amplitude * (Math.sin((x + cubeX) / 8.0 + (z + cubeZ) / 21.0) + Math.cos((z + cubeZ) / 13.0)))
-                            / 2.0) <= CubicChunks.SUPERFLAT_HEIGHT)
+                            / 2.0) <= CubicChunks.SUPERFLAT_HEIGHT) {
                         cube.setBlockState(blockPos.set(x, y, z), blockState);
+                    }
                 }
             }
         }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
index a7d691fc..a8f712ab 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
@@ -85,19 +85,19 @@ protected Builder(ChunkStatus status, CubeStep parent) {
         }
 
         // TODO could be mixin + DASM
-        public CubeStep.Builder addRequirement(ChunkStatus status, int radius) {
-            if (status.isOrAfter(this.status)) {
-                throw new IllegalArgumentException("Status " + status + " can not be required by " + this.status);
+        public CubeStep.Builder addRequirement(ChunkStatus requiredStatus, int radius) {
+            if (requiredStatus.isOrAfter(this.status)) {
+                throw new IllegalArgumentException("Status " + requiredStatus + " can not be required by " + this.status);
             } else {
                 ChunkStatus[] achunkstatus = this.directDependenciesByRadius;
                 int i = Coords.sectionToCubeCeil(radius) + 1;
                 if (i > achunkstatus.length) {
                     this.directDependenciesByRadius = new ChunkStatus[i];
-                    Arrays.fill(this.directDependenciesByRadius, status);
+                    Arrays.fill(this.directDependenciesByRadius, requiredStatus);
                 }
 
                 for (int j = 0; j < Math.min(i, achunkstatus.length); j++) {
-                    this.directDependenciesByRadius[j] = ChunkStatus.max(achunkstatus[j], status);
+                    this.directDependenciesByRadius[j] = ChunkStatus.max(achunkstatus[j], requiredStatus);
                 }
 
                 return this;
@@ -105,8 +105,8 @@ public CubeStep.Builder addRequirement(ChunkStatus status, int radius) {
         }
 
         // TODO could be mixin + DASM
-        public CubeStep.Builder blockStateWriteRadius(int blockStateWriteRadius) {
-            this.blockStateWriteRadius = Coords.sectionToCubeCeil(blockStateWriteRadius);
+        public CubeStep.Builder blockStateWriteRadius(int blockStateWriteRadiusInSections) {
+            this.blockStateWriteRadius = Coords.sectionToCubeCeil(blockStateWriteRadiusInSections);
             return this;
         }
 
@@ -120,6 +120,6 @@ public CubeStep.Builder blockStateWriteRadius(int blockStateWriteRadius) {
         private native ChunkStatus[] buildAccumulatedDependencies();
 
         @TransformFromMethod(owner = @Ref(ChunkStep.Builder.class), value = @MethodSig("getRadiusOfParent(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)I"))
-        private native int getRadiusOfParent(ChunkStatus status);
+        private native int getRadiusOfParent(ChunkStatus parentStatus);
     }
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
index bfdd1c31..61e8d269 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestCubicChunkMap.java
@@ -119,8 +119,9 @@ public void singleFullChunkVanilla(MinecraftServer server) throws Exception {
                     var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(ChunkPos.asLong(x, z),
                             centerLevel + Math.max(Math.abs(x), Math.abs(z)), null, ChunkLevel.MAX_LEVEL + 1);
                     ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                    if (x == 0 && z == 0)
+                    if (x == 0 && z == 0) {
                         centerHolder = holder;
+                    }
                 }
             }
 
@@ -156,8 +157,9 @@ public void singleFullChunk(MinecraftServer server) throws Exception {
                     var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(ChunkPos.asLong(x, z),
                             centerLevel + Math.max(Math.abs(x), Math.abs(z)), null, ChunkLevel.MAX_LEVEL + 1);
                     ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                    if (x == 0 && z == 0)
+                    if (x == 0 && z == 0) {
                         centerHolder = holder;
+                    }
                 }
             }
 
@@ -206,8 +208,9 @@ public void singleFullCube(MinecraftServer server) throws Exception {
                         var holder = ((ChunkMapTestAccess) chunkMap).invokeUpdateChunkScheduling(CloPos.cubeAsLong(x, y, z),
                                 centerLevel + Math.max(Math.abs(y), chunkDistance), null, ChunkLevel.MAX_LEVEL + 1);
                         ((GenerationChunkHolderTestAccess) holder).invokeUpdateHighestAllowedStatus(chunkMap);
-                        if (x == 0 && z == 0 && y == 0)
+                        if (x == 0 && z == 0 && y == 0) {
                             centerHolder = holder;
+                        }
                     }
                 }
             }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
index a38aadcb..ffd8457b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/integrationtest/server/level/IntegrationTestServerCubeCache.java
@@ -391,8 +391,9 @@ public void getCubeAndNeighboringCubesAndChunks() throws Exception {
                     for (int dz = 0; dz < CubicConstants.DIAMETER_IN_SECTIONS; dz++) {
                         int x = -i * CubicConstants.DIAMETER_IN_SECTIONS + dx;
                         int z = i * CubicConstants.DIAMETER_IN_SECTIONS + dz;
-                        if (expectedStatus.isOrAfter(ChunkStatus.FULL))
+                        if (expectedStatus.isOrAfter(ChunkStatus.FULL)) {
                             assertTrue(serverChunkCache.hasChunk(x, z));
+                        }
                         var chunkAccess = serverChunkCache.getChunk(x, z, expectedStatus, false);
                         assertNotNull(chunkAccess);
                         assertTrue(chunkAccess.getPersistedStatus().isOrAfter(expectedStatus));
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
index bac8adb4..fef96824 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
@@ -14,5 +14,5 @@ public interface MinecraftServerTestAccess {
     void invoke_prepareLevels(ChunkProgressListener chunkProgressListener);
 
     @Invoker(value = "setInitialSpawn")
-    void invoke_setInitialSpawn(ServerLevel serverLevel, ServerLevelData serverLevelData, boolean p_177899_, boolean p_177900_);
+    void invoke_setInitialSpawn(ServerLevel serverLevel, ServerLevelData serverLevelData, boolean generateBonusChest, boolean debug);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
index bddc6586..58a0090b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicChunkTracker.java
@@ -46,10 +46,11 @@ protected TestCubicTracker(int levelCount, int expectedUpdatesByLevel, int expec
 
         @Override protected void setLevel(long pos, int level) {
             ((ChunkTrackerTestAccess) this).invoke_cc_onSetLevel(pos, level);
-            if (level >= maxLevel)
+            if (level >= maxLevel) {
                 chunks.remove(pos);
-            else
+            } else {
                 chunks.put(pos, (byte) level);
+            }
         }
 
         public void runAllUpdates() {
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
index 68779924..4ee38f67 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
@@ -37,7 +37,7 @@
  */
 public class TestCubicDistanceManager extends BaseTest {
     static class TestDistanceManager extends DistanceManager {
-        public TestDistanceManager(TicketStorage ticketStorage, Executor executor, Executor executor2) {
+        TestDistanceManager(TicketStorage ticketStorage, Executor executor, Executor executor2) {
             super(ticketStorage, executor, executor2);
         }
 
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
index 63ce2508..bc983e94 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/TestBlockCollisions.java
@@ -53,8 +53,9 @@ public void testSimpleCCBlockCollisions() {
         var blockGetter = DummyBlockGetter.mockBlockGetter(Blocks.STONE.defaultBlockState());
         var cubePos = CubePos.of(7, -13, 4);
         var cubeGetter = new CubeGetter((cubeX, cubeY, cubeZ) -> {
-            if (cubePos.getX() == cubeX && cubePos.getY() == cubeY && cubePos.getZ() == cubeZ)
+            if (cubePos.getX() == cubeX && cubePos.getY() == cubeY && cubePos.getZ() == cubeZ) {
                 return blockGetter;
+            }
             throw new IllegalStateException();
         });
         when(((CubicLevel) level).cc_getCubeForCollisions(anyInt(), anyInt(), anyInt())).then(AdditionalAnswers.delegatesTo(cubeGetter));
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
index 99bbc2cc..4cb010d1 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
@@ -39,7 +39,7 @@
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public class TestCubeAccess extends BaseTest {
     static class CubeAccessTestImpl extends CubeAccess {
-        public CubeAccessTestImpl(
+        CubeAccessTestImpl(
                 CubePos cubePos, UpgradeData upgradeData, LevelHeightAccessor levelHeightAccessor, Registry<Biome> biomeRegistry, long inhabitedTime,
                 @Nullable LevelChunkSection[] chunkSections, @Nullable BlendingData blendingData
         ) {
@@ -111,8 +111,9 @@ private void findBlocks(Random random) {
         for (int i = 0; i < 1000; i++) {
             BlockPos pos = cubePos.asBlockPos(random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS), random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS),
                     random.nextInt(CubicConstants.DIAMETER_IN_BLOCKS));
-            if (!visitedPositions.add(pos))
+            if (!visitedPositions.add(pos)) {
                 continue;
+            }
             if (random.nextBoolean()) {
                 cubeAccess.setBlockState(pos, Blocks.STONE.defaultBlockState());
                 expectedPositions.add(pos);
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
index 3afaaeac..ec80c5d9 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/testutils/Misc.java
@@ -33,6 +33,8 @@
 
 // TODO maybe split things off of this class instead of dumping everything in here?
 public class Misc {
+    private Misc() {}
+
     public static int chebyshevDistance(Vec3i a, Vec3i b) {
         return Math.max(Math.max(Math.abs(a.getX() - b.getX()), Math.abs(a.getY() - b.getY())), Math.abs(a.getZ() - b.getZ()));
     }

From e5dd6eaf43e80251f7c4c02a02c60215eb27146d Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Sun, 15 Jun 2025 21:39:35 +1200
Subject: [PATCH 5/6] miscellaneous formatting tweaks

---
 .../gradle/FixAnnotationsFormatterStep.java   |  5 +++--
 .../cubicchunks/CubicChunks.java              | 10 ++++-----
 .../client/multiplayer/ClientCubeCache.java   |  4 ++--
 .../client/SectionRenderDispatcherAccess.java |  3 +--
 .../mixin/access/client/ViewAreaAccess.java   |  3 +--
 .../mixin/access/common/ChunkMapAccess.java   |  3 +--
 .../access/common/DistanceManagerAccess.java  |  3 +--
 .../common/GenerationChunkHolderAccess.java   |  3 +--
 ...ctionOcclusionGraph$GraphEventsAccess.java |  3 +--
 .../client/renderer/cube/MixinRenderCube.java |  3 +--
 .../common/server/level/MixinChunkHolder.java |  9 +++-----
 .../level/MixinChunkMap$TrackedEntity.java    |  3 +--
 .../common/server/level/MixinChunkMap.java    | 21 +++++++------------
 .../server/level/MixinServerChunkCache.java   | 18 ++++++----------
 .../network/MixinPlayerChunkSender.java       |  6 ++----
 .../level/cube/MixinImposterProtoCube.java    |  3 +--
 .../world/level/cube/MixinLevelCube.java      |  6 ++----
 .../world/level/cube/MixinProtoCube.java      |  3 +--
 .../cube/status/MixinCubeStatusTasks.java     |  6 ++----
 .../level/cube/status/MixinCubeStep.java      |  3 +--
 .../world/level/cube/LevelCube.java           |  6 +++---
 .../ClientChunkCache$StorageTestAccess.java   |  3 +--
 .../ClientChunkCacheTestAccess.java           | 11 +++-------
 .../server/level/ChunkMapTestAccess.java      |  6 ++----
 .../server/level/ChunkTrackerTestAccess.java  |  8 ++-----
 .../level/CubicDistanceManagerTestAccess.java |  3 +--
 .../GenerationChunkHolderTestAccess.java      |  3 +--
 .../level/MinecraftServerTestAccess.java      |  6 ++----
 .../level/ServerChunkCacheTestAccess.java     |  3 +--
 29 files changed, 59 insertions(+), 108 deletions(-)

diff --git a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
index b2b3b8e9..49a94565 100644
--- a/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
+++ b/buildSrc/src/main/java/io/github/opencubicchunks/gradle/FixAnnotationsFormatterStep.java
@@ -11,13 +11,14 @@ public class FixAnnotationsFormatterStep implements FormatterStep {
         return "cc_fix_annotations";
     }
 
-    private static final String[] ANNOTATIONS = { "@Shadow", "@Final", "@Mutable", "@Public", "@Override", "@Nullable", "@NotNull", };
+    private static final String[] ANNOTATIONS = { "@Shadow", "@Final", "@Mutable", "@Public", "@Override", "@Nullable", "@NotNull", "@Invoker",
+        "@Accessor", "@Dynamic" };
 
     @Override public @Nullable String format(String s, @NotNull File file) {
         var outputString = s;
         for (var annotation : ANNOTATIONS) {
             // Remove newlines after the listed annotations
-            outputString = outputString.replaceAll(annotation + "\\n\\h*", annotation + " ");
+            outputString = outputString.replaceAll("(" + annotation + "(:?\\([^()\\n]*\\))?)\\n\\h*", "$1 ");
         }
         return outputString;
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
index edae4d38..61aaee18 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/CubicChunks.java
@@ -28,13 +28,13 @@ public class CubicChunks extends CubicChunksBase {
 
     public CubicChunks(IEventBus modEventBus) {
         ChunkMap.class.getName();
-        // if (!(CubeMap.class.isAssignableFrom(ChunkMap.class))) {
-        // throw new IllegalStateException("Mixin not applied!");
-        // }
+//        if (!(CubeMap.class.isAssignableFrom(ChunkMap.class))) {
+//            throw new IllegalStateException("Mixin not applied!");
+//        }
         EarlyConfig.getDiameterInSections();
 
         Coords.blockToIndex(new BlockPos(0, 0, 0));
-        // ClassDuplicator.init();
+//        ClassDuplicator.init();
         if (System.getProperty("cubicchunks.debug", "false").equalsIgnoreCase("true")) {
             try {
                 Class.forName("io.github.opencubicchunks.cubicchunks.debug.DebugVisualization").getMethod("enable").invoke(null);
@@ -48,7 +48,7 @@ public CubicChunks(IEventBus modEventBus) {
     }
 
     private void commonSetup(final FMLCommonSetupEvent event) {
-        // PacketDispatcher.register();
+//        PacketDispatcher.register();
     }
 
     public static CommonConfig config() {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
index c039cddd..2a6e4479 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/multiplayer/ClientCubeCache.java
@@ -161,8 +161,8 @@ public boolean inRange(int x, int y, int z) {
                     && Math.abs(z - this.viewCenterZ) <= this.cubeRadius;
         }
 
-        @Nullable @TransformFromMethod(owner = @Ref(ClientChunkCache.Storage.class), value = @MethodSig("getChunk(I)Lnet/minecraft/world/level/chunk/LevelChunk;"), visibility = PUBLIC)
-        public native LevelCube getChunk(int chunkIndex);
+        @TransformFromMethod(owner = @Ref(ClientChunkCache.Storage.class), value = @MethodSig("getChunk(I)Lnet/minecraft/world/level/chunk/LevelChunk;"), visibility = PUBLIC)
+        public native @Nullable LevelCube getChunk(int chunkIndex);
 
         public void dumpChunks(String filePath) {
             // TODO reimplement debug code
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
index cf708cd5..55220528 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/SectionRenderDispatcherAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(SectionRenderDispatcher.class)
 public interface SectionRenderDispatcherAccess {
-    @Accessor("level")
-    ClientLevel cc_getLevel();
+    @Accessor("level") ClientLevel cc_getLevel();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
index 4b38c230..9df13400 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/client/ViewAreaAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(ViewArea.class)
 public interface ViewAreaAccess {
-    @Invoker("getRenderSection")
-    SectionRenderDispatcher.RenderSection cc_invokeGetRenderSection(long sectionPosLong);
+    @Invoker("getRenderSection") SectionRenderDispatcher.RenderSection cc_invokeGetRenderSection(long sectionPosLong);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
index 34eb1523..c264d6ec 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/ChunkMapAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(ChunkMap.class)
 public interface ChunkMapAccess {
-    @Invoker("getChunks")
-    Iterable<ChunkHolder> cc_invokeGetChunks();
+    @Invoker("getChunks") Iterable<ChunkHolder> cc_invokeGetChunks();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
index 440a4881..ea603061 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/DistanceManagerAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(DistanceManager.class)
 public interface DistanceManagerAccess {
-    @Accessor("ticketDispatcher")
-    ThrottlingChunkTaskDispatcher cc_ticketDispatcher();
+    @Accessor("ticketDispatcher") ThrottlingChunkTaskDispatcher cc_ticketDispatcher();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
index fc7787df..0ef07a11 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/GenerationChunkHolderAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(GenerationChunkHolder.class)
 public interface GenerationChunkHolderAccess {
-    @Invoker("removeTask")
-    void cc_invokeRemoveTask(ChunkGenerationTask task);
+    @Invoker("removeTask") void cc_invokeRemoveTask(ChunkGenerationTask task);
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
index 805ec308..a303d2a3 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/access/common/SectionOcclusionGraph$GraphEventsAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(SectionOcclusionGraph.GraphEvents.class)
 public interface SectionOcclusionGraph$GraphEventsAccess {
-    @Accessor("chunksWhichReceivedNeighbors")
-    LongSet cc_chunksWhichReceivedNeighbors();
+    @Accessor("chunksWhichReceivedNeighbors") LongSet cc_chunksWhichReceivedNeighbors();
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
index 3958cac3..00eb0ac9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/cube/MixinRenderCube.java
@@ -15,8 +15,7 @@ public abstract class MixinRenderCube {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic
-    @Redirect(method = "getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
+    @Dynamic @Redirect(method = "getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos pos) {
         return Coords.blockToIndex(pos);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
index 3436d9e3..d7e651ab 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
@@ -109,8 +109,7 @@ public void cc_onBlockChanged(BlockPos pos, CallbackInfoReturnable<Boolean> cir)
     @TransformFromMethod(@MethodSig("blockChanged(Lnet/minecraft/core/BlockPos;)Z"))
     private native boolean cc_blockChanged(BlockPos pos);
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_blockChanged", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionIndex(I)I"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_blockChanged", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionIndex(I)I"))
     private int cc_onBlockChanged_sectionIndex(LevelHeightAccessor instance, int y, BlockPos pos) {
         return Coords.sectionToIndex(Coords.blockToSection(pos.getX()), Coords.blockToSection(pos.getY()), Coords.blockToSection(pos.getZ()));
     }
@@ -132,8 +131,7 @@ public void cc_onSectionLightChanged(LightLayer lightLayer, int sectionY, Callba
     // TODO (P2) lighting - ClientboundLightUpdatePacket branch is currently never reached; once we have lighting it will have to be a CC packet, and
     // this.broadcast will need to redirect to a CC method
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionYFromSectionIndex(I)I"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/LevelHeightAccessor;getSectionYFromSectionIndex(I)I"))
     private int cc_onBroadcastCubeChanges_indexToSectionY(LevelHeightAccessor instance, int sectionIndex) {
         // The vanilla method uses SectionPos.of(ChunkPos, sectionY), but we want SectionPos.of(CubePos, sectionIndex).
         // The easiest way to accomplish this is to turn `getSectionYFromSectionIndex` into a no-op so that we get sectionIndex instead of sectionY.
@@ -141,8 +139,7 @@ private int cc_onBroadcastCubeChanges_indexToSectionY(LevelHeightAccessor instan
         return sectionIndex;
     }
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;of(Lio/github/opencubicchunks/cc_core/api/CubePos;I)Lnet/minecraft/core/SectionPos;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_broadcastCubeChanges", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/SectionPos;of(Lio/github/opencubicchunks/cc_core/api/CubePos;I)Lnet/minecraft/core/SectionPos;"))
     private SectionPos cc_onBroadcastCubeChanges_sectionPos(CubePos cubePos, int sectionIndex) {
         return Coords.sectionPosByIndex(cubePos, sectionIndex);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
index ab06abe1..c2fa5ea4 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap$TrackedEntity.java
@@ -25,8 +25,7 @@ public abstract class MixinChunkMap$TrackedEntity {
     @TransformFromMethod(@MethodSig("updatePlayer(Lnet/minecraft/server/level/ServerPlayer;)V"))
     public native void cc_updatePlayer(ServerPlayer player);
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_updatePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_updatePlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_updatePlayer_isChunkTracked(ChunkMap instance, ServerPlayer player, int x, int z) {
         // FIXME entity clo position once implemented
         return false; // ((CubicChunkMap) instance).cc_isChunkTracked(player, this.entity.chunkPosition().x, 0, this.entity.chunkPosition().z);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
index fbe31d95..a294a23f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
@@ -196,8 +196,7 @@ private native CompletableFuture<ChunkResult<List<CloAccess>>> cc_getChunkRangeF
      * Cubes require different adjacency logic compared to Chunks
      */
     @SuppressWarnings("checkstyle:CyclomaticComplexity") // <-- TODO this method is just a bit of a disaster
-    @Dynamic
-    @Inject(method = "cc_dasm$cc_getChunkRangeFuture", at = @At("HEAD"), cancellable = true)
+    @Dynamic @Inject(method = "cc_dasm$cc_getChunkRangeFuture", at = @At("HEAD"), cancellable = true)
     private void cc_onGetChunkRangeFuture(
             ChunkHolder cloHolder, int radius, IntFunction<ChunkStatus> statusByRadius,
             CallbackInfoReturnable<CompletableFuture<ChunkResult<List<CloAccess>>>> cir
@@ -329,8 +328,7 @@ private CompletableFuture<CloAccess> cc_scheduleChunkLoad(CubePos cubePos) {
         return cc_scheduleChunkLoad(CloPos.cube(cubePos));
     }
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_scheduleChunkLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;prefetch(Lio/github/opencubicchunks/cc_core/world/level/CloPos;)Ljava/util/concurrent/CompletableFuture;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_scheduleChunkLoad", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;prefetch(Lio/github/opencubicchunks/cc_core/world/level/CloPos;)Ljava/util/concurrent/CompletableFuture;"))
     private CompletableFuture<?> cc_onScheduleChunkLoad_poiManagerPreFetch(PoiManager instance, CloPos cloPos) {
         // TODO (P2) save/load - PoiManager
         return CompletableFuture.completedFuture(null);
@@ -360,8 +358,7 @@ public native CompletableFuture<CubeAccess> cc_applyCubeStep(
             GenerationChunkHolder generationchunkholder, CubeStep chunkstep, StaticCache3D<GenerationChunkHolder> cache
     );
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_applyCubeStep", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_applyCubeStep", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
     private Object cc_onApplyCubeStep_staticCacheGet(StaticCache3D instance, int x, int z, @Local(ordinal = 0) CubePos cubePos) {
         return instance.get(cubePos.getX(), cubePos.getY(), cubePos.getZ());
     }
@@ -520,8 +517,7 @@ private boolean cc_save(CloAccess cloAccess) {
     @TransformFromMethod(@MethodSig("updateChunkTracking(Lnet/minecraft/server/level/ServerPlayer;)V"))
     private native void cc_updateChunkTracking(ServerPlayer player);
 
-    @Dynamic
-    @WrapOperation(method = "cc_dasm$cc_updateChunkTracking", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;getPlayerViewDistance(Lnet/minecraft/server/level/ServerPlayer;)I"))
+    @Dynamic @WrapOperation(method = "cc_dasm$cc_updateChunkTracking", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;getPlayerViewDistance(Lnet/minecraft/server/level/ServerPlayer;)I"))
     private int cc_onUpdateChunkTracking_getViewDistance(ChunkMap instance, ServerPlayer player, Operation<Integer> original) {
         return Coords.sectionToCubeRenderDistance(original.call(instance, player));
     }
@@ -532,8 +528,7 @@ private int cc_onUpdateChunkTracking_getViewDistance(ChunkMap instance, ServerPl
     @TransformFromMethod(@MethodSig("applyChunkTrackingView(Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/level/ChunkTrackingView;)V"))
     private native void cc_applyChunkTrackingView(ServerPlayer player, CloTrackingView chunkTrackingView);
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_applyChunkTrackingView", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_applyChunkTrackingView", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerGamePacketListenerImpl;send(Lnet/minecraft/network/protocol/Packet;)V"))
     private void cc_onApplyChunkTrackingView_setChunkCacheCenterPacket(
             ServerGamePacketListenerImpl instance, Packet packet, ServerPlayer player, CloTrackingView cloTrackingView
     ) {
@@ -547,14 +542,12 @@ private void cc_onApplyChunkTrackingView_setChunkCacheCenterPacket(
     @TransformFromMethod(@MethodSig("getPlayers(Lnet/minecraft/world/level/ChunkPos;Z)Ljava/util/List;"))
     public native List<ServerPlayer> cc_getPlayers(CloPos pos, boolean boundaryOnly);
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkOnTrackedBorder(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkOnTrackedBorder(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_getPlayers_isChunkOnTrackedBorder(ChunkMap instance, ServerPlayer player, int x, int z, @Local CloPos pos) {
         return this.cc_isChunkOnTrackedBorder(player, pos.getX(), pos.getY(), pos.getZ());
     }
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkMap;isChunkTracked(Lnet/minecraft/server/level/ServerPlayer;II)Z"))
     private boolean cc_getPlayers_isChunkTracked(ChunkMap instance, ServerPlayer player, int x, int z, @Local CloPos pos) {
         return this.cc_isChunkTracked(player, pos.getX(), pos.getY(), pos.getZ());
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
index 2dc9e93d..a28850f9 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
@@ -129,8 +129,7 @@ private void cc_onInit(
     @Override @Nullable public native CubeAccess cc_getCube(int chunkX, @AddUnusedParam int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load);
 
     // mixin-into-dasm to replace call to getChunk with getCube
-    @Dynamic
-    @Inject(method = "cc_dasm$cc_getCube", cancellable = true, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
+    @Dynamic @Inject(method = "cc_dasm$cc_getCube", cancellable = true, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
     private void cc_getCube_supplyAsync(
             int pChunkX, int pChunkY, int pChunkZ, ChunkStatus pRequiredStatus, boolean pLoad, CallbackInfoReturnable<CubeAccess> cir
     ) {
@@ -140,16 +139,14 @@ private void cc_getCube_supplyAsync(
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
     // params of getCube
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
 
     // The second through fifth params are the params to the call being redirected; the next three params are the x/y/z coordinates in the params of
     // getCube
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;getChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCube", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;getChunkFutureMainThread(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Ljava/util/concurrent/CompletableFuture;"))
     private CompletableFuture cc_getCube_getChunkFutureMainThread(
             ServerChunkCache instance, int chunkX, int chunkZ, ChunkStatus requiredStatus, boolean load, int chunkXRepeated, int chunkY,
             int chunkZRepeated
@@ -162,8 +159,7 @@ private CompletableFuture cc_getCube_getChunkFutureMainThread(
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
     // params of getCubeNow
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeNow", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_chunkAsLong(II)J"))
     private long cc_getCubeNow_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CloPos.cubeAsLong(pX, pY, pZ);
     }
@@ -204,8 +200,7 @@ private native CompletableFuture<ChunkResult<CubeAccess>> cc_getCubeFutureMainTh
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
     // params of cc_getCubeFutureMainThread
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_getCubeFutureMainThread", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
     private CubePos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CubePos.of(pX, pY, pZ);
     }
@@ -215,8 +210,7 @@ private CubePos cc_getCubeFutureMainThread_chunkPosConstruct(int pX, int pZ, int
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
     // params of cc_hasCube
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_hasCube", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cc_core/api/CubePos;dummy_fromChunkCoords(II)Lio/github/opencubicchunks/cc_core/api/CubePos;"))
     private CubePos cc_hasCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int pZRepeated) {
         return CubePos.of(pX, pY, pZ);
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
index 182a4a18..6892c9a6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/network/MixinPlayerChunkSender.java
@@ -141,14 +141,12 @@ private static void cc_sendChunk(ServerGamePacketListenerImpl packetListener, Se
     private native List<LevelClo> cc_collectChunksToSend(ChunkMap chunkMap, CloPos cloPos);
 
     // FIXME these should probably have some kind of reasonable sort order - at the very least, chunks before cubes
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 0, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 0, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
     private Comparator<Long> cc_onCollectChunksToSend_comparator1(ToIntFunction<Long> keyExtractor) {
         return (a, b) -> 0;
     }
 
-    @Dynamic
-    @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
+    @Dynamic @Redirect(method = "cc_dasm$cc_collectChunksToSend", at = @At(ordinal = 1, value = "INVOKE", target = "Ljava/util/Comparator;comparingInt(Ljava/util/function/ToIntFunction;)Ljava/util/Comparator;"))
     private Comparator<LevelClo> cc_onCollectChunksToSend_comparator2(ToIntFunction<LevelClo> keyExtractor) {
         return (a, b) -> 0;
     }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
index e63a61ed..2d85876d 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinImposterProtoCube.java
@@ -13,8 +13,7 @@
 @Mixin(ImposterProtoCube.class)
 public abstract class MixinImposterProtoCube extends MixinProtoCube implements ImposterProtoClo {
     // Field generated by DASM
-    @Dynamic
-    @Shadow @Final private LevelCube wrapped;
+    @Dynamic @Shadow @Final private LevelCube wrapped;
 
     @Override public LevelClo cc_getWrappedClo() {
         return this.wrapped;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
index 8870575e..1e0b5d4a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinLevelCube.java
@@ -14,8 +14,7 @@ public abstract class MixinLevelCube extends MixinCubeAccess {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic
-    @Redirect(method = "cc_dasm$getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
+    @Dynamic @Redirect(method = "cc_dasm$getBlockState", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos pos) {
         return Coords.blockToIndex(pos);
     }
@@ -23,8 +22,7 @@ private int cc_onGetBlockState_SectionIndex(LevelCube instance, int y, BlockPos
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic
-    @Redirect(method = "cc_dasm$getFluidState(III)Lnet/minecraft/world/level/material/FluidState;", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
+    @Dynamic @Redirect(method = "cc_dasm$getFluidState(III)Lnet/minecraft/world/level/material/FluidState;", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
             + "/world/level/cube/LevelCube;getSectionIndex(I)I"))
     private int cc_onGetFluidState_SectionIndex(LevelCube instance, int yUnused, int x, int y, int z) {
         return Coords.blockToIndex(x, y, z);
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
index be5842f1..4743999b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/MixinProtoCube.java
@@ -14,8 +14,7 @@ public abstract class MixinProtoCube extends MixinCubeAccess {
     /**
      * Redirect to use cube section indexing instead of chunk section indexing
      */
-    @Dynamic
-    @Redirect(method = { "markPosForPostprocessing", "cc_dasm$getBlockState",
+    @Dynamic @Redirect(method = { "markPosForPostprocessing", "cc_dasm$getBlockState",
         "cc_dasm$getFluidState" }, at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks"
                 + "/world/level/cube/ProtoCube;getSectionIndex(I)I"))
     private int cc_onGetBlockState_SectionIndex(ProtoCube instance, int i, BlockPos pos) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
index 80459bbc..a645d17f 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStatusTasks.java
@@ -14,14 +14,12 @@
 // Needed for DASM to apply
 @Mixin(CubeStatusTasks.class)
 public class MixinCubeStatusTasks {
-    @Dynamic
-    @Redirect(method = "cc_dasm$full", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
+    @Dynamic @Redirect(method = "cc_dasm$full", at = @At(value = "INVOKE", target = "Lio/github/opencubicchunks/cubicchunks/util/StaticCache3D;get(II)Ljava/lang/Object;"))
     private static Object onFullCube_cacheGet(StaticCache3D<?> instance, int x, int z, @Local(ordinal = 0) CubePos cubePos) {
         return instance.get(x, cubePos.getY(), z);
     }
 
-    @Dynamic
-    @Redirect(method = "dasm$redirect$lambda$full$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/status/WorldGenContext;unsavedListener()Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube$UnsavedListener;"))
+    @Dynamic @Redirect(method = "dasm$redirect$lambda$full$2", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/chunk/status/WorldGenContext;unsavedListener()Lio/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube$UnsavedListener;"))
     private static LevelCube.UnsavedListener onFullCube_worldGenContext_unsavedListener(WorldGenContext instance) {
         return cubePos -> {}; // TODO (P2) save/load: this is temporary until WorldGenContext actually has a proper redirect so we can get a cube
                               // unsaved listener
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
index c7375ea9..4653b7fc 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/cube/status/MixinCubeStep.java
@@ -14,8 +14,7 @@
 // Needed for DASM to apply
 @Mixin(CubeStep.class)
 public class MixinCubeStep {
-    @Dynamic
-    @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkGenerate(Lio/github/opencubicchunks/cc_core/api/CubePos;Lnet/minecraft/resources/ResourceKey;Ljava/lang/String;)Lnet/minecraft/util/profiling/jfr/callback/ProfiledDuration;"))
+    @Dynamic @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiling/jfr/JvmProfiler;onChunkGenerate(Lio/github/opencubicchunks/cc_core/api/CubePos;Lnet/minecraft/resources/ResourceKey;Ljava/lang/String;)Lnet/minecraft/util/profiling/jfr/callback/ProfiledDuration;"))
     private ProfiledDuration cc_onApply_profilerCall(JvmProfiler instance, CubePos cubePos, ResourceKey<Level> levelResourceKey, String s) {
         // TODO we just hack out the profiler stuff for now
         return null;
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
index 50ded94a..3d33a959 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
@@ -407,15 +407,15 @@ public void unregisterTickContainerFromLevel(ServerLevel level) {}
     // FORGE START
 //    private final net.neoforged.neoforge.attachment.AttachmentHolder.AsField attachmentHolder = new net.neoforged.neoforge.attachment.AttachmentHolder.AsField();
 //
-//    @Override //    public boolean hasData(net.neoforged.neoforge.attachment.AttachmentType<?> type) {
+//    @Override public boolean hasData(net.neoforged.neoforge.attachment.AttachmentType<?> type) {
 //        return attachmentHolder.hasData(type);
 //    }
 //
-//    @Override //    public <T> T getData(net.neoforged.neoforge.attachment.AttachmentType<T> type) {
+//    @Override public <T> T getData(net.neoforged.neoforge.attachment.AttachmentType<T> type) {
 //        return attachmentHolder.getData(type);
 //    }
 //
-//    @Override //    @Nullable //    public <T> T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
+//    @Override @Nullable public <T> T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
 //        setUnsaved(true);
 //        return attachmentHolder.setData(type, data);
 //    }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
index 1f6d7864..23b5dbc4 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCache$StorageTestAccess.java
@@ -6,6 +6,5 @@
 
 @Mixin(ClientChunkCache.Storage.class)
 public interface ClientChunkCache$StorageTestAccess {
-    @Invoker("inRange")
-    boolean invokeInRange(int x, int z);
+    @Invoker("inRange") boolean invokeInRange(int x, int z);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
index e1487bc4..1da59941 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/client/multiplayer/ClientChunkCacheTestAccess.java
@@ -9,14 +9,9 @@
 
 @Mixin(ClientChunkCache.class)
 public interface ClientChunkCacheTestAccess {
-    @Dynamic
-    @Accessor("cc_cubeStorage")
-    ClientCubeCache.Storage cubeStorage();
+    @Dynamic @Accessor("cc_cubeStorage") ClientCubeCache.Storage cubeStorage();
 
-    @Dynamic
-    @Accessor("cc_emptyCube")
-    LevelCube emptyCube();
+    @Dynamic @Accessor("cc_emptyCube") LevelCube emptyCube();
 
-    @Accessor("storage")
-    ClientChunkCache.Storage chunkStorage();
+    @Accessor("storage") ClientChunkCache.Storage chunkStorage();
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
index e79fd334..8438191b 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkMapTestAccess.java
@@ -11,9 +11,7 @@
 
 @Mixin(ChunkMap.class)
 public interface ChunkMapTestAccess {
-    @Accessor("visibleChunkMap")
-    Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunkMap();
+    @Accessor("visibleChunkMap") Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunkMap();
 
-    @Invoker
-    @Nullable ChunkHolder invokeUpdateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
+    @Invoker @Nullable ChunkHolder invokeUpdateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
index 06e5beff..ba802fa4 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ChunkTrackerTestAccess.java
@@ -10,11 +10,7 @@
 
 @Mixin(ChunkTracker.class)
 public interface ChunkTrackerTestAccess {
-    @Dynamic
-    @Invoker(remap = false, value = "cc_onSetLevel")
-    void invoke_cc_onSetLevel(long pos, int level);
+    @Dynamic @Invoker(remap = false, value = "cc_onSetLevel") void invoke_cc_onSetLevel(long pos, int level);
 
-    @Dynamic
-    @Accessor(remap = false, value = "cc_existingCubesForCubeColumns")
-    Long2ObjectMap<IntSet> get_cc_existingCubesForCubeColumns();
+    @Dynamic @Accessor(remap = false, value = "cc_existingCubesForCubeColumns") Long2ObjectMap<IntSet> get_cc_existingCubesForCubeColumns();
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java
index 6892edef..1f1de19f 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/CubicDistanceManagerTestAccess.java
@@ -6,6 +6,5 @@
 
 @Mixin(DistanceManager.class)
 public interface CubicDistanceManagerTestAccess {
-    @Accessor(value = "playerTicketManager")
-    DistanceManager.PlayerTicketTracker get_playerTicketManager();
+    @Accessor(value = "playerTicketManager") DistanceManager.PlayerTicketTracker get_playerTicketManager();
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
index e208ba8b..7138cb0f 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/GenerationChunkHolderTestAccess.java
@@ -7,6 +7,5 @@
 
 @Mixin(GenerationChunkHolder.class)
 public interface GenerationChunkHolderTestAccess {
-    @Invoker
-    void invokeUpdateHighestAllowedStatus(ChunkMap chunkMap);
+    @Invoker void invokeUpdateHighestAllowedStatus(ChunkMap chunkMap);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
index fef96824..cb7b7e93 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/MinecraftServerTestAccess.java
@@ -10,9 +10,7 @@
 @Mixin(MinecraftServer.class)
 public interface MinecraftServerTestAccess {
 
-    @Invoker(value = "prepareLevels")
-    void invoke_prepareLevels(ChunkProgressListener chunkProgressListener);
+    @Invoker(value = "prepareLevels") void invoke_prepareLevels(ChunkProgressListener chunkProgressListener);
 
-    @Invoker(value = "setInitialSpawn")
-    void invoke_setInitialSpawn(ServerLevel serverLevel, ServerLevelData serverLevelData, boolean generateBonusChest, boolean debug);
+    @Invoker(value = "setInitialSpawn") void invoke_setInitialSpawn(ServerLevel serverLevel, ServerLevelData serverLevelData, boolean generateBonusChest, boolean debug);
 }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ServerChunkCacheTestAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ServerChunkCacheTestAccess.java
index f78db39e..a7ea7094 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ServerChunkCacheTestAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/mixin/test/common/server/level/ServerChunkCacheTestAccess.java
@@ -6,6 +6,5 @@
 
 @Mixin(ServerChunkCache.class)
 public interface ServerChunkCacheTestAccess {
-    @Accessor
-    ServerChunkCache.MainThreadExecutor getMainThreadProcessor();
+    @Accessor ServerChunkCache.MainThreadExecutor getMainThreadProcessor();
 }

From 95b8e749272d33fac8f87095ea662126745ebfbe Mon Sep 17 00:00:00 2001
From: CursedFlames <18627001+CursedFlames@users.noreply.github.com>
Date: Mon, 16 Jun 2025 21:03:29 +1200
Subject: [PATCH 6/6] fix @Nullable positioning

---
 .../client/renderer/cube/RenderCubeRegion.java |  2 +-
 .../cubicchunks/config/ServerConfig.java       |  2 +-
 .../cubicchunks/mixin/ASMConfigPlugin.java     |  2 +-
 .../renderer/MixinSectionOcclusionGraph.java   |  2 +-
 .../renderer/chunk/MixinRenderRegionCache.java |  2 +-
 ...nSectionRenderDispatcher$RenderSection.java |  2 +-
 .../server/level/MixinChunkGenerationTask.java |  4 ++--
 .../common/server/level/MixinChunkHolder.java  | 12 ++++++------
 .../common/server/level/MixinChunkMap.java     |  2 +-
 .../level/MixinGenerationChunkHolder.java      | 12 ++++++------
 .../server/level/MixinServerChunkCache.java    | 10 +++++-----
 .../world/level/MixinBlockCollisions.java      |  6 +++---
 .../core/common/world/level/MixinLevel.java    |  6 +++---
 .../cubicchunks/server/level/CubeLevel.java    |  2 +-
 .../world/level/CubicLevelReader.java          |  8 ++++----
 .../world/level/chunklike/CloAccess.java       |  2 +-
 .../world/level/cube/CubeAccess.java           | 18 +++++++++---------
 .../world/level/cube/LevelCube.java            | 18 +++++++++---------
 .../world/level/cube/ProtoCube.java            | 14 +++++++-------
 .../world/level/cube/status/CubeStep.java      |  2 +-
 .../server/level/TestCubicDistanceManager.java |  4 ++--
 .../test/world/level/cube/TestCubeAccess.java  |  2 +-
 22 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
index 9d42540f..d955ff90 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/client/renderer/cube/RenderCubeRegion.java
@@ -49,7 +49,7 @@ public RenderCubeRegion(
                 .getFluidState();
     }
 
-    @Nullable @Override public BlockEntity getBlockEntity(BlockPos pos) {
+    @Override public @Nullable BlockEntity getBlockEntity(BlockPos pos) {
         return this.getCube(Coords.blockToCube(pos.getX()), Coords.blockToCube(pos.getY()), Coords.blockToCube(pos.getZ())).getBlockEntity(pos);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
index 419ecf79..54deb930 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/config/ServerConfig.java
@@ -86,7 +86,7 @@ private static void createConfig(Path worldFolder) {
         write(configPath, createDefaultConfig());
     }
 
-//    @Nullable public static ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
+//    public static @Nullable ServerConfig getConfig(LevelStorageSource.LevelStorageAccess levelStorageAccess) {
 //        File configPath = getConfigPath(((LevelStorageAccessAccess) levelStorageAccess).getLevelPath());
 //        if (configPath.exists()) {
 //            var config = createDefaultConfig();
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
index 9dfd18ae..0d56b1b8 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/ASMConfigPlugin.java
@@ -134,7 +134,7 @@ public ASMConfigPlugin() {
 
     @Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
 
-    @Nullable @Override public List<String> getMixins() {
+    @Override public @Nullable List<String> getMixins() {
         return null;
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
index 9586569c..5162a9f7 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/MixinSectionOcclusionGraph.java
@@ -32,7 +32,7 @@
 @Mixin(SectionOcclusionGraph.class)
 public abstract class MixinSectionOcclusionGraph {
     private boolean cc_isCubic = false;
-    @Shadow @Nullable private ViewArea viewArea;
+    @Shadow private @Nullable ViewArea viewArea;
 
     @Shadow protected abstract boolean isInViewDistance(long centerSectionPos, long sectionPos);
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
index d9936cc7..6a2e4b6e 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinRenderRegionCache.java
@@ -35,7 +35,7 @@ public abstract class MixinRenderRegionCache implements CubicRenderRegionCache {
     @Shadow private final Long2ObjectMap<RenderRegionCacheCubeInfo> chunkInfoCache = new Long2ObjectOpenHashMap<>();
 
     // TODO can we possibly do this with DASM + mixin? probably not?
-    @Override @Nullable public RenderCubeRegion cc_createRegion(Level level, SectionPos sectionPos, boolean nullForEmpty) {
+    @Override public @Nullable RenderCubeRegion cc_createRegion(Level level, SectionPos sectionPos, boolean nullForEmpty) {
         int centerCubeX = Coords.sectionToCube(sectionPos.getX());
         int centerCubeY = Coords.sectionToCube(sectionPos.getY());
         int centerCubeZ = Coords.sectionToCube(sectionPos.getZ());
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
index 60e348ea..f44c4ccd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/client/renderer/chunk/MixinSectionRenderDispatcher$RenderSection.java
@@ -77,7 +77,7 @@ private void cc_onHasAllNeighbors(CallbackInfoReturnable<Boolean> cir) {
      * RenderChunkRegion)
      */
     @WrapOperation(method = "createCompileTask", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/chunk/RenderRegionCache;createRegion(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/SectionPos;Z)Lnet/minecraft/client/renderer/chunk/RenderChunkRegion;"))
-    @Nullable private RenderChunkRegion cc_onCreateCompileTask_createRegion(
+    private @Nullable RenderChunkRegion cc_onCreateCompileTask_createRegion(
             RenderRegionCache instance, Level level, SectionPos sectionPos, boolean bool, Operation<RenderChunkRegion> original
     ) {
         if (!((CanBeCubic) ((SectionRenderDispatcherAccess) this$0).cc_getLevel()).cc_isCubic()) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
index e6543157..42e4d69b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkGenerationTask.java
@@ -53,7 +53,7 @@
 public abstract class MixinChunkGenerationTask implements CloGenerationTask {
     @Shadow @Final private ChunkPos pos;
     @Shadow @Final private GeneratingChunkMap chunkMap;
-    @Shadow @Nullable private ChunkStatus scheduledStatus;
+    @Shadow private @Nullable ChunkStatus scheduledStatus;
     @Shadow @Final public ChunkStatus targetStatus;
     @Shadow private volatile boolean markedForCancellation;
     @Shadow @Final private StaticCache2D<GenerationChunkHolder> cache;
@@ -62,7 +62,7 @@ public abstract class MixinChunkGenerationTask implements CloGenerationTask {
     // scheduledChunkStatus must be one status higher than the scheduled status for cubes until the target status is reached, to ensure load order
     // invariants are preserved
     // we use the vanilla field for cube status, since that is the status of the actual cube that is being generated
-    @Nullable public ChunkStatus cc_scheduledChunkStatus;
+    public @Nullable ChunkStatus cc_scheduledChunkStatus;
     @AddFieldToSets(containers = ChunkToCubeSet.ChunkGenerationTask_redirects.class, field = @FieldSig(type = @Ref(StaticCache2D.class), name = "cache"))
     private StaticCache3D<GenerationChunkHolder> cc_cubeCache;
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
index d7e651ab..0d7db8b2 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkHolder.java
@@ -69,29 +69,29 @@ public MixinChunkHolder() {
         throw new DasmFailedToApply();
     }
 
-    @Shadow @Nullable public abstract LevelChunk getTickingChunk();
+    @Shadow public abstract @Nullable LevelChunk getTickingChunk();
 
     @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    @Nullable public native LevelCube cc_getTickingCube();
+    public native @Nullable LevelCube cc_getTickingCube();
 
     @AddMethodToSets(containers = ChunkToCloSet.ChunkHolder_redirects.class, method = @MethodSig("getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    @Nullable public LevelClo cc_getTickingClo() {
+    public @Nullable LevelClo cc_getTickingClo() {
         if (cc_cubePos != null) {
             return cc_getTickingCube();
         }
         return (LevelClo) getTickingChunk();
     }
 
-    @Shadow @Nullable public abstract LevelChunk getChunkToSend();
+    @Shadow public abstract @Nullable LevelChunk getChunkToSend();
 
     @AddTransformToSets(ChunkToCubeSet.ChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    @Nullable public native LevelCube cc_getCubeToSend();
+    public native @Nullable LevelCube cc_getCubeToSend();
 
     @AddTransformToSets(ChunkToCloSet.ChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(ChunkHolder.class), value = @MethodSig("getChunkToSend()Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    @Nullable public LevelClo cc_getCloToSend() {
+    public @Nullable LevelClo cc_getCloToSend() {
         if (cc_cubePos != null) {
             return cc_getCubeToSend();
         }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
index a294a23f..27b3f3c4 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinChunkMap.java
@@ -278,7 +278,7 @@ private void cc_onGetChunkRangeFuture(
     // region [cc_updateCubeScheduling dasm + mixin]
     @AddTransformToSets(ChunkToCubeSet.ChunkMap_redirects.class)
     @TransformFromMethod(useRedirectSets = ChunkToCubeSet.class, value = @MethodSig("updateChunkScheduling(JILnet/minecraft/server/level/ChunkHolder;I)Lnet/minecraft/server/level/ChunkHolder;"))
-    @Nullable public native ChunkHolder cc_updateCubeScheduling(long cubePos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
+    public native @Nullable ChunkHolder cc_updateCubeScheduling(long cubePos, int newLevel, @Nullable ChunkHolder holder, int oldLevel);
 
     @Inject(method = "updateChunkScheduling", at = @At("HEAD"), cancellable = true)
     private void cc_onUpdateChunkScheduling(long cloPos, int newLevel, ChunkHolder holder, int oldLevel, CallbackInfoReturnable<ChunkHolder> cir) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
index bb4c108c..4edf1b5b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinGenerationChunkHolder.java
@@ -80,7 +80,7 @@ native CompletableFuture<ChunkResult<CubeAccess>> cc_applyCubeStep(
     );
 
     @WrapOperation(method = "updateHighestAllowedStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ChunkLevel;generationStatus(I)Lnet/minecraft/world/level/chunk/status/ChunkStatus;"))
-    @Nullable protected ChunkStatus cc_onUpdateHighestAllowedStatus_generationStatus(int level, Operation<ChunkStatus> original) {
+    protected @Nullable ChunkStatus cc_onUpdateHighestAllowedStatus_generationStatus(int level, Operation<ChunkStatus> original) {
         if (cc_cubePos != null) {
             return CubeLevel.cubeGenerationStatus(level);
         }
@@ -107,20 +107,20 @@ private ChunkGenerationTask cc_onRescheduleChunkTask_scheduleGenerationTask(
 
     @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresentUnchecked(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
-    @Nullable public native CubeAccess cc_getCubeIfPresentUnchecked(ChunkStatus status);
+    public native @Nullable CubeAccess cc_getCubeIfPresentUnchecked(ChunkStatus status);
 
     @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getChunkIfPresent(Lnet/minecraft/world/level/chunk/status/ChunkStatus;)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
-    @Nullable public native CubeAccess cc_getCubeIfPresent(ChunkStatus status);
+    public native @Nullable CubeAccess cc_getCubeIfPresent(ChunkStatus status);
 
-    @Shadow @Nullable public abstract ChunkAccess getLatestChunk();
+    @Shadow public abstract @Nullable ChunkAccess getLatestChunk();
 
     @AddTransformToSets(ChunkToCubeSet.GenerationChunkHolder_redirects.class)
     @TransformFromMethod(owner = @Ref(GenerationChunkHolder.class), value = @MethodSig("getLatestChunk()Lnet/minecraft/world/level/chunk/ChunkAccess;"))
-    @Nullable public native CubeAccess cc_getLatestCube();
+    public native @Nullable CubeAccess cc_getLatestCube();
 
     @AddMethodToSets(containers = ChunkToCloSet.GenerationChunkHolder_redirects.class, method = @MethodSig("getLatestChunk()Lnet/minecraft/world/level/chunk/ChunkAccess;"))
-    @Nullable public CloAccess cc_getLatestClo() {
+    public @Nullable CloAccess cc_getLatestClo() {
         if (cc_cubePos != null) {
             return cc_getLatestCube();
         }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
index a28850f9..a8c16722 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/server/level/MixinServerChunkCache.java
@@ -91,7 +91,7 @@ public abstract class MixinServerChunkCache extends MixinChunkSource implements
 
     @Shadow @Final public ServerLevel level;
 
-    @Shadow @Nullable protected abstract ChunkHolder getVisibleChunkIfPresent(long pChunkPos);
+    @Shadow protected abstract @Nullable ChunkHolder getVisibleChunkIfPresent(long pChunkPos);
 
     @Shadow @Final Thread mainThread;
 
@@ -103,7 +103,7 @@ public abstract class MixinServerChunkCache extends MixinChunkSource implements
 
     @Shadow private long lastInhabitedUpdate;
 
-    @Shadow @Nullable private NaturalSpawner.SpawnState lastSpawnState;
+    @Shadow private @Nullable NaturalSpawner.SpawnState lastSpawnState;
 
     @Shadow protected abstract void getFullChunk(long chunkPos, Consumer<LevelChunk> fullChunkGetter);
 
@@ -126,7 +126,7 @@ private void cc_onInit(
     private native void cc_storeInCache(long pChunkPos, CubeAccess pChunk, ChunkStatus pChunkStatus);
 
     @TransformFromMethod(@MethodSig("getChunk(IILnet/minecraft/world/level/chunk/status/ChunkStatus;Z)Lnet/minecraft/world/level/chunk/ChunkAccess;"))
-    @Override @Nullable public native CubeAccess cc_getCube(int chunkX, @AddUnusedParam int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load);
+    @Override public native @Nullable CubeAccess cc_getCube(int chunkX, @AddUnusedParam int chunkY, int chunkZ, ChunkStatus requiredStatus, boolean load);
 
     // mixin-into-dasm to replace call to getChunk with getCube
     @Dynamic @Inject(method = "cc_dasm$cc_getCube", cancellable = true, at = @At(value = "INVOKE", target = "Ljava/util/concurrent/CompletableFuture;supplyAsync(Ljava/util/function/Supplier;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"))
@@ -155,7 +155,7 @@ private CompletableFuture cc_getCube_getChunkFutureMainThread(
     }
 
     @TransformFromMethod(@MethodSig("getChunkNow(II)Lnet/minecraft/world/level/chunk/LevelChunk;"))
-    @Override @Nullable public native LevelCube cc_getCubeNow(int pChunkX, @AddUnusedParam int chunkY, int pChunkZ);
+    @Override public native @Nullable LevelCube cc_getCubeNow(int pChunkX, @AddUnusedParam int chunkY, int pChunkZ);
 
     // The first two params are the x and z coordinates inside the call being redirected; the next three params are the x/y/z coordinates in the
     // params of getCubeNow
@@ -216,7 +216,7 @@ private CubePos cc_hasCube_posAsLong(int pX, int pZ, int pXRepeated, int pY, int
     }
 
     // TODO (P2) - lighting; currently unused. can probably be done with dasm and @AddUnusedParam
-    @Nullable public LightChunk cc_getCubeForLighting(int pChunkX, int chunkY, int pChunkZ) {
+    public @Nullable LightChunk cc_getCubeForLighting(int pChunkX, int chunkY, int pChunkZ) {
         throw new UnsupportedOperationException("not yet implemented");
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
index ea704db3..82c36b06 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinBlockCollisions.java
@@ -26,7 +26,7 @@
 @Mixin(BlockCollisions.class)
 public class MixinBlockCollisions {
     @Shadow @Final private CollisionGetter collisionGetter;
-    @Shadow @Nullable private BlockGetter cachedBlockGetter;
+    @Shadow private @Nullable BlockGetter cachedBlockGetter;
     @Shadow private long cachedBlockGetterPos;
     private boolean cc_isCubic;
 
@@ -41,7 +41,7 @@ private void cc_onInit(
         }
     }
 
-    @Nullable private BlockGetter cc_getCube(int x, int y, int z) {
+    private @Nullable BlockGetter cc_getCube(int x, int y, int z) {
         int cubeX = Coords.blockToCube(x);
         int cubeY = Coords.blockToCube(y);
         int cubeZ = Coords.blockToCube(z);
@@ -57,7 +57,7 @@ private void cc_onInit(
     }
 
     @WrapOperation(method = "computeNext", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/BlockCollisions;getChunk(II)Lnet/minecraft/world/level/BlockGetter;"))
-    @Nullable private BlockGetter cc_onComputeNext_getChunk(
+    private @Nullable BlockGetter cc_onComputeNext_getChunk(
             BlockCollisions instance, int x, int z, Operation<BlockGetter> original, @Local(ordinal = 1) int y
     ) {
         if (!cc_isCubic) {
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
index 48876716..7279aadd 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/mixin/core/common/world/level/MixinLevel.java
@@ -45,7 +45,7 @@
 @Dasm(ChunkToCloSet.class)
 @Mixin(Level.class)
 public abstract class MixinLevel implements CubicLevel, MarkableAsCubic, LevelAccessor {
-    @Shadow @Nullable public abstract ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus requestedStatus, boolean forceLoad);
+    @Shadow public abstract @Nullable ChunkAccess getChunk(int chunkX, int chunkZ, ChunkStatus requestedStatus, boolean forceLoad);
 
     @Shadow public abstract long getDayTime();
 
@@ -67,7 +67,7 @@ public LevelCube cc_getCube(int cubeX, int cubeY, int cubeZ) {
         return (LevelCube) this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.FULL);
     }
 
-    @Nullable @Override public CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus status, boolean forceLoad) {
+    @Override public @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus status, boolean forceLoad) {
         CubeAccess cubeaccess = ((CubeSource) this.getChunkSource()).cc_getCube(cubeX, cubeY, cubeZ, status, forceLoad);
         if (cubeaccess == null && forceLoad) {
             throw new IllegalStateException("Should always be able to create a cube!");
@@ -83,7 +83,7 @@ private void cc_init(CallbackInfo ci) {
         }
     }
 
-    @Override @Nullable public BlockGetter cc_getCubeForCollisions(int cubeX, int cubeY, int cubeZ) {
+    @Override public @Nullable BlockGetter cc_getCubeForCollisions(int cubeX, int cubeY, int cubeZ) {
         return this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.FULL, false);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
index 696d0e8e..2d199f5c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/server/level/CubeLevel.java
@@ -32,7 +32,7 @@ private CubeLevel() {}
     public static final int MAX_LEVEL = FULL_CHUNK_LEVEL + RADIUS_AROUND_FULL_CUBE;
 
     @AddMethodToSets(containers = ChunkToCubeSet.ChunkLevel_to_CubeLevel_redirects.class, method = @MethodSig("generationStatus(I)Lnet/minecraft/world/level/chunk/status/ChunkStatus;"))
-    @Nullable public static ChunkStatus cubeGenerationStatus(int level) {
+    public static @Nullable ChunkStatus cubeGenerationStatus(int level) {
         return getStatusAroundFullCube(level - FULL_CHUNK_LEVEL, null);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
index b1641cab..b87af93a 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/CubicLevelReader.java
@@ -13,19 +13,19 @@ public interface CubicLevelReader extends CubicCollisionGetter {
 
     @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus chunkStatus, boolean forceLoad);
 
-    @Nullable default CubeAccess cc_getCube(BlockPos blockPos) {
+    default @Nullable CubeAccess cc_getCube(BlockPos blockPos) {
         return this.cc_getCube(Coords.blockToCube(blockPos.getX()), Coords.blockToCube(blockPos.getY()), Coords.blockToCube(blockPos.getZ()));
     }
 
-    @Nullable default CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ) {
+    default @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ) {
         return this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.FULL, true);
     }
 
-    @Nullable default CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus requiredStatus) {
+    default @Nullable CubeAccess cc_getCube(int cubeX, int cubeY, int cubeZ, ChunkStatus requiredStatus) {
         return this.cc_getCube(cubeX, cubeY, cubeZ, requiredStatus, true);
     }
 
-    @Override @Nullable default BlockGetter cc_getCubeForCollisions(int cubeX, int cubeY, int cubeZ) {
+    @Override default @Nullable BlockGetter cc_getCubeForCollisions(int cubeX, int cubeY, int cubeZ) {
         return this.cc_getCube(cubeX, cubeY, cubeZ, ChunkStatus.EMPTY, false);
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
index cd55c655..2abb95d6 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/chunklike/CloAccess.java
@@ -161,5 +161,5 @@ void findBlocks(
 //    static record PackedTicks(SerializableTickContainer<Block> blocks, SerializableTickContainer<Fluid> fluids);
 
     // TODO forge method
-//    @Nullable public net.minecraft.world.level.LevelAccessor getWorldForge() { return null; }
+//    public @Nullable net.minecraft.world.level.LevelAccessor getWorldForge() { return null; }
 }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
index f653ad19..735deced 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/CubeAccess.java
@@ -65,10 +65,10 @@ public abstract class CubeAccess implements CloAccess {
     @Nullable @Deprecated
     private BiomeGenerationSettings carverBiomeSettings;
     // TODO (P3) NoiseChunk might need to be different
-    @Nullable protected NoiseChunk noiseChunk;
+    protected @Nullable NoiseChunk noiseChunk;
 
     protected final UpgradeData upgradeData;
-    @Nullable protected BlendingData blendingData;
+    protected @Nullable BlendingData blendingData;
     protected final Map<Heightmap.Types, Heightmap> heightmaps = Maps.newEnumMap(Heightmap.Types.class);
     protected ChunkSkyLightSources skyLightSources;
     private final Map<Structure, StructureStart> structureStarts = Maps.newHashMap();
@@ -115,9 +115,9 @@ private static void replaceMissingSections(Registry<Biome> biomeRegistry, LevelC
     @Override public native GameEventListenerRegistry getListenerRegistry(int sectionY);
 
     @TransformFromMethod(owner = @Ref(ChunkAccess.class), value = @MethodSig("setBlockState(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;)Lnet/minecraft/world/level/block/state/BlockState;"))
-    @Override @Nullable public native BlockState setBlockState(BlockPos pos, BlockState state);
+    @Override public native @Nullable BlockState setBlockState(BlockPos pos, BlockState state);
 
-    @Override @Nullable public abstract BlockState setBlockState(BlockPos pos, BlockState state, int flags);
+    @Override public abstract @Nullable BlockState setBlockState(BlockPos pos, BlockState state, int flags);
 
     @Override public abstract void setBlockEntity(BlockEntity blockEntity);
 
@@ -171,7 +171,7 @@ public CubePos cc_getCubePos() {
     }
 
     @TransformFromMethod(value = @MethodSig("getStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;)Lnet/minecraft/world/level/levelgen/structure/StructureStart;"), owner = @Ref(ChunkAccess.class))
-    @Override @Nullable public native StructureStart getStartForStructure(Structure structure);
+    @Override public native @Nullable StructureStart getStartForStructure(Structure structure);
 
     @TransformFromMethod(value = @MethodSig("setStartForStructure(Lnet/minecraft/world/level/levelgen/structure/Structure;Lnet/minecraft/world/level/levelgen/structure/StructureStart;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void setStartForStructure(Structure structure, StructureStart structureStart);
@@ -235,9 +235,9 @@ public CubePos cc_getCubePos() {
     @Override public native void setBlockEntityNbt(CompoundTag tag);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntityNbt(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/nbt/CompoundTag;"), owner = @Ref(ChunkAccess.class))
-    @Override @Nullable public native CompoundTag getBlockEntityNbt(BlockPos pos);
+    @Override public native @Nullable CompoundTag getBlockEntityNbt(BlockPos pos);
 
-    @Override @Nullable public abstract CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
+    @Override public abstract @Nullable CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
 
     @TransformFromMethod(value = @MethodSig("findBlockLightSources(Ljava/util/function/BiConsumer;)V"), owner = @Ref(ChunkAccess.class))
     @Override public native void findBlockLightSources(BiConsumer<BlockPos, BlockState> output);
@@ -290,7 +290,7 @@ public CubePos cc_getCubePos() {
     @Override public native boolean isOldNoiseGeneration();
 
     @TransformFromMethod(value = @MethodSig("getBlendingData()Lnet/minecraft/world/level/levelgen/blending/BlendingData;"), owner = @Ref(ChunkAccess.class))
-    @Override @Nullable public native BlendingData getBlendingData();
+    @Override public native @Nullable BlendingData getBlendingData();
 
     @TransformFromMethod(value = @MethodSig("getInhabitedTime()J"), owner = @Ref(ChunkAccess.class))
     @Override public native long getInhabitedTime();
@@ -339,7 +339,7 @@ public CubePos cc_getCubePos() {
     @TransformFromMethod(value = @MethodSig("hasAnyStructureReferences()Z"), owner = @Ref(ChunkAccess.class))
     @Override public native boolean hasAnyStructureReferences();
 
-    @Override @Nullable public BelowZeroRetrogen getBelowZeroRetrogen() {
+    @Override public @Nullable BelowZeroRetrogen getBelowZeroRetrogen() {
         return null; // No below-zero retrogen in cubic worlds :)
     }
 
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
index 3d33a959..0086de8c 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/LevelCube.java
@@ -81,8 +81,8 @@ public class LevelCube extends CubeAccess implements LevelClo {
     private final Map<BlockPos, RebindableTickingBlockEntityWrapper> tickersInLevel = Maps.newHashMap();
     private boolean loaded;
     final Level level;
-    @Nullable private Supplier<FullChunkStatus> fullStatus;
-    @Nullable private PostLoadProcessor postLoad;
+    private @Nullable Supplier<FullChunkStatus> fullStatus;
+    private @Nullable PostLoadProcessor postLoad;
     private final Int2ObjectMap<GameEventListenerRegistry> gameEventListenerRegistrySections;
     private final LevelChunkTicks<Block> blockTicks;
     private final LevelChunkTicks<Fluid> fluidTicks;
@@ -186,7 +186,7 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
 
     // TODO might be dasm-able eventually, if we get more powerful mixin tools
     @SuppressWarnings({ "checkstyle:CyclomaticComplexity", "checkstyle:NPathComplexity" }) // <-- copies structure of vanilla method
-    @Nullable @Override public BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
+    @Override public @Nullable BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
         var chunkSection = this.getSection(Coords.blockToIndex(pos));
         boolean wasOnlyAir = chunkSection.hasOnlyAir();
         if (wasOnlyAir && state.isAir()) {
@@ -269,14 +269,14 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @Override public native void addEntity(Entity entity);
 
     @TransformFromMethod(value = @MethodSig("createBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
-    @Nullable private native BlockEntity createBlockEntity(BlockPos pos);
+    private native @Nullable BlockEntity createBlockEntity(BlockPos pos);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
-    @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pos);
+    @Override public native @Nullable BlockEntity getBlockEntity(BlockPos pos);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/chunk/LevelChunk$EntityCreationType;)"
             + "Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
-    @Nullable public native BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
+    public native @Nullable BlockEntity getBlockEntity(BlockPos pos, LevelChunk.EntityCreationType creationType);
 
     @TransformFromMethod(value = @MethodSig("addAndRegisterBlockEntity(Lnet/minecraft/world/level/block/entity/BlockEntity;)V"), owner = @Ref(LevelChunk.class))
     public native void addAndRegisterBlockEntity(BlockEntity blockEntity);
@@ -291,7 +291,7 @@ public void setUnsavedListener(LevelCube.UnsavedListener unsavedListener) {
     @Override public native void setBlockEntity(BlockEntity blockEntity);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag;"), owner = @Ref(LevelChunk.class))
-    @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
+    @Override public native @Nullable CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
 
     @TransformFromMethod(value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(LevelChunk.class))
     @Override public native void removeBlockEntity(BlockPos pos);
@@ -362,7 +362,7 @@ public void postProcessGeneration(ServerLevel serverLevel) {
     }
 
     @TransformFromMethod(value = @MethodSig("promotePendingBlockEntity(Lnet/minecraft/core/BlockPos;Lnet/minecraft/nbt/CompoundTag;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(LevelChunk.class))
-    @Nullable private native BlockEntity promotePendingBlockEntity(BlockPos pos, CompoundTag tag);
+    private native @Nullable BlockEntity promotePendingBlockEntity(BlockPos pos, CompoundTag tag);
 
     @TransformFromMethod(value = @MethodSig("unpackTicks(J)V"), owner = @Ref(LevelChunk.class))
     public native void unpackTicks(long pos);
@@ -415,7 +415,7 @@ public void unregisterTickContainerFromLevel(ServerLevel level) {}
 //        return attachmentHolder.getData(type);
 //    }
 //
-//    @Override @Nullable public <T> T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
+//    @Override public <T> @Nullable T setData(net.neoforged.neoforge.attachment.AttachmentType<T> type, T data) {
 //        setUnsaved(true);
 //        return attachmentHolder.setData(type, data);
 //    }
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
index 37dace16..18504004 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/ProtoCube.java
@@ -47,11 +47,11 @@
 @Dasm(ChunkToCubeSet.class)
 public class ProtoCube extends CubeAccess implements ProtoClo {
     // Fields matching ProtoChunk
-    @Nullable private volatile LevelLightEngine lightEngine;
+    private volatile @Nullable LevelLightEngine lightEngine;
     private volatile ChunkStatus status;
     private final List<CompoundTag> entities;
-    @Nullable private CarvingMask carvingMask;
-    @Nullable private BelowZeroRetrogen belowZeroRetrogen;
+    private @Nullable CarvingMask carvingMask;
+    private @Nullable BelowZeroRetrogen belowZeroRetrogen;
     private final ProtoChunkTicks<Block> blockTicks;
     private final ProtoChunkTicks<Fluid> fluidTicks;
 
@@ -92,7 +92,7 @@ public ProtoCube(
     @TransformFromMethod(value = @MethodSig("getFluidState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/material/FluidState;"), owner = @Ref(ProtoChunk.class))
     @Override public native FluidState getFluidState(BlockPos pos);
 
-    @Nullable @Override public BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
+    @Override public @Nullable BlockState setBlockState(BlockPos pos, BlockState state, int flags) {
         int x = pos.getX();
         int y = pos.getY();
         int z = pos.getZ();
@@ -115,7 +115,7 @@ public ProtoCube(
     @Override public native void setBlockEntity(BlockEntity blockEntity);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntity(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/entity/BlockEntity;"), owner = @Ref(ProtoChunk.class))
-    @Override @Nullable public native BlockEntity getBlockEntity(BlockPos pos);
+    @Override public native @Nullable BlockEntity getBlockEntity(BlockPos pos);
 
     @TransformFromMethod(value = @MethodSig("getBlockEntities()Ljava/util/Map;"), owner = @Ref(ProtoChunk.class))
     @Override public native Map<BlockPos, BlockEntity> getBlockEntities();
@@ -157,13 +157,13 @@ public ProtoCube(
     @Override public native Map<BlockPos, CompoundTag> getBlockEntityNbts();
 
     @TransformFromMethod(value = @MethodSig("getBlockEntityNbtForSaving(Lnet/minecraft/core/BlockPos;Lnet/minecraft/core/HolderLookup$Provider;)Lnet/minecraft/nbt/CompoundTag;"), owner = @Ref(ProtoChunk.class))
-    @Override @Nullable public native CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
+    @Override public native @Nullable CompoundTag getBlockEntityNbtForSaving(BlockPos pos, HolderLookup.Provider provider);
 
     @TransformFromMethod(value = @MethodSig("removeBlockEntity(Lnet/minecraft/core/BlockPos;)V"), owner = @Ref(ProtoChunk.class))
     @Override public native void removeBlockEntity(BlockPos pos);
 
     @TransformFromMethod(value = @MethodSig("getCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"), owner = @Ref(ProtoChunk.class))
-    @Override @Nullable public native CarvingMask getCarvingMask();
+    @Override public native @Nullable CarvingMask getCarvingMask();
 
     @TransformFromMethod(value = @MethodSig("getOrCreateCarvingMask()Lnet/minecraft/world/level/chunk/CarvingMask;"), owner = @Ref(ProtoChunk.class))
     @Override public native CarvingMask getOrCreateCarvingMask();
diff --git a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
index a8f712ab..ab62a01b 100644
--- a/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
+++ b/src/main/java/io/github/opencubicchunks/cubicchunks/world/level/cube/status/CubeStep.java
@@ -57,7 +57,7 @@ public CompletableFuture<CubeAccess> apply(WorldGenContext worldGenContext, Stat
     public static class Builder {
         private final ChunkStatus status;
         @AddFieldToSets(containers = ChunkToCubeSet.ChunkStep$Builder_to_CubeStep$Builder_redirects.class, field = @FieldSig(type = @Ref(CubeStep.class), name = "parent"))
-        @Nullable private final CubeStep parent;
+        private final @Nullable CubeStep parent;
         private ChunkStatus[] directDependenciesByRadius;
         private int blockStateWriteRadius = -1;
         @AddFieldToSets(containers = ChunkToCubeSet.ChunkStep$Builder_to_CubeStep$Builder_redirects.class, field = @FieldSig(type = @Ref(ChunkStatusTask.class), name = "task"))
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
index 4ee38f67..63e56709 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/server/level/TestCubicDistanceManager.java
@@ -45,11 +45,11 @@ static class TestDistanceManager extends DistanceManager {
             return false;
         }
 
-        @Nullable @Override protected ChunkHolder getChunk(long chunkPos) {
+        @Override protected @Nullable ChunkHolder getChunk(long chunkPos) {
             return null;
         }
 
-        @Nullable @Override protected ChunkHolder updateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel) {
+        @Override protected @Nullable ChunkHolder updateChunkScheduling(long chunkPos, int newLevel, @Nullable ChunkHolder holder, int oldLevel) {
             return null;
         }
     }
diff --git a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
index 4cb010d1..eb919666 100644
--- a/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
+++ b/src/test/java/io/github/opencubicchunks/cubicchunks/test/world/level/cube/TestCubeAccess.java
@@ -90,7 +90,7 @@ static class CubeAccessTestImpl extends CubeAccess {
             return null;
         }
 
-        @Nullable @Override public BlockEntity getBlockEntity(BlockPos pos) {
+        @Override public @Nullable BlockEntity getBlockEntity(BlockPos pos) {
             return null;
         }