From fbd59a9c7ebcb167ec6170b70217bb4a410895f4 Mon Sep 17 00:00:00 2001
From: JohnBraham <johnbraham1978@outlook.com>
Date: Tue, 20 Oct 2026 13:49:55 +0100
Subject: [PATCH] Update terrain smoothing integration and source readability

---
 .editorconfig                                 |  10 +
 CONTRIBUTING.md                               |  15 +
 README.md                                     |   2 +-
 build.gradle                                  |  13 +-
 docs/BUILDING.md                              |  39 +-
 gradle/content-dependencies.properties        |   6 +-
 .../skysterrainsmoother/probe/CaveProbe.java  | 433 +++++---
 .../probe/ClientProbe.java                    | 117 ++-
 .../probe/ClientStatus.java                   |   8 +-
 .../probe/LateTerrainProbe.java               | 295 ++++--
 .../skysterrainsmoother/probe/ProbeProxy.java |   6 +-
 .../probe/RuntimeProbe.java                   | 986 +++++++++++++-----
 .../SkysTerrainSmoother.java                  |  84 +-
 .../api/TerrainMaterial.java                  |  77 +-
 .../api/TerrainSmoothingApi.java              |  50 +-
 .../client/ClientProxy.java                   |  11 +-
 .../client/CommonProxy.java                   |   5 +-
 .../content/SandContent.java                  |  17 +-
 .../content/SandSlabBlock.java                | 141 ++-
 .../content/SandSlabItem.java                 |  75 +-
 .../internal/BuiltInMaterials.java            | 120 ++-
 .../internal/EmptyAccess.java                 |  40 +-
 .../internal/ExistingChunkIndex.java          |  58 +-
 .../internal/Footprint.java                   |  66 +-
 .../internal/MaterialCatalogue.java           | 243 ++++-
 .../internal/SmoothingEngine.java             | 656 ++++++++----
 .../internal/StructureProtection.java         |  42 +-
 .../mc/skysterrainsmoother/CatalogueTest.java | 142 ++-
 .../ExistingChunkIndexTest.java               |  42 +-
 .../mc/skysterrainsmoother/FootprintTest.java |  82 +-
 .../ProjectContractTest.java                  | 153 ++-
 .../PublicationContractTest.java              |  33 +-
 style/eclipse-java-formatter.xml              |  56 +
 33 files changed, 3035 insertions(+), 1088 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 CONTRIBUTING.md
 create mode 100644 style/eclipse-java-formatter.xml

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..192b055
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*.java]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+max_line_length = 120
+trim_trailing_whitespace = true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..13fa9f2
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,15 @@
+# Contributing
+
+Keep the code easy to read and straightforward to review.
+
+- Use four spaces, UTF-8 and LF line endings. Aim for 120 columns; do not split a registry ID or other literal just to meet the limit.
+- Put each statement on its own line and use braces for conditional and loop bodies, including early returns.
+- Leave a blank line between logical steps. Keep related assignments together rather than separating every line.
+- Name variables for their role. Use `inventorySlot`, `cellX` or `chunkX` when that context matters, rather than a single letter or a type abbreviation. Keep established names such as `world` and `state` when their meaning is already clear.
+- Declare separate local values on separate lines. Explain packed masks and coordinate conventions where the names cannot tell the whole story.
+- Write comments in plain English. Explain a decision, save-format constraint or surprising API behaviour instead of repeating what the next line says.
+- Document public extension points, including when they can be called and what they preserve. Keep comments current when behaviour changes.
+
+For Eclipse, import [the Java formatter profile](style/eclipse-java-formatter.xml) under **Java > Code Style > Formatter** and select **Sky Java**. The formatter handles layout; braces and logical grouping still need a quick human review.
+
+Treat registry IDs, metadata palettes, configuration keys and saved NBT fields as compatibility contracts. A readability change should not alter them. Keep behavioural changes separate and run the relevant tests before submitting a pull request. See [the build guide](docs/BUILDING.md) for this branch's toolchain and checks.
diff --git a/README.md b/README.md
index 556cd76..3ece957 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ slabs for beaches and desert slopes.
 
 This beta is for Minecraft 1.10.2 and Forge 12.18.3.2511. Install Terrain
 Smoother 0.1.0.110021, Grass Slabs 1.1.0.110021 and Building Pieces
-0.3.0.110021 together on the client and server. Mineralogy is optional.
+0.3.6.110021 together on the client and server. Mineralogy is optional.
 
 ## Smoothing levels
 
diff --git a/build.gradle b/build.gradle
index 7641b77..110f799 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,15 +62,24 @@ tasks.withType(JavaCompile).configureEach {
 def grassSlabsDirectory = file(providers.gradleProperty('grassSlabsDirectory').getOrElse('../..' + '/SkysGrassSlabs110/SkysGrassSlabs'))
 def buildingPiecesDirectory = file(providers.gradleProperty('buildingPiecesDirectory').getOrElse('../..' + '/SkysBuildingPieces110/SkysBuildingPieces'))
 def grassSlabsDevelopmentJar = new File(grassSlabsDirectory, 'build/libs-dev/SkysGrassSlabs-1.1.0.110021-deobf.jar')
-def buildingPiecesDevelopmentJar = new File(buildingPiecesDirectory, 'build/libs-dev/SkysBuildingPieces-0.3.0.110021-deobf.jar')
 def contentLock=new Properties()
 file('gradle/content-dependencies.properties').withInputStream { contentLock.load(it) }
+
+def localPiecesVersion = providers.gradleProperty('buildingPiecesCoreVersion')
+if (localPiecesVersion.isPresent() &&
+        (System.getenv('CI') != null || !providers.gradleProperty('buildingPiecesDirectory').isPresent())) {
+    throw new GradleException('A local core-version override needs an explicit core directory and is not allowed in CI.')
+}
+def piecesVersion = localPiecesVersion.getOrElse(contentLock.getProperty('pieces.version'))
+def buildingPiecesDevelopmentJar = new File(buildingPiecesDirectory,
+        "build/libs-dev/SkysBuildingPieces-${piecesVersion}-deobf.jar")
 def verifyContentDependencies=tasks.register('verifyContentDependencies') {
     doLast {
         [grass:grassSlabsDirectory,pieces:buildingPiecesDirectory].each { name,directory ->
             Properties metadata=new Properties()
             new File(directory,'gradle.properties').withInputStream { metadata.load(it) }
-            if(metadata.mod_version!=contentLock.getProperty(name+'.version'))
+            String expectedVersion = name == 'pieces' ? piecesVersion : contentLock.getProperty(name + '.version')
+            if(metadata.mod_version!=expectedVersion)
                 throw new GradleException('Content dependency version does not match its lock: '+name)
             if(System.getenv('CI')!=null) {
                 Process git=new ProcessBuilder('git','-C',directory.path,'rev-parse','HEAD').start()
diff --git a/docs/BUILDING.md b/docs/BUILDING.md
index efbd47b..34fb9f3 100644
--- a/docs/BUILDING.md
+++ b/docs/BUILDING.md
@@ -1,23 +1,28 @@
 # Building from source
 
-Use Java 17 for Gradle and Temurin 8.0.502+7 for production. Set `STS_JAVA8_HOME`
-to the Java 8 installation. The wrapper uses Gradle 9.6.1 and ForgeGradle
-7.0.34 with stable 29-1.10.2 mappings.
+Use the Gradle 9.6.1 wrapper with Java 17 and Temurin 8.0.502+7 for production.
+Set `STS_JAVA8_HOME` to the Java 8 installation. This branch targets
+Minecraft 1.10.2 with ForgeGradle 7.0.34.
 
-Build the Grass Slabs and Building Pieces source commits recorded in
+Build the exact Grass Slabs and Building Pieces source commits listed in
 `gradle/content-dependencies.properties` with their `jar` tasks first.
-Then run `gradlew check build javadoc verifyReleaseArtifacts
-writeReleaseChecksums verifyEclipseProductionClasspath` here.
 
-The default layout uses sibling Grass Slabs and Building Pieces 1.10
-checkouts. Elsewhere, pass `-PgrassSlabsDirectory=<checkout>` and
-`-PbuildingPiecesDirectory=<checkout>`. Development dependencies use their
-deobfuscated jars; packaged games use the normal main jars. No dependency
-classes or assets are bundled.
+The default layout uses sibling checkouts. For another layout, pass
+`-PgrassSlabsDirectory=<checkout>` and
+`-PbuildingPiecesDirectory=<checkout>`.
+Then run:
 
-The build-only integration mod exercises real Forge startup, grass lifecycle,
-every footprint, player-tracked chunk generation and a saved-world reload.
-It is absent from production artifacts and ordinary Eclipse runs. Use
-`genEclipseRuns eclipse` to regenerate those runs. CI builds the pinned content
-mods first. Publication remains disabled until this mod has its own CurseForge
-project.
+```text
+gradlew check build javadoc verifyReleaseArtifacts writeReleaseChecksums verifyEclipseProductionClasspath
+```
+
+Development dependencies use deobfuscated jars. Packaged games use the normal
+main jars; dependency classes and assets are not bundled. CI builds the exact
+pinned commits rather than moving branches.
+
+A local-only `buildingPiecesCoreVersion` override can test another core
+candidate. It requires an explicit core directory and is rejected in CI.
+
+Use `genEclipseRuns eclipse` to prepare the Java 8 IDE setup. Ordinary launches
+exclude unit tests and build-only runtime probes. Publication remains disabled
+until this mod has its own CurseForge project.
diff --git a/gradle/content-dependencies.properties b/gradle/content-dependencies.properties
index 73c6780..35858e7 100644
--- a/gradle/content-dependencies.properties
+++ b/gradle/content-dependencies.properties
@@ -1,6 +1,6 @@
 grass.repository=SkyBlade1978/SkysGrassSlabs
-grass.commit=95c11e25bd8dad7398e05104277aa6cb522719bc
+grass.commit=5ebc77d3e1195e4c537994ad3ffe0f234332321f
 grass.version=1.1.0.110021
 pieces.repository=SkyBlade1978/SkysBuildingPieces
-pieces.commit=f21616d4e4bfe09dcf25490a3568fd846a820792
-pieces.version=0.3.0.110021
+pieces.commit=f55f53d0c6f29e741635f47234fbabba893bdffd
+pieces.version=0.3.6.110021
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/CaveProbe.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/CaveProbe.java
index f0ca517..9414771 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/CaveProbe.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/CaveProbe.java
@@ -21,167 +21,330 @@
 
 /** Real cave-floor regressions, never included in production launches or jars. */
 final class CaveProbe {
-    private static final int[] DX={0,1,0,-1},DZ={-1,0,1,0},CX={-1,1,1,-1},CZ={-1,-1,1,1};
-    private CaveProbe() { }
+    private static final int[] DX = { 0, 1, 0, -1 }, DZ = { -1, 0, 1, 0 }, CX = { -1, 1, 1, -1 }, CZ = { -1, -1, 1, 1 };
+
+    private CaveProbe() {
+    }
+
     static int run(WorldServer world) {
-        BlockPos floor=new BlockPos(3000,70,3000);
-        Chunk owner=world.getChunkFromBlockCoords(floor);
-        clear(world,floor,69,255);
-        fixture(world,floor,6);
-        world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(!world.isAirBlock(floor.up()),"cave floor below a roof receives a matching slab");
-        int checks=1;
-        TerrainMaterial stone=MaterialCatalogue.instance().source(Blocks.STONE.getDefaultState());
-        for(int level=1;level<=3;level++)for(int cardinal=0;cardinal<16;cardinal++)for(int diagonal=0;diagonal<16;diagonal++) {
-            fixture(world,floor,6);
-            for(int d=0;d<4;d++) {
-                if((cardinal&(1<<d))!=0)world.setBlockState(floor.add(DX[d],1,DZ[d]),Blocks.STONE.getDefaultState(),2);
-                if((diagonal&(1<<d))!=0)world.setBlockState(floor.add(CX[d],1,CZ[d]),Blocks.STONE.getDefaultState(),2);
+        BlockPos floor = new BlockPos(3000, 70, 3000);
+        Chunk owner = world.getChunkFromBlockCoords(floor);
+
+        clear(world, floor, 69, 255);
+        fixture(world, floor, 6);
+        world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        RuntimeProbe.require(!world.isAirBlock(floor.up()), "cave floor below a roof receives a matching slab");
+
+        int checks = 1;
+        TerrainMaterial stone = MaterialCatalogue.instance().source(Blocks.STONE.getDefaultState());
+
+        for (int level = 1; level <= 3; level++) {
+            for (int cardinal = 0; cardinal < 16; cardinal++) {
+                for (int diagonal = 0; diagonal < 16; diagonal++) {
+                    fixture(world, floor, 6);
+
+                    for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                        if ((cardinal & (1 << directionIndex)) != 0) {
+                            world.setBlockState(floor.add(DX[directionIndex], 1, DZ[directionIndex]),
+                                    Blocks.STONE.getDefaultState(), 2);
+                        }
+                        if ((diagonal & (1 << directionIndex)) != 0) {
+                            world.setBlockState(floor.add(CX[directionIndex], 1, CZ[directionIndex]),
+                                    Blocks.STONE.getDefaultState(), 2);
+                        }
+                    }
+
+                    IBlockState expected = MaterialCatalogue.instance().result(stone,
+                            Footprint.mask(cardinal, diagonal, level), level);
+
+                    SkysTerrainSmoother.engine.smooth(world, owner, level);
+                    RuntimeProbe.require(
+                            world.getBlockState(floor.up())
+                                    .equals(expected == null ? Blocks.AIR.getDefaultState() : expected),
+                            "roofed footprint " + level + "/" + cardinal + "/" + diagonal);
+                    checks++;
+                }
             }
-            IBlockState expected=MaterialCatalogue.instance().result(stone,Footprint.mask(cardinal,diagonal,level),level);
-            SkysTerrainSmoother.engine.smooth(world,owner,level);
-            RuntimeProbe.require(world.getBlockState(floor.up()).equals(expected==null?Blocks.AIR.getDefaultState():expected),"roofed footprint "+level+"/"+cardinal+"/"+diagonal);
-            checks++;
         }
+
         // The same column can contain independent floors at multiple depths.
-        fixture(world,floor,6);fixture(world,floor.up(16),6);
-        world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-        world.setBlockState(floor.up(16).east().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,3);
-        RuntimeProbe.require(!world.isAirBlock(floor.up())&&!world.isAirBlock(floor.up(17)),"stacked cave floors are both smoothed");checks++;
-        for(int air=1;air<=4;air++) {
-            fixture(world,floor,air+1);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,1);
-            RuntimeProbe.require(world.isAirBlock(floor.up())==(air<3),"low passage remains walkable: air height "+air);checks++;
+        fixture(world, floor, 6);
+        fixture(world, floor.up(16), 6);
+        world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+        world.setBlockState(floor.up(16).east().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 3);
+        RuntimeProbe.require(!world.isAirBlock(floor.up()) && !world.isAirBlock(floor.up(17)),
+                "stacked cave floors are both smoothed");
+        checks++;
+
+        for (int air = 1; air <= 4; air++) {
+            fixture(world, floor, air + 1);
+            world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+            SkysTerrainSmoother.engine.smooth(world, owner, 1);
+            RuntimeProbe.require(world.isAirBlock(floor.up()) == (air < 3),
+                    "low passage remains walkable: air height " + air);
+            checks++;
         }
-        for(IBlockState obstacle:new IBlockState[]{Blocks.WATER.getDefaultState(),Blocks.LAVA.getDefaultState(),Blocks.GLASS.getDefaultState(),Blocks.CHEST.getDefaultState()})for(int height=1;height<=3;height++) {
-            fixture(world,floor,6);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-            world.setBlockState(floor.up(height),obstacle,2);
-            SkysTerrainSmoother.engine.smooth(world,owner,1);
-            RuntimeProbe.require(height==1?world.getBlockState(floor.up()).equals(obstacle):world.isAirBlock(floor.up()),"fluid, occupied target or blocked headroom is protected");checks++;
+        for (IBlockState obstacle : new IBlockState[] { Blocks.WATER.getDefaultState(), Blocks.LAVA.getDefaultState(),
+                Blocks.GLASS.getDefaultState(), Blocks.CHEST.getDefaultState() }) {
+            for (int height = 1; height <= 3; height++) {
+                fixture(world, floor, 6);
+                world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+                world.setBlockState(floor.up(height), obstacle, 2);
+                SkysTerrainSmoother.engine.smooth(world, owner, 1);
+                RuntimeProbe.require(
+                        height == 1 ? world.getBlockState(floor.up()).equals(obstacle) : world.isAirBlock(floor.up()),
+                        "fluid, occupied target or blocked headroom is protected");
+                checks++;
+            }
         }
-        fixture(world,floor,6);
-        world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-        world.setBlockState(floor.north().up(2),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(world.isAirBlock(floor.up()),"solid cave wall is not a floor transition");checks++;
+
+        fixture(world, floor, 6);
+        world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+        world.setBlockState(floor.north().up(2), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        RuntimeProbe.require(world.isAirBlock(floor.up()), "solid cave wall is not a floor transition");
+        checks++;
         // An open column must still see a higher floor hidden under its neighbour's roof.
-        fixture(world,floor,6);world.setBlockToAir(floor.up(6));
-        world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(!world.isAirBlock(floor.up()),"cave entrance and outdoor floor join consistently");checks++;
-        for(IBlockState source:new IBlockState[]{Blocks.COAL_ORE.getDefaultState(),Blocks.GRAVEL.getDefaultState(),Blocks.PLANKS.getDefaultState(),Blocks.MONSTER_EGG.getDefaultState(),Blocks.CHEST.getDefaultState()}) {
-            fixture(world,floor,6);world.setBlockState(floor,source,2);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,1);
-            RuntimeProbe.require(world.isAirBlock(floor.up())&&world.getBlockState(floor).equals(source),"unregistered provider terrain, ores and tile sources remain intact");checks++;
+        fixture(world, floor, 6);
+        world.setBlockToAir(floor.up(6));
+        world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        RuntimeProbe.require(!world.isAirBlock(floor.up()), "cave entrance and outdoor floor join consistently");
+        checks++;
+
+        for (IBlockState source : new IBlockState[] { Blocks.COAL_ORE.getDefaultState(),
+                Blocks.GRAVEL.getDefaultState(), Blocks.PLANKS.getDefaultState(), Blocks.MONSTER_EGG.getDefaultState(),
+                Blocks.CHEST.getDefaultState() }) {
+            fixture(world, floor, 6);
+            world.setBlockState(floor, source, 2);
+            world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+            SkysTerrainSmoother.engine.smooth(world, owner, 1);
+            RuntimeProbe.require(world.isAirBlock(floor.up()) && world.getBlockState(floor).equals(source),
+                    "unregistered provider terrain, ores and tile sources remain intact");
+            checks++;
         }
-        int mineralogy=0;
-        for(TerrainMaterial material:MaterialCatalogue.instance().materials()) {
-            if(material.grass&&!GrassSlabsApi.grassGenerationAllowed()||material.mineralogy&&!SkysTerrainSmoother.mineralogy)continue;
-            for(IBlockState source:material.sources) {
-                fixture(world,floor,6);world.setBlockState(floor,source,2);world.setBlockState(floor.north().up(),source,2);
-                SkysTerrainSmoother.engine.smooth(world,owner,1);
-                RuntimeProbe.require(world.getBlockState(floor.up()).equals(material.slab),"cave uses the exact registered material: "+material.id);
-                RuntimeProbe.require(world.getBlockState(floor).equals(material.supportAfterPlacement==null?source:material.supportAfterPlacement),"native support identity is preserved or dirtified");
-                RuntimeProbe.require(world.getBlockState(floor.up(6)).getBlock()==Blocks.BRICK_BLOCK,"cave ceiling remains intact");checks+=3;
-                if(material.mineralogy)mineralogy++;
+
+        int mineralogy = 0;
+
+        for (TerrainMaterial material : MaterialCatalogue.instance().materials()) {
+            if (material.grass && !GrassSlabsApi.grassGenerationAllowed()
+                    || material.mineralogy && !SkysTerrainSmoother.mineralogy) {
+                continue;
+            }
+            for (IBlockState source : material.sources) {
+                fixture(world, floor, 6);
+                world.setBlockState(floor, source, 2);
+                world.setBlockState(floor.north().up(), source, 2);
+                SkysTerrainSmoother.engine.smooth(world, owner, 1);
+                RuntimeProbe.require(world.getBlockState(floor.up()).equals(material.slab),
+                        "cave uses the exact registered material: " + material.id);
+                RuntimeProbe
+                        .require(
+                                world.getBlockState(floor)
+                                        .equals(material.supportAfterPlacement == null ? source
+                                                : material.supportAfterPlacement),
+                                "native support identity is preserved or dirtified");
+                RuntimeProbe.require(world.getBlockState(floor.up(6)).getBlock() == Blocks.BRICK_BLOCK,
+                        "cave ceiling remains intact");
+                checks += 3;
+
+                if (material.mineralogy) {
+                    mineralogy++;
+                }
             }
         }
+
         // Structure bounds and add-on vetoes apply to underground floors as well.
-        MapGenStructureData data=(MapGenStructureData)world.getPerWorldStorage().getOrLoadData(MapGenStructureData.class,"Mineshaft");
-        if(data==null){data=new MapGenStructureData("Mineshaft");world.getPerWorldStorage().setData("Mineshaft",data);}
-        String key=MapGenStructureData.formatChunkCoords(owner.xPosition,owner.zPosition);
-        NBTTagCompound previous=data.getTagCompound().hasKey(key)?data.getTagCompound().getCompoundTag(key).copy():null;
+        MapGenStructureData data = (MapGenStructureData) world.getPerWorldStorage()
+                .getOrLoadData(MapGenStructureData.class, "Mineshaft");
+
+        if (data == null) {
+            data = new MapGenStructureData("Mineshaft");
+            world.getPerWorldStorage().setData("Mineshaft", data);
+        }
+
+        String key = MapGenStructureData.formatChunkCoords(owner.xPosition, owner.zPosition);
+        NBTTagCompound previous = data.getTagCompound().hasKey(key) ? data.getTagCompound().getCompoundTag(key).copy()
+                : null;
+
         try {
-            NBTTagCompound bounds=new NBTTagCompound();bounds.setIntArray("BB",new int[]{floor.getX()-2,69,floor.getZ()-2,floor.getX()+2,80,floor.getZ()+2});
-            data.writeInstance(bounds,owner.xPosition,owner.zPosition);
-            fixture(world,floor,6);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,1);
-            RuntimeProbe.require(world.isAirBlock(floor.up()),"mineshaft structure bounds are protected underground");checks++;
-        }finally{if(previous==null)data.getTagCompound().removeTag(key);else data.getTagCompound().setTag(key,previous);}
-        BlockPos veto=new BlockPos(floor.getX(),240,floor.getZ());fixture(world,veto,6);
-        world.setBlockState(veto.north().up(),Blocks.STONE.getDefaultState(),2);SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(world.isAirBlock(veto.up()),"underground add-on area veto");checks++;
-        checks+=lateDecoration(world,floor,owner);
-        checks+=oreDecoration(world,floor,owner);
-        checks+=manyFloors(world);
-        System.out.println("TERRAIN_SMOOTHER_CAVE_MATERIALS_PASS mineralogy="+mineralogy);
-        System.out.println("TERRAIN_SMOOTHER_CAVE_PASS checks="+checks);
+            NBTTagCompound bounds = new NBTTagCompound();
+
+            bounds.setIntArray("BB",
+                    new int[] { floor.getX() - 2, 69, floor.getZ() - 2, floor.getX() + 2, 80, floor.getZ() + 2 });
+            data.writeInstance(bounds, owner.xPosition, owner.zPosition);
+            fixture(world, floor, 6);
+            world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+            SkysTerrainSmoother.engine.smooth(world, owner, 1);
+            RuntimeProbe.require(world.isAirBlock(floor.up()), "mineshaft structure bounds are protected underground");
+            checks++;
+        } finally {
+            if (previous == null) {
+                data.getTagCompound().removeTag(key);
+            } else {
+                data.getTagCompound().setTag(key, previous);
+            }
+        }
+
+        BlockPos veto = new BlockPos(floor.getX(), 240, floor.getZ());
+
+        fixture(world, veto, 6);
+        world.setBlockState(veto.north().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        RuntimeProbe.require(world.isAirBlock(veto.up()), "underground add-on area veto");
+        checks++;
+        checks += lateDecoration(world, floor, owner);
+        checks += oreDecoration(world, floor, owner);
+        checks += manyFloors(world);
+        System.out.println("TERRAIN_SMOOTHER_CAVE_MATERIALS_PASS mineralogy=" + mineralogy);
+        System.out.println("TERRAIN_SMOOTHER_CAVE_PASS checks=" + checks);
         return checks;
     }
-    private static int lateDecoration(WorldServer world,BlockPos floor,Chunk owner) {
-        int checks=0;
-        for(int kind=0;kind<4;kind++) {
-            fixture(world,floor,6);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,1);
-            MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4)));
-            RuntimeProbe.require(!world.isAirBlock(floor.up()),"decorated cave cap retained until all later generators finish");
-            MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(world.getChunkProvider().chunkGenerator,world,new Random(1),owner.xPosition,owner.zPosition,false));
-            if(kind==0)world.setBlockState(floor,Blocks.MONSTER_EGG.getDefaultState(),2);
-            if(kind==1)world.setBlockState(floor,Blocks.SAND.getDefaultState(),2);
-            if(kind==2)world.setBlockState(floor.up(2),Blocks.BRICK_BLOCK.getDefaultState(),2);
-            if(kind==3){world.setBlockState(floor,Blocks.SAND.getDefaultState(),2);world.setBlockState(floor.up(),Blocks.GLASS.getDefaultState(),2);}
-            MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER,TickEvent.Phase.END,world));
-            RuntimeProbe.require(kind==1?world.getBlockState(floor.up()).getBlock()==zone.moddev.mc.skysterrainsmoother.content.SandContent.slab:kind==3?world.getBlockState(floor.up()).getBlock()==Blocks.GLASS:world.isAirBlock(floor.up()),"late infested stone, sand, low ceiling and provider-owned replacement are handled without excavation");checks+=2;
+
+    private static int lateDecoration(WorldServer world, BlockPos floor, Chunk owner) {
+        int checks = 0;
+
+        for (int kind = 0; kind < 4; kind++) {
+            fixture(world, floor, 6);
+            world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+            SkysTerrainSmoother.engine.smooth(world, owner, 1);
+            MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world, new Random(1),
+                    new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4)));
+            RuntimeProbe.require(!world.isAirBlock(floor.up()),
+                    "decorated cave cap retained until all later generators finish");
+            MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(world.getChunkProvider().chunkGenerator, world,
+                    new Random(1), owner.xPosition, owner.zPosition, false));
+
+            if (kind == 0) {
+                world.setBlockState(floor, Blocks.MONSTER_EGG.getDefaultState(), 2);
+            }
+            if (kind == 1) {
+                world.setBlockState(floor, Blocks.SAND.getDefaultState(), 2);
+            }
+            if (kind == 2) {
+                world.setBlockState(floor.up(2), Blocks.BRICK_BLOCK.getDefaultState(), 2);
+            }
+            if (kind == 3) {
+                world.setBlockState(floor, Blocks.SAND.getDefaultState(), 2);
+                world.setBlockState(floor.up(), Blocks.GLASS.getDefaultState(), 2);
+            }
+
+            MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER, TickEvent.Phase.END, world));
+            RuntimeProbe.require(
+                    kind == 1
+                            ? world.getBlockState(floor.up())
+                                    .getBlock() == zone.moddev.mc.skysterrainsmoother.content.SandContent.slab
+                            : kind == 3 ? world.getBlockState(floor.up()).getBlock() == Blocks.GLASS
+                                    : world.isAirBlock(floor.up()),
+                    "late infested stone, sand, low ceiling and provider-owned replacement are handled without excavation");
+            checks += 2;
         }
+
         return checks;
     }
-    private static int oreDecoration(WorldServer world,BlockPos floor,Chunk owner) {
-        int checks=0;
-        for(IBlockState ore:new IBlockState[]{Blocks.COAL_ORE.getDefaultState(),Blocks.IRON_ORE.getDefaultState(),Blocks.REDSTONE_ORE.getDefaultState(),Blocks.LIT_REDSTONE_ORE.getDefaultState(),RuntimeProbe.probeOre.getDefaultState()}) {
-            for(int level=1;level<=3;level++) {
-                fixture(world,floor,6);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-                SkysTerrainSmoother.engine.smooth(world,owner,level);
-                IBlockState cap=world.getBlockState(floor.up());
-                RuntimeProbe.require(cap.getBlock()!=Blocks.AIR,"ore regression starts with a generated piece");
-                world.setBlockState(floor,ore,2);
-                MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4)));
-                MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(world.getChunkProvider().chunkGenerator,world,new Random(1),owner.xPosition,owner.zPosition,false));
-                MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER,TickEvent.Phase.END,world));
-                RuntimeProbe.require(world.getBlockState(floor.up()).equals(cap),"ore under a generated piece stays hidden: "+ore+" / level "+level);
-                RuntimeProbe.require(world.getBlockState(floor).equals(ore),"ore support is never overwritten");checks+=3;
+
+    private static int oreDecoration(WorldServer world, BlockPos floor, Chunk owner) {
+        int checks = 0;
+
+        for (IBlockState ore : new IBlockState[] { Blocks.COAL_ORE.getDefaultState(), Blocks.IRON_ORE.getDefaultState(),
+                Blocks.REDSTONE_ORE.getDefaultState(), Blocks.LIT_REDSTONE_ORE.getDefaultState(),
+                RuntimeProbe.probeOre.getDefaultState() }) {
+            for (int level = 1; level <= 3; level++) {
+                fixture(world, floor, 6);
+                world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+                SkysTerrainSmoother.engine.smooth(world, owner, level);
+
+                IBlockState cap = world.getBlockState(floor.up());
+
+                RuntimeProbe.require(cap.getBlock() != Blocks.AIR, "ore regression starts with a generated piece");
+                world.setBlockState(floor, ore, 2);
+                MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world, new Random(1),
+                        new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4)));
+                MinecraftForge.EVENT_BUS.post(new PopulateChunkEvent.Post(world.getChunkProvider().chunkGenerator,
+                        world, new Random(1), owner.xPosition, owner.zPosition, false));
+                MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER, TickEvent.Phase.END, world));
+                RuntimeProbe.require(world.getBlockState(floor.up()).equals(cap),
+                        "ore under a generated piece stays hidden: " + ore + " / level " + level);
+                RuntimeProbe.require(world.getBlockState(floor).equals(ore), "ore support is never overwritten");
+                checks += 3;
             }
         }
-        fixture(world,floor,6);world.setBlockState(floor.north().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        world.setBlockState(floor,Blocks.COAL_ORE.getDefaultState(),2);world.setBlockState(floor.up(2),Blocks.BRICK_BLOCK.getDefaultState(),2);
-        MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER,TickEvent.Phase.END,world));
-        RuntimeProbe.require(world.isAirBlock(floor.up())&&world.getBlockState(floor).getBlock()==Blocks.COAL_ORE,"ore preservation does not override cave headroom protection");checks++;
-        fixture(world,floor,6);
-        world.setBlockState(floor.north().up(),Blocks.COAL_ORE.getDefaultState(),2);
-        world.setBlockState(floor.north().up(2),MaterialCatalogue.instance().source(Blocks.STONE.getDefaultState()).slab,2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(!world.isAirBlock(floor.up()),"neighbouring retained ore cap still represents a higher logical floor");checks++;
-        System.out.println("TERRAIN_SMOOTHER_ORE_SUPPORT_PASS checks="+checks);
+
+        fixture(world, floor, 6);
+        world.setBlockState(floor.north().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        world.setBlockState(floor, Blocks.COAL_ORE.getDefaultState(), 2);
+        world.setBlockState(floor.up(2), Blocks.BRICK_BLOCK.getDefaultState(), 2);
+        MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(Side.SERVER, TickEvent.Phase.END, world));
+        RuntimeProbe.require(world.isAirBlock(floor.up()) && world.getBlockState(floor).getBlock() == Blocks.COAL_ORE,
+                "ore preservation does not override cave headroom protection");
+        checks++;
+        fixture(world, floor, 6);
+        world.setBlockState(floor.north().up(), Blocks.COAL_ORE.getDefaultState(), 2);
+        world.setBlockState(floor.north().up(2),
+                MaterialCatalogue.instance().source(Blocks.STONE.getDefaultState()).slab, 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+        RuntimeProbe.require(!world.isAirBlock(floor.up()),
+                "neighbouring retained ore cap still represents a higher logical floor");
+        checks++;
+        System.out.println("TERRAIN_SMOOTHER_ORE_SUPPORT_PASS checks=" + checks);
         return checks;
     }
+
     private static int manyFloors(WorldServer world) {
-        Chunk owner=world.getChunkFromChunkCoords(200,200);
-        net.minecraft.world.chunk.storage.ExtendedBlockStorage[] sections=owner.getBlockStorageArray();
-        for(int section=0;section<16;section++)sections[section]=new net.minecraft.world.chunk.storage.ExtendedBlockStorage(section*16,true);
-        for(int z=0;z<16;z++)for(int x=0;x<16;x++) {
-            for(int y=32;y<232;y+=8) {int floorY=y+((x+z)&1);sections[floorY>>4].set(x,floorY&15,z,Blocks.STONE.getDefaultState());}
-            sections[15].set(x,246&15,z,Blocks.BRICK_BLOCK.getDefaultState());owner.getHeightMap()[x|z<<4]=247;
+        Chunk owner = world.getChunkFromChunkCoords(200, 200);
+        net.minecraft.world.chunk.storage.ExtendedBlockStorage[] sections = owner.getBlockStorageArray();
+
+        for (int section = 0; section < 16; section++) {
+            sections[section] = new net.minecraft.world.chunk.storage.ExtendedBlockStorage(section * 16, true);
+        }
+        for (int blockZ = 0; blockZ < 16; blockZ++) {
+            for (int blockX = 0; blockX < 16; blockX++) {
+                for (int blockY = 32; blockY < 232; blockY += 8) {
+                    int floorY = blockY + ((blockX + blockZ) & 1);
+
+                    sections[floorY >> 4].set(blockX, floorY & 15, blockZ, Blocks.STONE.getDefaultState());
+                }
+
+                sections[15].set(blockX, 246 & 15, blockZ, Blocks.BRICK_BLOCK.getDefaultState());
+                owner.getHeightMap()[blockX | blockZ << 4] = 247;
+            }
         }
-        int countBefore=world.getChunkProvider().getLoadedChunkCount();
-        int placed=SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(placed>256,"decision buffer covers multiple floors across all 256 columns");
-        RuntimeProbe.require(world.getChunkProvider().getLoadedChunkCount()==countBefore,"cave scan never loads a halo chunk");
-        int second=SkysTerrainSmoother.engine.smooth(world,owner,1);
-        RuntimeProbe.require(second==0,"repeated floor scan never stacks new caps");
-        System.out.println("TERRAIN_SMOOTHER_CAVE_BUFFER_PASS placed="+placed);
+
+        int countBefore = world.getChunkProvider().getLoadedChunkCount();
+        int placed = SkysTerrainSmoother.engine.smooth(world, owner, 1);
+
+        RuntimeProbe.require(placed > 256, "decision buffer covers multiple floors across all 256 columns");
+        RuntimeProbe.require(world.getChunkProvider().getLoadedChunkCount() == countBefore,
+                "cave scan never loads a halo chunk");
+
+        int second = SkysTerrainSmoother.engine.smooth(world, owner, 1);
+
+        RuntimeProbe.require(second == 0, "repeated floor scan never stacks new caps");
+        System.out.println("TERRAIN_SMOOTHER_CAVE_BUFFER_PASS placed=" + placed);
         return 3;
     }
-    private static void clear(WorldServer world,BlockPos floor,int minY,int maxY) {
-        for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++)for(int y=minY;y<=maxY;y++)
-            world.setBlockToAir(new BlockPos(floor.getX()+x,y,floor.getZ()+z));
+
+    private static void clear(WorldServer world, BlockPos floor, int minY, int maxY) {
+        for (int blockZ = -2; blockZ <= 2; blockZ++) {
+            for (int blockX = -2; blockX <= 2; blockX++) {
+                for (int blockY = minY; blockY <= maxY; blockY++) {
+                    world.setBlockToAir(new BlockPos(floor.getX() + blockX, blockY, floor.getZ() + blockZ));
+                }
+            }
+        }
     }
-    private static void fixture(WorldServer world,BlockPos floor,int roofOffset) {
-        clear(world,floor,floor.getY(),floor.getY()+8);
-        for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++) {
-            world.setBlockState(floor.add(x,0,z),Blocks.STONE.getDefaultState(),2);
-            world.setBlockState(floor.add(x,roofOffset,z),Blocks.BRICK_BLOCK.getDefaultState(),2);
+
+    private static void fixture(WorldServer world, BlockPos floor, int roofOffset) {
+        clear(world, floor, floor.getY(), floor.getY() + 8);
+
+        for (int blockZ = -2; blockZ <= 2; blockZ++) {
+            for (int blockX = -2; blockX <= 2; blockX++) {
+                world.setBlockState(floor.add(blockX, 0, blockZ), Blocks.STONE.getDefaultState(), 2);
+                world.setBlockState(floor.add(blockX, roofOffset, blockZ), Blocks.BRICK_BLOCK.getDefaultState(), 2);
+            }
         }
     }
 }
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientProbe.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientProbe.java
index 6b905f4..2cd6468 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientProbe.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientProbe.java
@@ -1,47 +1,104 @@
 package zone.moddev.mc.skysterrainsmoother.probe;
+
 import java.io.*;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.gameevent.TickEvent;
+
 public final class ClientProbe extends ProbeProxy {
     private boolean ran;
     private boolean integrated;
-    @Override public void init(){
-        net.minecraftforge.client.model.ModelLoader.setCustomModelResourceLocation(net.minecraft.item.Item.getItemFromBlock(RuntimeProbe.probeOre),0,
-                new net.minecraft.client.renderer.block.model.ModelResourceLocation("minecraft:stone","inventory"));
-        net.minecraftforge.client.model.ModelLoader.setCustomStateMapper(RuntimeProbe.probeOre,new net.minecraft.client.renderer.block.statemap.StateMapperBase(){
-            @Override protected net.minecraft.client.renderer.block.model.ModelResourceLocation getModelResourceLocation(net.minecraft.block.state.IBlockState state){
-                return new net.minecraft.client.renderer.block.model.ModelResourceLocation("minecraft:stone","normal");
-            }
-        });
+
+    @Override
+    public void init() {
+        net.minecraftforge.client.model.ModelLoader.setCustomModelResourceLocation(
+                net.minecraft.item.Item.getItemFromBlock(RuntimeProbe.probeOre), 0,
+                new net.minecraft.client.renderer.block.model.ModelResourceLocation("minecraft:stone", "inventory"));
+        net.minecraftforge.client.model.ModelLoader.setCustomStateMapper(RuntimeProbe.probeOre,
+                new net.minecraft.client.renderer.block.statemap.StateMapperBase() {
+                    @Override
+                    protected net.minecraft.client.renderer.block.model.ModelResourceLocation getModelResourceLocation(
+                            net.minecraft.block.state.IBlockState state) {
+                        return new net.minecraft.client.renderer.block.model.ModelResourceLocation("minecraft:stone",
+                                "normal");
+                    }
+                });
         MinecraftForge.EVENT_BUS.register(this);
     }
-    @SubscribeEvent public void tick(TickEvent.ClientTickEvent event) {
-        Minecraft mc=Minecraft.getMinecraft();if(event.phase!=TickEvent.Phase.END)return;
-        if(ran){if(integrated&&ClientStatus.complete){System.out.println("TERRAIN_SMOOTHER_CLIENT_WORLD_PASS");mc.shutdown();integrated=false;}return;}
-        if(mc.currentScreen==null)return;ran=true;
+
+    @SubscribeEvent
+    public void tick(TickEvent.ClientTickEvent event) {
+        Minecraft minecraft = Minecraft.getMinecraft();
+
+        if (event.phase != TickEvent.Phase.END) {
+            return;
+        }
+        if (ran) {
+            if (integrated && ClientStatus.complete) {
+                System.out.println("TERRAIN_SMOOTHER_CLIENT_WORLD_PASS");
+                minecraft.shutdown();
+                integrated = false;
+            }
+
+            return;
+        }
+        if (minecraft.currentScreen == null) {
+            return;
+        }
+
+        ran = true;
+
         try {
-            checkModel(mc,RuntimeProbe.probeOre.getDefaultState());
-            for(net.minecraft.block.state.IBlockState state:zone.moddev.mc.skysgrassslabs.init.ModBlocks.GRASS_SLAB.getBlockState().getValidStates())checkModel(mc,state);
-            for(zone.moddev.mc.skysbuildingpieces.content.PieceBlock block:zone.moddev.mc.skysbuildingpieces.content.Pieces.BLOCKS.values())
-                for(net.minecraft.block.state.IBlockState state:block.getBlockState().getValidStates()) {
-                    if(state.getValue(zone.moddev.mc.skysbuildingpieces.content.PieceBlock.META)/block.palette.shape.states>=block.palette.materials.size())continue;
-                    checkModel(mc,state);
+            checkModel(minecraft, RuntimeProbe.probeOre.getDefaultState());
+
+            for (net.minecraft.block.state.IBlockState state : zone.moddev.mc.skysgrassslabs.init.ModBlocks.GRASS_SLAB
+                    .getBlockState().getValidStates()) {
+                checkModel(minecraft, state);
+            }
+            for (zone.moddev.mc.skysbuildingpieces.content.PieceBlock block : zone.moddev.mc.skysbuildingpieces.content.Pieces.BLOCKS
+                    .values()) {
+                for (net.minecraft.block.state.IBlockState state : block.getBlockState().getValidStates()) {
+                    if (state.getValue(zone.moddev.mc.skysbuildingpieces.content.PieceBlock.META)
+                            / block.palette.shape.states >= block.palette.materials.size()) {
+                        continue;
+                    }
+
+                    checkModel(minecraft, state);
                 }
-            try(Writer out=new FileWriter(new File(mc.mcDataDir,"terrain-smoother-client-pass.txt"))){out.write("TERRAIN_SMOOTHER_CLIENT_PASS\n");}
+            }
+            try (Writer writer = new FileWriter(new File(minecraft.mcDataDir, "terrain-smoother-client-pass.txt"))) {
+                writer.write("TERRAIN_SMOOTHER_CLIENT_PASS\n");
+            }
+
             System.out.println("TERRAIN_SMOOTHER_CLIENT_PASS");
-        }catch(IOException failure){throw new IllegalStateException(failure);}
-        if(System.getProperty("skysterrainsmoother.integrationPhase","").startsWith("client-")) {
-            integrated=true;mc.launchIntegratedServer("terrain-smoother-world","Terrain Smoother Test",
-                    new net.minecraft.world.WorldSettings(4815162342L,net.minecraft.world.GameType.CREATIVE,true,false,net.minecraft.world.WorldType.DEFAULT));
-        }else mc.shutdown();
+        } catch (IOException failure) {
+            throw new IllegalStateException(failure);
+        }
+        if (System.getProperty("skysterrainsmoother.integrationPhase", "").startsWith("client-")) {
+            integrated = true;
+            minecraft.launchIntegratedServer("terrain-smoother-world", "Terrain Smoother Test",
+                    new net.minecraft.world.WorldSettings(4815162342L, net.minecraft.world.GameType.CREATIVE, true,
+                            false, net.minecraft.world.WorldType.DEFAULT));
+        } else {
+            minecraft.shutdown();
+        }
     }
-    private static void checkModel(Minecraft mc,net.minecraft.block.state.IBlockState state) {
-        net.minecraft.client.renderer.block.model.IBakedModel model=mc.getBlockRendererDispatcher().getModelForState(state);
-        RuntimeProbe.require(model!=mc.getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel(),"missing model "+state);
-        for(net.minecraft.util.EnumFacing face:new net.minecraft.util.EnumFacing[]{null,net.minecraft.util.EnumFacing.DOWN,net.minecraft.util.EnumFacing.UP,net.minecraft.util.EnumFacing.NORTH,net.minecraft.util.EnumFacing.SOUTH,net.minecraft.util.EnumFacing.WEST,net.minecraft.util.EnumFacing.EAST})
-            for(net.minecraft.client.renderer.block.model.BakedQuad quad:model.getQuads(state,face,0))
-                RuntimeProbe.require(!quad.getSprite().getIconName().contains("missingno"),"missing texture "+state);
+
+    private static void checkModel(Minecraft minecraft, net.minecraft.block.state.IBlockState state) {
+        net.minecraft.client.renderer.block.model.IBakedModel model = minecraft.getBlockRendererDispatcher()
+                .getModelForState(state);
+
+        RuntimeProbe.require(model != minecraft.getBlockRendererDispatcher().getBlockModelShapes().getModelManager()
+                .getMissingModel(), "missing model " + state);
+
+        for (net.minecraft.util.EnumFacing face : new net.minecraft.util.EnumFacing[] { null,
+                net.minecraft.util.EnumFacing.DOWN, net.minecraft.util.EnumFacing.UP,
+                net.minecraft.util.EnumFacing.NORTH, net.minecraft.util.EnumFacing.SOUTH,
+                net.minecraft.util.EnumFacing.WEST, net.minecraft.util.EnumFacing.EAST }) {
+            for (net.minecraft.client.renderer.block.model.BakedQuad quad : model.getQuads(state, face, 0)) {
+                RuntimeProbe.require(!quad.getSprite().getIconName().contains("missingno"), "missing texture " + state);
+            }
+        }
     }
 }
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientStatus.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientStatus.java
index 5478a1d..e8738ff 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientStatus.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ClientStatus.java
@@ -1,2 +1,8 @@
 package zone.moddev.mc.skysterrainsmoother.probe;
-public final class ClientStatus {public static volatile boolean complete;private ClientStatus(){}}
+
+public final class ClientStatus {
+    public static volatile boolean complete;
+
+    private ClientStatus() {
+    }
+}
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/LateTerrainProbe.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/LateTerrainProbe.java
index 40dd38f..0cb279f 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/LateTerrainProbe.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/LateTerrainProbe.java
@@ -19,113 +19,230 @@
 
 /** Decoration-created grass and hardened-clay regressions, never shipped. */
 final class LateTerrainProbe {
-    private static final int[] DX={0,1,0,-1},DZ={-1,0,1,0},CX={-1,1,1,-1},CZ={-1,-1,1,1};
-    private LateTerrainProbe() { }
+    private static final int[] DX = { 0, 1, 0, -1 }, DZ = { -1, 0, 1, 0 }, CX = { -1, 1, 1, -1 }, CZ = { -1, -1, 1, 1 };
+
+    private LateTerrainProbe() {
+    }
+
     static int run(WorldServer world) {
-        MaterialCatalogue catalogue=MaterialCatalogue.instance();
-        IBlockState clay=Blocks.HARDENED_CLAY.getDefaultState();
-        TerrainMaterial material=catalogue.source(clay),grass=catalogue.source(Blocks.GRASS.getDefaultState());
-        RuntimeProbe.require(material!=null,"hardened clay is a smoothing source");
-        RuntimeProbe.require(material.slab.equals(BuildingPiecesApi.bottomPiece("minecraft:hardened_clay",BuildingPiecesApi.TerrainShape.SLAB,EnumFacing.NORTH)),"reuse existing clay slab without new registry IDs");
-        int checks=2,previousLevel=SkysTerrainSmoother.level;
-        BlockPos floor=new BlockPos(30008,220,30008);Chunk owner=world.getChunkFromBlockCoords(floor);
+        MaterialCatalogue catalogue = MaterialCatalogue.instance();
+        IBlockState clay = Blocks.HARDENED_CLAY.getDefaultState();
+        TerrainMaterial material = catalogue.source(clay);
+        TerrainMaterial grass = catalogue.source(Blocks.GRASS.getDefaultState());
+
+        RuntimeProbe.require(material != null, "hardened clay is a smoothing source");
+        RuntimeProbe.require(
+                material.slab.equals(BuildingPiecesApi.bottomPiece("minecraft:hardened_clay",
+                        BuildingPiecesApi.TerrainShape.SLAB, EnumFacing.NORTH)),
+                "reuse existing clay slab without new registry IDs");
+
+        int checks = 2;
+        int previousLevel = SkysTerrainSmoother.level;
+
+        BlockPos floor = new BlockPos(30008, 220, 30008);
+        Chunk owner = world.getChunkFromBlockCoords(floor);
+
         try {
-            for(int level=1;level<=3;level++)for(int direction=0;direction<4;direction++) {
-                SkysTerrainSmoother.level=level;
-                for(boolean diagonal:new boolean[]{false,true}) {
-                    fixture(world,floor,clay);
-                    BlockPos higher=floor.add(diagonal?CX[direction]:DX[direction],1,diagonal?CZ[direction]:DZ[direction]);
-                    world.setBlockState(higher,clay,2);
-                    int mask=Footprint.mask(diagonal?0:1<<direction,diagonal?1<<direction:0,level);
-                    IBlockState expected=catalogue.result(material,mask,level);
-                    SkysTerrainSmoother.engine.smooth(world,owner,level);
-                    RuntimeProbe.require(world.getBlockState(floor.up()).equals(expected==null?Blocks.AIR.getDefaultState():expected),"clay footprint level="+level+" direction="+direction+" diagonal="+diagonal);
-                    RuntimeProbe.require(world.getBlockState(floor).equals(clay),"clay support is never converted to grass or dirt");checks+=2;
-                }
+            for (int level = 1; level <= 3; level++) {
+                for (int direction = 0; direction < 4; direction++) {
+                    SkysTerrainSmoother.level = level;
+
+                    for (boolean diagonal : new boolean[] { false, true }) {
+                        fixture(world, floor, clay);
+
+                        BlockPos higher = floor.add(diagonal ? CX[direction] : DX[direction], 1,
+                                diagonal ? CZ[direction] : DZ[direction]);
+
+                        world.setBlockState(higher, clay, 2);
+
+                        int mask = Footprint.mask(diagonal ? 0 : 1 << direction, diagonal ? 1 << direction : 0, level);
+                        IBlockState expected = catalogue.result(material, mask, level);
+
+                        SkysTerrainSmoother.engine.smooth(world, owner, level);
+                        RuntimeProbe.require(
+                                world.getBlockState(floor.up())
+                                        .equals(expected == null ? Blocks.AIR.getDefaultState() : expected),
+                                "clay footprint level=" + level + " direction=" + direction + " diagonal=" + diagonal);
+                        RuntimeProbe.require(world.getBlockState(floor).equals(clay),
+                                "clay support is never converted to grass or dirt");
+                        checks += 2;
+                    }
 
-                // A flat clay surface has no cap in Pre. BOP subsequently adds
-                // oasis grass and a higher neighbouring clay surface.
-                fixture(world,floor,clay);
-                SkysTerrainSmoother.engine.smooth(world,owner,level);
-                RuntimeProbe.require(world.isAirBlock(floor.up()),"no initial cap on a flat clay surface");checks++;
-                world.setBlockState(floor,Blocks.GRASS.getDefaultState(),2);
-                world.setBlockState(floor.add(DX[direction],1,DZ[direction]),clay,2);
-                int loaded=world.getChunkProvider().getLoadedChunkCount();
-                post(world,owner);
-                IBlockState expected=GrassSlabsApi.grassGenerationAllowed()?catalogue.result(grass,Footprint.EDGES[direction],level):Blocks.AIR.getDefaultState();
-                RuntimeProbe.require(world.getBlockState(floor.up()).equals(expected),"late oasis grass gets its own grass cap beside clay");
-                RuntimeProbe.require(world.getBlockState(floor).equals(GrassSlabsApi.grassGenerationAllowed()?Blocks.DIRT.getDefaultState():Blocks.GRASS.getDefaultState()),"late grass support dirtification respects grass switch");
-                post(world,owner);
-                RuntimeProbe.require(world.getBlockState(floor.up()).equals(expected)&&world.isAirBlock(floor.up(2)),"repeated late pass is idempotent and does not stack caps");
-                RuntimeProbe.require(world.getChunkProvider().getLoadedChunkCount()==loaded,"late pass never loads a neighbour");checks+=4;
-
-                // Decoration owns occupied targets. Do not replace vegetation,
-                // fluids or a placed block to obtain the missing transition.
-                for(IBlockState occupied:new IBlockState[]{Blocks.TALLGRASS.getDefaultState(),Blocks.WATER.getDefaultState(),Blocks.GLASS.getDefaultState()}) {
-                    fixture(world,floor,Blocks.GRAVEL.getDefaultState());
-                    SkysTerrainSmoother.engine.smooth(world,owner,level);
-                    world.setBlockState(floor,Blocks.GRASS.getDefaultState(),2);
-                    world.setBlockState(floor.add(DX[direction],1,DZ[direction]),clay,2);
-                    world.setBlockState(floor.up(),occupied,2);post(world,owner);
-                    RuntimeProbe.require(world.getBlockState(floor.up()).equals(occupied),"late pass preserves occupied target "+occupied);
-                    RuntimeProbe.require(world.getBlockState(floor).getBlock()==Blocks.GRASS,"no support dirtification without successful placement");checks+=2;
+                    // A flat clay surface has no cap in Pre. BOP subsequently adds oasis grass and a higher
+                    // neighbouring clay surface.
+                    fixture(world, floor, clay);
+                    SkysTerrainSmoother.engine.smooth(world, owner, level);
+                    RuntimeProbe.require(world.isAirBlock(floor.up()), "no initial cap on a flat clay surface");
+                    checks++;
+                    world.setBlockState(floor, Blocks.GRASS.getDefaultState(), 2);
+                    world.setBlockState(floor.add(DX[direction], 1, DZ[direction]), clay, 2);
+
+                    int loaded = world.getChunkProvider().getLoadedChunkCount();
+
+                    post(world, owner);
+
+                    IBlockState expected = GrassSlabsApi.grassGenerationAllowed()
+                            ? catalogue.result(grass, Footprint.EDGES[direction], level)
+                            : Blocks.AIR.getDefaultState();
+
+                    RuntimeProbe.require(world.getBlockState(floor.up()).equals(expected),
+                            "late oasis grass gets its own grass cap beside clay");
+                    RuntimeProbe.require(
+                            world.getBlockState(floor)
+                                    .equals(GrassSlabsApi.grassGenerationAllowed() ? Blocks.DIRT.getDefaultState()
+                                            : Blocks.GRASS.getDefaultState()),
+                            "late grass support dirtification respects grass switch");
+                    post(world, owner);
+                    RuntimeProbe.require(
+                            world.getBlockState(floor.up()).equals(expected) && world.isAirBlock(floor.up(2)),
+                            "repeated late pass is idempotent and does not stack caps");
+                    RuntimeProbe.require(world.getChunkProvider().getLoadedChunkCount() == loaded,
+                            "late pass never loads a neighbour");
+                    checks += 4;
+
+                    // Decoration owns occupied targets. Do not replace vegetation, fluids or a placed block to obtain
+                    // the missing transition.
+                    for (IBlockState occupied : new IBlockState[] { Blocks.TALLGRASS.getDefaultState(),
+                            Blocks.WATER.getDefaultState(), Blocks.GLASS.getDefaultState() }) {
+                        fixture(world, floor, Blocks.GRAVEL.getDefaultState());
+                        SkysTerrainSmoother.engine.smooth(world, owner, level);
+                        world.setBlockState(floor, Blocks.GRASS.getDefaultState(), 2);
+                        world.setBlockState(floor.add(DX[direction], 1, DZ[direction]), clay, 2);
+                        world.setBlockState(floor.up(), occupied, 2);
+                        post(world, owner);
+                        RuntimeProbe.require(world.getBlockState(floor.up()).equals(occupied),
+                                "late pass preserves occupied target " + occupied);
+                        RuntimeProbe.require(world.getBlockState(floor).getBlock() == Blocks.GRASS,
+                                "no support dirtification without successful placement");
+                        checks += 2;
+                    }
                 }
             }
-        } finally { SkysTerrainSmoother.level=previousLevel; }
-        System.out.println("TERRAIN_SMOOTHER_CLAY_OASIS_PASS checks="+checks);
+        } finally {
+            SkysTerrainSmoother.level = previousLevel;
+        }
+
+        System.out.println("TERRAIN_SMOOTHER_CLAY_OASIS_PASS checks=" + checks);
         return checks;
     }
-    private static void fixture(WorldServer world,BlockPos floor,IBlockState source) {
-        for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++) {
-            for(int y=floor.getY()+1;y<256;y++)world.setBlockToAir(new BlockPos(floor.getX()+x,y,floor.getZ()+z));
-            world.setBlockState(floor.add(x,0,z),source,2);
+
+    private static void fixture(WorldServer world, BlockPos floor, IBlockState source) {
+        for (int blockZ = -2; blockZ <= 2; blockZ++) {
+            for (int blockX = -2; blockX <= 2; blockX++) {
+                for (int blockY = floor.getY() + 1; blockY < 256; blockY++) {
+                    world.setBlockToAir(new BlockPos(floor.getX() + blockX, blockY, floor.getZ() + blockZ));
+                }
+
+                world.setBlockState(floor.add(blockX, 0, blockZ), source, 2);
+            }
         }
     }
-    private static void post(WorldServer world,Chunk owner) {
-        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4)));
+
+    private static void post(WorldServer world, Chunk owner) {
+        MinecraftForge.EVENT_BUS.post(new DecorateBiomeEvent.Post(world, new Random(1),
+                new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4)));
     }
+
     static int generationOrder(WorldServer world) throws Exception {
-        int previousLevel=SkysTerrainSmoother.level;
+        int previousLevel = SkysTerrainSmoother.level;
+
         try {
-            for(int level=1;level<=3;level++) {
-                SkysTerrainSmoother.level=level;byte[][] hashes=new byte[2][];
-                for(int order=0;order<2;order++) {
-                    int origin=order==0?128:256;List<Chunk> chunks=new ArrayList<>();
-                    for(int z=0;z<9;z++)for(int x=0;x<9;x++)chunks.add(world.getChunkFromChunkCoords(origin+x,128+z));
-                    for(int z=0;z<144;z++)for(int x=0;x<144;x++) {
-                        int height=200+Math.floorMod(x*31+z*17+(x>>3)*(z>>3),3);
-                        Chunk chunk=chunks.get((x>>4)+(z>>4)*9);
-                        for(int y=170;y<256;y++) {
-                            net.minecraft.world.chunk.storage.ExtendedBlockStorage section=chunk.getBlockStorageArray()[y>>4];
-                            if(section==null)chunk.getBlockStorageArray()[y>>4]=section=new net.minecraft.world.chunk.storage.ExtendedBlockStorage(y&~15,true);
-                            section.set(x&15,y&15,z&15,Blocks.AIR.getDefaultState());
+            for (int level = 1; level <= 3; level++) {
+                SkysTerrainSmoother.level = level;
+
+                byte[][] hashes = new byte[2][];
+
+                for (int order = 0; order < 2; order++) {
+                    int origin = order == 0 ? 128 : 256;
+                    List<Chunk> chunks = new ArrayList<>();
+
+                    for (int blockZ = 0; blockZ < 9; blockZ++) {
+                        for (int blockX = 0; blockX < 9; blockX++) {
+                            chunks.add(world.getChunkFromChunkCoords(origin + blockX, 128 + blockZ));
+                        }
+                    }
+                    for (int blockZ = 0; blockZ < 144; blockZ++) {
+                        for (int blockX = 0; blockX < 144; blockX++) {
+                            int height = 200
+                                    + Math.floorMod(blockX * 31 + blockZ * 17 + (blockX >> 3) * (blockZ >> 3), 3);
+                            Chunk chunk = chunks.get((blockX >> 4) + (blockZ >> 4) * 9);
+
+                            for (int blockY = 170; blockY < 256; blockY++) {
+                                net.minecraft.world.chunk.storage.ExtendedBlockStorage section = chunk
+                                        .getBlockStorageArray()[blockY >> 4];
+
+                                if (section == null) {
+                                    chunk.getBlockStorageArray()[blockY >> 4] = section = new net.minecraft.world.chunk.storage.ExtendedBlockStorage(
+                                            blockY & ~15, true);
+                                }
+
+                                section.set(blockX & 15, blockY & 15, blockZ & 15, Blocks.AIR.getDefaultState());
+                            }
+
+                            chunk.getBlockStorageArray()[height >> 4].set(blockX & 15, height & 15, blockZ & 15,
+                                    Blocks.HARDENED_CLAY.getDefaultState());
+                            chunk.getHeightMap()[(blockX & 15) | ((blockZ & 15) << 4)] = height + 1;
                         }
-                        chunk.getBlockStorageArray()[height>>4].set(x&15,height&15,z&15,Blocks.HARDENED_CLAY.getDefaultState());
-                        chunk.getHeightMap()[(x&15)|((z&15)<<4)]=height+1;
                     }
-                    if(order==1)Collections.reverse(chunks);
-                    for(Chunk chunk:chunks)SkysTerrainSmoother.engine.smooth(world,chunk,level);
-                    // Introduce grass after the initial pass, including beneath
-                    // clay caps, to model decoration changing the full surface.
-                    for(int z=0;z<144;z++)for(int x=0;x<144;x++)if((x+z)%5==0) {
-                        int height=200+Math.floorMod(x*31+z*17+(x>>3)*(z>>3),3);
-                        // Resolve by coordinate, not traversal order.
-                        Chunk chunk=world.getChunkProvider().getLoadedChunk(origin+(x>>4),128+(z>>4));
-                        chunk.setBlockState(new BlockPos((origin<<4)+x,height,(128<<4)+z),Blocks.GRASS.getDefaultState());
+                    if (order == 1) {
+                        Collections.reverse(chunks);
+                    }
+                    for (Chunk chunk : chunks) {
+                        SkysTerrainSmoother.engine.smooth(world, chunk, level);
+                    }
+                    // Introduce grass after the initial pass, including beneath clay caps, to model decoration changing
+                    // the full surface.
+                    for (int blockZ = 0; blockZ < 144; blockZ++) {
+                        for (int blockX = 0; blockX < 144; blockX++) {
+                            if ((blockX + blockZ) % 5 == 0) {
+                                int height = 200
+                                        + Math.floorMod(blockX * 31 + blockZ * 17 + (blockX >> 3) * (blockZ >> 3), 3);
+                                // Resolve by coordinate, not traversal order.
+                                Chunk chunk = world.getChunkProvider().getLoadedChunk(origin + (blockX >> 4),
+                                        128 + (blockZ >> 4));
+
+                                chunk.setBlockState(new BlockPos((origin << 4) + blockX, height, (128 << 4) + blockZ),
+                                        Blocks.GRASS.getDefaultState());
+                            }
+                        }
                     }
-                    for(Chunk chunk:chunks)post(world,chunk);
-                    MessageDigest digest=MessageDigest.getInstance("SHA-256");
-                    for(int z=0;z<144;z++)for(int x=0;x<144;x++)for(int y=200;y<205;y++) {
-                        IBlockState state=world.getBlockState(new BlockPos((origin<<4)+x,y,(128<<4)+z));
-                        digest.update((state.getBlock().getRegistryName()+"/"+state.getBlock().getMetaFromState(state)+"\n").getBytes("UTF-8"));
+                    for (Chunk chunk : chunks) {
+                        post(world, chunk);
                     }
-                    hashes[order]=digest.digest();
+
+                    MessageDigest digest = MessageDigest.getInstance("SHA-256");
+
+                    for (int blockZ = 0; blockZ < 144; blockZ++) {
+                        for (int blockX = 0; blockX < 144; blockX++) {
+                            for (int blockY = 200; blockY < 205; blockY++) {
+                                IBlockState state = world.getBlockState(
+                                        new BlockPos((origin << 4) + blockX, blockY, (128 << 4) + blockZ));
+
+                                digest.update((state.getBlock().getRegistryName() + "/"
+                                        + state.getBlock().getMetaFromState(state) + "\n").getBytes("UTF-8"));
+                            }
+                        }
+                    }
+
+                    hashes[order] = digest.digest();
                 }
-                RuntimeProbe.require(Arrays.equals(hashes[0],hashes[1]),"late clay/oasis 9x9 order differs at level "+level);
-                StringBuilder hex=new StringBuilder();for(byte value:hashes[0])hex.append(String.format("%02X",value&255));
-                System.out.println("TERRAIN_SMOOTHER_LATE_GENERATION_ORDER_PASS level="+level+" chunks=81 sha256="+hex);
+
+                RuntimeProbe.require(Arrays.equals(hashes[0], hashes[1]),
+                        "late clay/oasis 9x9 order differs at level " + level);
+
+                StringBuilder hexDigest = new StringBuilder();
+
+                for (byte value : hashes[0]) {
+                    hexDigest.append(String.format("%02X", value & 255));
+                }
+
+                System.out.println("TERRAIN_SMOOTHER_LATE_GENERATION_ORDER_PASS level=" + level + " chunks=81 sha256="
+                        + hexDigest);
             }
-        } finally {SkysTerrainSmoother.level=previousLevel;}
+        } finally {
+            SkysTerrainSmoother.level = previousLevel;
+        }
+
         return 486;
     }
 }
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ProbeProxy.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ProbeProxy.java
index 83bd9cd..27d45b4 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ProbeProxy.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/ProbeProxy.java
@@ -1,2 +1,6 @@
 package zone.moddev.mc.skysterrainsmoother.probe;
-public class ProbeProxy {public void init() {}}
+
+public class ProbeProxy {
+    public void init() {
+    }
+}
diff --git a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/RuntimeProbe.java b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/RuntimeProbe.java
index 59cadd0..8de1691 100644
--- a/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/RuntimeProbe.java
+++ b/src/integrationTest/java/zone/moddev/mc/skysterrainsmoother/probe/RuntimeProbe.java
@@ -31,318 +31,804 @@
 import zone.moddev.mc.skysterrainsmoother.internal.*;
 
 /** Build-only integration contributor and real-world probe, excluded from ordinary launches. */
-@Mod(modid="terrainsmootherprobe",name="Terrain Smoother Runtime Probe",version="1",dependencies="required-after:skysterrainsmoother;after:skysbuildingpieces;after:mineralogy")
+@Mod(
+        modid = "terrainsmootherprobe",
+        name = "Terrain Smoother Runtime Probe",
+        version = "1",
+        dependencies = "required-after:skysterrainsmoother;after:skysbuildingpieces;after:mineralogy")
 public final class RuntimeProbe {
     static Block probeOre;
-    @SidedProxy(clientSide="zone.moddev.mc.skysterrainsmoother.probe.ClientProbe",serverSide="zone.moddev.mc.skysterrainsmoother.probe.ProbeProxy")
+    @SidedProxy(
+            clientSide = "zone.moddev.mc.skysterrainsmoother.probe.ClientProbe",
+            serverSide = "zone.moddev.mc.skysterrainsmoother.probe.ProbeProxy")
     public static ProbeProxy proxy;
     private MinecraftServer server;
     private boolean ran;
-    @Mod.EventHandler public void pre(FMLPreInitializationEvent event){
-        probeOre=new Block(net.minecraft.block.material.Material.ROCK).setUnlocalizedName("terrainsmootherprobe.ore_support").setRegistryName("terrainsmootherprobe","ore_support");
+
+    @Mod.EventHandler
+    public void pre(FMLPreInitializationEvent event) {
+        probeOre = new Block(net.minecraft.block.material.Material.ROCK)
+                .setUnlocalizedName("terrainsmootherprobe.ore_support")
+                .setRegistryName("terrainsmootherprobe", "ore_support");
         net.minecraftforge.fml.common.registry.GameRegistry.register(probeOre);
-        net.minecraftforge.fml.common.registry.GameRegistry.register(new net.minecraft.item.ItemBlock(probeOre).setRegistryName(probeOre.getRegistryName()));
-        net.minecraftforge.oredict.OreDictionary.registerOre("oreTerrainProbe",probeOre);
-        MinecraftForge.EVENT_BUS.register(this);proxy.init();
+        net.minecraftforge.fml.common.registry.GameRegistry
+                .register(new net.minecraft.item.ItemBlock(probeOre).setRegistryName(probeOre.getRegistryName()));
+        net.minecraftforge.oredict.OreDictionary.registerOre("oreTerrainProbe", probeOre);
+        MinecraftForge.EVENT_BUS.register(this);
+        proxy.init();
     }
-    @Mod.EventHandler public void init(FMLInitializationEvent event) {
-        IBlockState[] steps=new IBlockState[4],corners=new IBlockState[4];
-        EnumFacing[] directions={EnumFacing.NORTH,EnumFacing.EAST,EnumFacing.SOUTH,EnumFacing.WEST};
-        for(int d=0;d<4;d++) {
-            steps[d]=BuildingPiecesApi.bottomPiece("minecraft:obsidian",BuildingPiecesApi.TerrainShape.STEP,directions[d]);
-            corners[d]=BuildingPiecesApi.bottomPiece("minecraft:obsidian",BuildingPiecesApi.TerrainShape.CORNER,directions[d]);
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event) {
+        IBlockState[] steps = new IBlockState[4];
+        IBlockState[] corners = new IBlockState[4];
+
+        EnumFacing[] directions = { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST };
+
+        for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+            steps[directionIndex] = BuildingPiecesApi.bottomPiece("minecraft:obsidian",
+                    BuildingPiecesApi.TerrainShape.STEP, directions[directionIndex]);
+            corners[directionIndex] = BuildingPiecesApi.bottomPiece("minecraft:obsidian",
+                    BuildingPiecesApi.TerrainShape.CORNER, directions[directionIndex]);
         }
-        ResourceLocation id=new ResourceLocation("probe:obsidian");
-        TerrainSmoothingApi.registerMaterial(new TerrainMaterial(id,Collections.singleton(Blocks.OBSIDIAN.getDefaultState()),
-                BuildingPiecesApi.bottomPiece("minecraft:obsidian",BuildingPiecesApi.TerrainShape.SLAB,EnumFacing.NORTH),null,null,false,null));
-        TerrainSmoothingApi.addShapes(id,steps,corners);
+
+        ResourceLocation registryId = new ResourceLocation("probe:obsidian");
+
+        TerrainSmoothingApi.registerMaterial(new TerrainMaterial(registryId,
+                Collections.singleton(Blocks.OBSIDIAN.getDefaultState()), BuildingPiecesApi
+                        .bottomPiece("minecraft:obsidian", BuildingPiecesApi.TerrainShape.SLAB, EnumFacing.NORTH),
+                null, null, false, null));
+        TerrainSmoothingApi.addShapes(registryId, steps, corners);
+
         // A later Mineralogy add-on can supply finer geometry without replacing its native slab.
-        if(Loader.isModLoaded("mineralogy")&&SkysTerrainSmoother.mineralogy&&
-                Block.REGISTRY.containsKey(new ResourceLocation("mineralogy:basalt_slab"))) {
-            for(int d=0;d<4;d++) {
-                steps[d]=BuildingPiecesApi.bottomPiece("minecraft:quartz_block",BuildingPiecesApi.TerrainShape.STEP,directions[d]);
-                corners[d]=BuildingPiecesApi.bottomPiece("minecraft:quartz_block",BuildingPiecesApi.TerrainShape.CORNER,directions[d]);
+        if (Loader.isModLoaded("mineralogy") && SkysTerrainSmoother.mineralogy
+                && Block.REGISTRY.containsKey(new ResourceLocation("mineralogy:basalt_slab"))) {
+            for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                steps[directionIndex] = BuildingPiecesApi.bottomPiece("minecraft:quartz_block",
+                        BuildingPiecesApi.TerrainShape.STEP, directions[directionIndex]);
+                corners[directionIndex] = BuildingPiecesApi.bottomPiece("minecraft:quartz_block",
+                        BuildingPiecesApi.TerrainShape.CORNER, directions[directionIndex]);
             }
-            TerrainSmoothingApi.addShapes(new ResourceLocation("mineralogy:basalt"),steps,corners);
+
+            TerrainSmoothingApi.addShapes(new ResourceLocation("mineralogy:basalt"), steps, corners);
         }
-        TerrainSmoothingApi.addAreaProtection((dimension,pos,biome)->pos.getY()==241);
+
+        TerrainSmoothingApi.addAreaProtection((dimension, pos, biome) -> pos.getY() == 241);
+    }
+
+    @Mod.EventHandler
+    public void started(FMLServerStartedEvent event) {
+        server = FMLCommonHandler.instance().getMinecraftServerInstance();
     }
-    @Mod.EventHandler public void started(FMLServerStartedEvent event){server=FMLCommonHandler.instance().getMinecraftServerInstance();}
-    @SubscribeEvent public void tick(TickEvent.ServerTickEvent event) {
-        if(server==null||ran||event.phase!=TickEvent.Phase.END)return;ran=true;
+
+    @SubscribeEvent
+    public void tick(TickEvent.ServerTickEvent event) {
+        if (server == null || ran || event.phase != TickEvent.Phase.END) {
+            return;
+        }
+
+        ran = true;
+
         try {
-            WorldServer world=server.worldServerForDimension(0);
-            world.getGameRules().setOrCreateGameRule("randomTickSpeed","0");
-            require(GrassSlabsApi.hasSmoothingOwner(),"ownership claimed before Grass Slabs startup");
-            require(SkysTerrainSmoother.engine.indexedChunks()>0==phase().equals("reload"),"saved-chunk index lifecycle");
-            boolean late=false;try{TerrainSmoothingApi.addBiomeRule((id,biome)->true);}catch(IllegalStateException expected){late=true;}
-            require(late,"late API registration rejected");
-            int gameplay=persistence(world)+LateTerrainProbe.run(world)+CaveProbe.run(world)+decorationChanges(world)+geometry(world)+grass(world)+sand(world)+generationOrder(world)+LateTerrainProbe.generationOrder(world);
-            int generation=generate(world);
-            Properties values=new Properties();File marker=new File(world.getSaveHandler().getWorldDirectory(),"skysterrainsmoother-integration.properties");
-            if(marker.isFile())try(InputStream in=new FileInputStream(marker)){values.load(in);}
-            values.setProperty(phase()+"_complete","true");values.setProperty("gameplay_checks",Integer.toString(gameplay));values.setProperty("generation_checks",Integer.toString(generation));
-            try(OutputStream out=new FileOutputStream(marker)){values.store(out,"Terrain Smoother disposable verification");}
-            System.out.println("TERRAIN_SMOOTHER_RUNTIME_PASS phase="+phase()+" level="+SkysTerrainSmoother.level+" gameplay="+gameplay+" generated="+generation);
-        }catch(Throwable failure){failure.printStackTrace();throw new IllegalStateException("Terrain Smoother probe failed",failure);}
-        if(System.getProperty("skysterrainsmoother.integrationPhase","").startsWith("client-"))ClientStatus.complete=true;
-        else server.initiateShutdown();
+            WorldServer world = server.worldServerForDimension(0);
+
+            world.getGameRules().setOrCreateGameRule("randomTickSpeed", "0");
+            require(GrassSlabsApi.hasSmoothingOwner(), "ownership claimed before Grass Slabs startup");
+            require(SkysTerrainSmoother.engine.indexedChunks() > 0 == phase().equals("reload"),
+                    "saved-chunk index lifecycle");
+
+            boolean late = false;
+
+            try {
+                TerrainSmoothingApi.addBiomeRule((id, biome) -> true);
+            } catch (IllegalStateException expected) {
+                late = true;
+            }
+
+            require(late, "late API registration rejected");
+
+            int gameplay = persistence(world) + LateTerrainProbe.run(world) + CaveProbe.run(world)
+                    + decorationChanges(world) + geometry(world) + grass(world) + sand(world) + generationOrder(world)
+                    + LateTerrainProbe.generationOrder(world);
+            int generation = generate(world);
+            Properties values = new Properties();
+            File marker = new File(world.getSaveHandler().getWorldDirectory(),
+                    "skysterrainsmoother-integration.properties");
+
+            if (marker.isFile()) {
+                try (InputStream input = new FileInputStream(marker)) {
+                    values.load(input);
+                }
+            }
+
+            values.setProperty(phase() + "_complete", "true");
+            values.setProperty("gameplay_checks", Integer.toString(gameplay));
+            values.setProperty("generation_checks", Integer.toString(generation));
+
+            try (OutputStream output = new FileOutputStream(marker)) {
+                values.store(output, "Terrain Smoother disposable verification");
+            }
+
+            System.out.println("TERRAIN_SMOOTHER_RUNTIME_PASS phase=" + phase() + " level=" + SkysTerrainSmoother.level
+                    + " gameplay=" + gameplay + " generated=" + generation);
+        } catch (Throwable failure) {
+            failure.printStackTrace();
+            throw new IllegalStateException("Terrain Smoother probe failed", failure);
+        }
+        if (System.getProperty("skysterrainsmoother.integrationPhase", "").startsWith("client-")) {
+            ClientStatus.complete = true;
+        } else {
+            server.initiateShutdown();
+        }
+    }
+
+    private static String phase() {
+        return System.getProperty("skysterrainsmoother.integrationPhase", "fresh").replace("client-", "");
     }
-    private static String phase(){return System.getProperty("skysterrainsmoother.integrationPhase","fresh").replace("client-","");}
+
     private static int sand(WorldServer world) {
-        zone.moddev.mc.skysterrainsmoother.content.SandSlabBlock slab=zone.moddev.mc.skysterrainsmoother.content.SandContent.slab;
-        BlockPos p=new BlockPos(1200,220,1200);world.getChunkFromBlockCoords(p);int checks=0;
-        FakePlayer player=FakePlayerFactory.get(world,new GameProfile(UUID.fromString("14581a55-6ff1-4c98-834f-3f41057e395b"),"SandProbe"));player.capabilities.isCreativeMode=false;player.setPosition(1204,220,1204);
-        for(int variant=0;variant<2;variant++) {
-            for(int meta=variant*2;meta<variant*2+2;meta++) {
-                IBlockState state=slab.getStateFromMeta(meta);require(slab.getMetaFromState(state)==meta,"sand half and material round trip");
-                boolean instant=BlockFalling.fallInstantly;try {
-                    BlockFalling.fallInstantly=true;
-                    for(int y=216;y<=224;y++)world.setBlockToAir(new BlockPos(p.getX(),y,p.getZ()));world.setBlockState(p.down(5),Blocks.STONE.getDefaultState(),2);world.setBlockState(p,state,2);
-                    slab.updateTick(world,p,state,new Random(1));require(world.isAirBlock(p)&&world.getBlockState(p.down(4)).equals(state),"instant fall preserves red sand and half");
-                }finally{BlockFalling.fallInstantly=instant;}
-                require(slab.damageDropped(state)==variant*2,"drop strips orientation but keeps sand type");checks+=3;
-                for(int cz=-3;cz<=3;cz++)for(int cx=-3;cx<=3;cx++)world.getChunkFromChunkCoords((p.getX()>>4)+cx,(p.getZ()>>4)+cz);
-                for(int y=216;y<=224;y++)world.setBlockToAir(new BlockPos(p.getX(),y,p.getZ()));
-                world.setBlockState(p.down(5),Blocks.STONE.getDefaultState(),2);world.setBlockState(p,state,2);
-                boolean previous=BlockFalling.fallInstantly;BlockFalling.fallInstantly=false;
+        zone.moddev.mc.skysterrainsmoother.content.SandSlabBlock slab = zone.moddev.mc.skysterrainsmoother.content.SandContent.slab;
+        BlockPos position = new BlockPos(1200, 220, 1200);
+
+        world.getChunkFromBlockCoords(position);
+
+        int checks = 0;
+        FakePlayer player = FakePlayerFactory.get(world,
+                new GameProfile(UUID.fromString("14581a55-6ff1-4c98-834f-3f41057e395b"), "SandProbe"));
+
+        player.capabilities.isCreativeMode = false;
+        player.setPosition(1204, 220, 1204);
+
+        for (int variant = 0; variant < 2; variant++) {
+            for (int meta = variant * 2; meta < variant * 2 + 2; meta++) {
+                IBlockState state = slab.getStateFromMeta(meta);
+
+                require(slab.getMetaFromState(state) == meta, "sand half and material round trip");
+
+                boolean instant = BlockFalling.fallInstantly;
+
+                try {
+                    BlockFalling.fallInstantly = true;
+
+                    for (int blockY = 216; blockY <= 224; blockY++) {
+                        world.setBlockToAir(new BlockPos(position.getX(), blockY, position.getZ()));
+                    }
+
+                    world.setBlockState(position.down(5), Blocks.STONE.getDefaultState(), 2);
+                    world.setBlockState(position, state, 2);
+                    slab.updateTick(world, position, state, new Random(1));
+                    require(world.isAirBlock(position) && world.getBlockState(position.down(4)).equals(state),
+                            "instant fall preserves red sand and half");
+                } finally {
+                    BlockFalling.fallInstantly = instant;
+                }
+
+                require(slab.damageDropped(state) == variant * 2, "drop strips orientation but keeps sand type");
+                checks += 3;
+
+                for (int chunkZ = -3; chunkZ <= 3; chunkZ++) {
+                    for (int chunkX = -3; chunkX <= 3; chunkX++) {
+                        world.getChunkFromChunkCoords((position.getX() >> 4) + chunkX, (position.getZ() >> 4) + chunkZ);
+                    }
+                }
+                for (int blockY = 216; blockY <= 224; blockY++) {
+                    world.setBlockToAir(new BlockPos(position.getX(), blockY, position.getZ()));
+                }
+
+                world.setBlockState(position.down(5), Blocks.STONE.getDefaultState(), 2);
+                world.setBlockState(position, state, 2);
+
+                boolean previous = BlockFalling.fallInstantly;
+
+                BlockFalling.fallInstantly = false;
+
                 try {
-                    slab.updateTick(world,p,state,new Random(1));
-                    java.util.List<net.minecraft.entity.item.EntityFallingBlock> falling=world.getEntitiesWithinAABB(net.minecraft.entity.item.EntityFallingBlock.class,new net.minecraft.util.math.AxisAlignedBB(p).expandXyz(1));
-                    require(falling.size()==1,"loaded sand uses the native falling entity");
-                    net.minecraft.entity.item.EntityFallingBlock entity=falling.get(0);
-                    for(int tick=0;tick<80&&!entity.isDead;tick++)entity.onUpdate();
-                    require(entity.isDead&&world.isAirBlock(p)&&world.getBlockState(p.down(4)).equals(state),"entity fall preserves sand variant and half");checks+=2;
-                }finally{BlockFalling.fallInstantly=previous;}
+                    slab.updateTick(world, position, state, new Random(1));
+
+                    java.util.List<net.minecraft.entity.item.EntityFallingBlock> falling = world.getEntitiesWithinAABB(
+                            net.minecraft.entity.item.EntityFallingBlock.class,
+                            new net.minecraft.util.math.AxisAlignedBB(position).expandXyz(1));
+
+                    require(falling.size() == 1, "loaded sand uses the native falling entity");
+
+                    net.minecraft.entity.item.EntityFallingBlock entity = falling.get(0);
+
+                    for (int tick = 0; tick < 80 && !entity.isDead; tick++) {
+                        entity.onUpdate();
+                    }
+
+                    require(entity.isDead && world.isAirBlock(position)
+                            && world.getBlockState(position.down(4)).equals(state),
+                            "entity fall preserves sand variant and half");
+                    checks += 2;
+                } finally {
+                    BlockFalling.fallInstantly = previous;
+                }
             }
-            world.setBlockState(p.down(),Blocks.STONE.getDefaultState(),2);world.setBlockToAir(p);world.setBlockToAir(p.up());
-            net.minecraft.item.ItemStack stack=new net.minecraft.item.ItemStack(slab,2,variant*2);
-            require(stack.onItemUse(player,world,p.down(),EnumHand.MAIN_HAND,EnumFacing.UP,.5f,1,.5f)==EnumActionResult.SUCCESS,"sand bottom placement");
-            require(world.getBlockState(p).equals(slab.getStateFromMeta(variant*2+1)),"horizontal bottom sand state");
-            require(stack.onItemUse(player,world,p,EnumHand.MAIN_HAND,EnumFacing.UP,.5f,.5f,.5f)==EnumActionResult.SUCCESS&&world.getBlockState(p).equals(Blocks.SAND.getStateFromMeta(variant)),"sand halves normalize to original full variant");
-            require(stack.stackSize==0,"placement consumes exactly two slabs");checks+=4;
-            net.minecraft.inventory.InventoryCrafting grid=new net.minecraft.inventory.InventoryCrafting(new net.minecraft.inventory.Container(){public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer p){return true;}},2,2);
-            grid.setInventorySlotContents(0,new net.minecraft.item.ItemStack(slab,1,variant*2));grid.setInventorySlotContents(1,new net.minecraft.item.ItemStack(slab,1,variant*2));
-            require(net.minecraft.item.ItemStack.areItemStacksEqual(new net.minecraft.item.ItemStack(Blocks.SAND,1,variant),net.minecraft.item.crafting.CraftingManager.getInstance().findMatchingRecipe(grid,world)),"sand slab crafting recombination");checks++;
+
+            world.setBlockState(position.down(), Blocks.STONE.getDefaultState(), 2);
+            world.setBlockToAir(position);
+            world.setBlockToAir(position.up());
+
+            net.minecraft.item.ItemStack stack = new net.minecraft.item.ItemStack(slab, 2, variant * 2);
+
+            require(stack.onItemUse(player, world, position.down(), EnumHand.MAIN_HAND, EnumFacing.UP, .5f, 1,
+                    .5f) == EnumActionResult.SUCCESS, "sand bottom placement");
+            require(world.getBlockState(position).equals(slab.getStateFromMeta(variant * 2 + 1)),
+                    "horizontal bottom sand state");
+            require(stack.onItemUse(player, world, position, EnumHand.MAIN_HAND, EnumFacing.UP, .5f, .5f,
+                    .5f) == EnumActionResult.SUCCESS
+                    && world.getBlockState(position).equals(Blocks.SAND.getStateFromMeta(variant)),
+                    "sand halves normalize to original full variant");
+            require(stack.stackSize == 0, "placement consumes exactly two slabs");
+            checks += 4;
+
+            net.minecraft.inventory.InventoryCrafting grid = new net.minecraft.inventory.InventoryCrafting(
+                    new net.minecraft.inventory.Container() {
+                        public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer player) {
+                            return true;
+                        }
+                    }, 2, 2);
+
+            grid.setInventorySlotContents(0, new net.minecraft.item.ItemStack(slab, 1, variant * 2));
+            grid.setInventorySlotContents(1, new net.minecraft.item.ItemStack(slab, 1, variant * 2));
+            require(net.minecraft.item.ItemStack.areItemStacksEqual(
+                    new net.minecraft.item.ItemStack(Blocks.SAND, 1, variant),
+                    net.minecraft.item.crafting.CraftingManager.getInstance().findMatchingRecipe(grid, world)),
+                    "sand slab crafting recombination");
+            checks++;
         }
-        for(net.minecraft.block.Block grass:new net.minecraft.block.Block[]{ModBlocks.DIRT_SLAB,ModBlocks.GRASS_SLAB}){
-            net.minecraft.inventory.InventoryCrafting grid=new net.minecraft.inventory.InventoryCrafting(new net.minecraft.inventory.Container(){public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer p){return true;}},2,2);
-            grid.setInventorySlotContents(0,new net.minecraft.item.ItemStack(grass,1,0));grid.setInventorySlotContents(1,new net.minecraft.item.ItemStack(grass,1,1));
-            require(net.minecraft.item.ItemStack.areItemStacksEqual(new net.minecraft.item.ItemStack(grass==ModBlocks.DIRT_SLAB?Blocks.DIRT:Blocks.GRASS),net.minecraft.item.crafting.CraftingManager.getInstance().findMatchingRecipe(grid,world)),"both saved grass/dirt slab item orientations recombine");checks++;
+        for (net.minecraft.block.Block grass : new net.minecraft.block.Block[] { ModBlocks.DIRT_SLAB,
+                ModBlocks.GRASS_SLAB }) {
+            net.minecraft.inventory.InventoryCrafting grid = new net.minecraft.inventory.InventoryCrafting(
+                    new net.minecraft.inventory.Container() {
+                        public boolean canInteractWith(net.minecraft.entity.player.EntityPlayer player) {
+                            return true;
+                        }
+                    }, 2, 2);
+
+            grid.setInventorySlotContents(0, new net.minecraft.item.ItemStack(grass, 1, 0));
+            grid.setInventorySlotContents(1, new net.minecraft.item.ItemStack(grass, 1, 1));
+            require(net.minecraft.item.ItemStack.areItemStacksEqual(
+                    new net.minecraft.item.ItemStack(grass == ModBlocks.DIRT_SLAB ? Blocks.DIRT : Blocks.GRASS),
+                    net.minecraft.item.crafting.CraftingManager.getInstance().findMatchingRecipe(grid, world)),
+                    "both saved grass/dirt slab item orientations recombine");
+            checks++;
         }
-        System.out.println("TERRAIN_SMOOTHER_SAND_PASS checks="+checks);return checks;
+
+        System.out.println("TERRAIN_SMOOTHER_SAND_PASS checks=" + checks);
+        return checks;
     }
+
     private static int decorationChanges(WorldServer world) {
-        BlockPos p=new BlockPos(1100,200,1100);Chunk owner=world.getChunkFromBlockCoords(p);int checks=0;
-        for(int level=1;level<=3;level++)for(Block replacement:new Block[]{Blocks.SAND,Blocks.GRAVEL,Blocks.AIR}) {
-            for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++)for(int y=200;y<=203;y++)world.setBlockToAir(p.add(x,y-200,z));
-            IBlockState source=GrassSlabsApi.grassGenerationAllowed()?Blocks.GRASS.getDefaultState():Blocks.STONE.getDefaultState();
-            world.setBlockState(p,source,2);world.setBlockState(p.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,level);
-            require(!world.isAirBlock(p.up()),"regression starts with an actual generated piece");
-            world.setBlockState(p,replacement.getDefaultState(),2);
-            MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4)));
-            require(replacement==Blocks.SAND?world.getBlockState(p.up()).getBlock()==zone.moddev.mc.skysterrainsmoother.content.SandContent.slab:world.isAirBlock(p.up()),"decoration retargets sand and removes unsupported gravel/air caps");
-            require(world.getBlockState(p).getBlock()==replacement,"decorator's terrain is not reverted");checks+=3;
+        BlockPos position = new BlockPos(1100, 200, 1100);
+        Chunk owner = world.getChunkFromBlockCoords(position);
+        int checks = 0;
+
+        for (int level = 1; level <= 3; level++) {
+            for (Block replacement : new Block[] { Blocks.SAND, Blocks.GRAVEL, Blocks.AIR }) {
+                for (int blockZ = -2; blockZ <= 2; blockZ++) {
+                    for (int blockX = -2; blockX <= 2; blockX++) {
+                        for (int blockY = 200; blockY <= 203; blockY++) {
+                            world.setBlockToAir(position.add(blockX, blockY - 200, blockZ));
+                        }
+                    }
+                }
+
+                IBlockState source = GrassSlabsApi.grassGenerationAllowed() ? Blocks.GRASS.getDefaultState()
+                        : Blocks.STONE.getDefaultState();
+
+                world.setBlockState(position, source, 2);
+                world.setBlockState(position.north().up(), Blocks.STONE.getDefaultState(), 2);
+                SkysTerrainSmoother.engine.smooth(world, owner, level);
+                require(!world.isAirBlock(position.up()), "regression starts with an actual generated piece");
+                world.setBlockState(position, replacement.getDefaultState(), 2);
+                MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,
+                        new Random(1), new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4)));
+                require(replacement == Blocks.SAND
+                        ? world.getBlockState(position.up())
+                                .getBlock() == zone.moddev.mc.skysterrainsmoother.content.SandContent.slab
+                        : world.isAirBlock(position.up()),
+                        "decoration retargets sand and removes unsupported gravel/air caps");
+                require(world.getBlockState(position).getBlock() == replacement, "decorator's terrain is not reverted");
+                checks += 3;
+            }
+        }
+        for (int level = 1; level <= 3; level++) {
+            for (boolean replacePiece : new boolean[] { false, true }) {
+                for (int blockZ = -2; blockZ <= 2; blockZ++) {
+                    for (int blockX = -2; blockX <= 2; blockX++) {
+                        for (int blockY = 200; blockY <= 203; blockY++) {
+                            world.setBlockToAir(position.add(blockX, blockY - 200, blockZ));
+                        }
+                    }
+                }
+
+                world.setBlockState(position, Blocks.STONE.getDefaultState(), 2);
+                world.setBlockState(position.north().up(), Blocks.STONE.getDefaultState(), 2);
+                SkysTerrainSmoother.engine.smooth(world, owner, level);
+
+                IBlockState piece = world.getBlockState(position.up());
+
+                if (replacePiece) {
+                    world.setBlockState(position, Blocks.SAND.getDefaultState(), 2);
+                    world.setBlockState(position.up(), Blocks.GLASS.getDefaultState(), 2);
+                    piece = Blocks.GLASS.getDefaultState();
+                }
+
+                net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post post = new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(
+                        world, new Random(1), new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4));
+
+                MinecraftForge.EVENT_BUS.post(post);
+                MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,
+                        new Random(1), new BlockPos(owner.xPosition << 4, 0, owner.zPosition << 4)));
+                require(world.getBlockState(position.up()).equals(piece),
+                        "valid support and decorator-owned replacement remain intact; repeated Post is harmless");
+                checks++;
+            }
         }
-        for(int level=1;level<=3;level++)for(boolean replacePiece:new boolean[]{false,true}) {
-            for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++)for(int y=200;y<=203;y++)world.setBlockToAir(p.add(x,y-200,z));
-            world.setBlockState(p,Blocks.STONE.getDefaultState(),2);world.setBlockState(p.north().up(),Blocks.STONE.getDefaultState(),2);
-            SkysTerrainSmoother.engine.smooth(world,owner,level);IBlockState piece=world.getBlockState(p.up());
-            if(replacePiece){world.setBlockState(p,Blocks.SAND.getDefaultState(),2);world.setBlockState(p.up(),Blocks.GLASS.getDefaultState(),2);piece=Blocks.GLASS.getDefaultState();}
-            net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post post=new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4));
-            MinecraftForge.EVENT_BUS.post(post);
-            MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(owner.xPosition<<4,0,owner.zPosition<<4)));
-            require(world.getBlockState(p.up()).equals(piece),"valid support and decorator-owned replacement remain intact; repeated Post is harmless");checks++;
+
+        BlockPos late = new BlockPos(28008, 200, 28008);
+        Chunk lateOwner = world.getChunkFromBlockCoords(late);
+
+        for (int blockY = 200; blockY <= 203; blockY++) {
+            world.setBlockToAir(late.up(blockY - 200));
+            world.setBlockToAir(late.north().up(blockY - 200));
         }
-        BlockPos late=new BlockPos(28008,200,28008);Chunk lateOwner=world.getChunkFromBlockCoords(late);
-        for(int y=200;y<=203;y++){world.setBlockToAir(late.up(y-200));world.setBlockToAir(late.north().up(y-200));}
-        world.setBlockState(late,Blocks.STONE.getDefaultState(),2);world.setBlockState(late.north().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,lateOwner,1);
-        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(lateOwner.xPosition<<4,0,lateOwner.zPosition<<4)));
-        require(!world.isAirBlock(late.up()),"own Post retains supported generated piece");
-        world.setBlockState(late,Blocks.SAND.getDefaultState(),2);
-        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos((lateOwner.xPosition-1)<<4,0,lateOwner.zPosition<<4)));
-        require(world.getBlockState(late.up()).getBlock()==zone.moddev.mc.skysterrainsmoother.content.SandContent.slab&&world.getBlockState(late).getBlock()==Blocks.SAND,"later neighbouring decoration retargets only its affected generated cap");checks+=2;
-        BlockPos beach=late.add(32,0,32);Chunk beachOwner=world.getChunkFromBlockCoords(beach);
-        for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++)for(int y=200;y<=203;y++)world.setBlockToAir(beach.add(x,y-200,z));
-        world.setBlockState(beach,Blocks.GRAVEL.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,beachOwner,1);
-        require(world.isAirBlock(beach.up()),"unsupported first pass leaves no piece");
-        world.setBlockState(beach,Blocks.SAND.getStateFromMeta(1),2);world.setBlockState(beach.north().up(),Blocks.SAND.getStateFromMeta(1),2);
-        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(beachOwner.xPosition<<4,0,beachOwner.zPosition<<4)));
-        require(world.getBlockState(beach.up()).equals(zone.moddev.mc.skysterrainsmoother.content.SandContent.slab.getStateFromMeta(3)),"late beach gets a red sand cap without any initial placement");checks+=2;
-        System.out.println("TERRAIN_SMOOTHER_DECORATION_REPAIR_PASS checks="+checks);
+
+        world.setBlockState(late, Blocks.STONE.getDefaultState(), 2);
+        world.setBlockState(late.north().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, lateOwner, 1);
+        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,
+                new Random(1), new BlockPos(lateOwner.xPosition << 4, 0, lateOwner.zPosition << 4)));
+        require(!world.isAirBlock(late.up()), "own Post retains supported generated piece");
+        world.setBlockState(late, Blocks.SAND.getDefaultState(), 2);
+        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,
+                new Random(1), new BlockPos((lateOwner.xPosition - 1) << 4, 0, lateOwner.zPosition << 4)));
+        require(world.getBlockState(late.up()).getBlock() == zone.moddev.mc.skysterrainsmoother.content.SandContent.slab
+                && world.getBlockState(late).getBlock() == Blocks.SAND,
+                "later neighbouring decoration retargets only its affected generated cap");
+        checks += 2;
+
+        BlockPos beach = late.add(32, 0, 32);
+        Chunk beachOwner = world.getChunkFromBlockCoords(beach);
+
+        for (int blockZ = -2; blockZ <= 2; blockZ++) {
+            for (int blockX = -2; blockX <= 2; blockX++) {
+                for (int blockY = 200; blockY <= 203; blockY++) {
+                    world.setBlockToAir(beach.add(blockX, blockY - 200, blockZ));
+                }
+            }
+        }
+
+        world.setBlockState(beach, Blocks.GRAVEL.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, beachOwner, 1);
+        require(world.isAirBlock(beach.up()), "unsupported first pass leaves no piece");
+        world.setBlockState(beach, Blocks.SAND.getStateFromMeta(1), 2);
+        world.setBlockState(beach.north().up(), Blocks.SAND.getStateFromMeta(1), 2);
+        MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,
+                new Random(1), new BlockPos(beachOwner.xPosition << 4, 0, beachOwner.zPosition << 4)));
+        require(world.getBlockState(beach.up())
+                .equals(zone.moddev.mc.skysterrainsmoother.content.SandContent.slab.getStateFromMeta(3)),
+                "late beach gets a red sand cap without any initial placement");
+        checks += 2;
+        System.out.println("TERRAIN_SMOOTHER_DECORATION_REPAIR_PASS checks=" + checks);
         return checks;
     }
+
     private static int geometry(WorldServer world) {
-        BlockPos p=new BlockPos(1000,200,1000);Chunk owner=world.getChunkFromBlockCoords(p);
+        BlockPos position = new BlockPos(1000, 200, 1000);
+        Chunk owner = world.getChunkFromBlockCoords(position);
+
         // Reset previous controlled-probe roofs before testing the same fixture on reload.
-        for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++)for(int y=203;y<=245;y++)world.setBlockToAir(new BlockPos(p.getX()+x,y,p.getZ()+z));
-        MaterialCatalogue catalogue=MaterialCatalogue.instance();TerrainMaterial stone=catalogue.source(Blocks.STONE.getDefaultState());
-        int checks=0;int[] dx={0,1,0,-1},dz={-1,0,1,0},cx={-1,1,1,-1},cz={-1,-1,1,1};
-        for(int level=1;level<=3;level++)for(int cardinal=0;cardinal<16;cardinal++)for(int diagonal=0;diagonal<16;diagonal++) {
-            for(int z=-2;z<=2;z++)for(int x=-2;x<=2;x++) {
-                world.setBlockState(p.add(x,0,z),Blocks.STONE.getDefaultState(),2);
-                world.setBlockToAir(p.add(x,1,z));world.setBlockToAir(p.add(x,2,z));
+        for (int blockZ = -2; blockZ <= 2; blockZ++) {
+            for (int blockX = -2; blockX <= 2; blockX++) {
+                for (int blockY = 203; blockY <= 245; blockY++) {
+                    world.setBlockToAir(new BlockPos(position.getX() + blockX, blockY, position.getZ() + blockZ));
+                }
             }
-            for(int d=0;d<4;d++) {
-                if((cardinal&(1<<d))!=0)world.setBlockState(p.add(dx[d],1,dz[d]),Blocks.STONE.getDefaultState(),2);
-                if((diagonal&(1<<d))!=0)world.setBlockState(p.add(cx[d],1,cz[d]),Blocks.STONE.getDefaultState(),2);
+        }
+
+        MaterialCatalogue catalogue = MaterialCatalogue.instance();
+        TerrainMaterial stone = catalogue.source(Blocks.STONE.getDefaultState());
+        int checks = 0;
+        int[] offsetsX = { 0, 1, 0, -1 };
+        int[] offsetsZ = { -1, 0, 1, 0 };
+        int[] cx = { -1, 1, 1, -1 };
+        int[] cz = { -1, -1, 1, 1 };
+
+        for (int level = 1; level <= 3; level++) {
+            for (int cardinal = 0; cardinal < 16; cardinal++) {
+                for (int diagonal = 0; diagonal < 16; diagonal++) {
+                    for (int blockZ = -2; blockZ <= 2; blockZ++) {
+                        for (int blockX = -2; blockX <= 2; blockX++) {
+                            world.setBlockState(position.add(blockX, 0, blockZ), Blocks.STONE.getDefaultState(), 2);
+                            world.setBlockToAir(position.add(blockX, 1, blockZ));
+                            world.setBlockToAir(position.add(blockX, 2, blockZ));
+                        }
+                    }
+                    for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                        if ((cardinal & (1 << directionIndex)) != 0) {
+                            world.setBlockState(position.add(offsetsX[directionIndex], 1, offsetsZ[directionIndex]),
+                                    Blocks.STONE.getDefaultState(), 2);
+                        }
+                        if ((diagonal & (1 << directionIndex)) != 0) {
+                            world.setBlockState(position.add(cx[directionIndex], 1, cz[directionIndex]),
+                                    Blocks.STONE.getDefaultState(), 2);
+                        }
+                    }
+
+                    IBlockState expected = catalogue.result(stone, Footprint.mask(cardinal, diagonal, level), level);
+
+                    SkysTerrainSmoother.engine.smooth(world, owner, level);
+                    require(world.getBlockState(position.up())
+                            .equals(expected == null ? Blocks.AIR.getDefaultState() : expected),
+                            "snapshot footprint " + level + "/" + cardinal + "/" + diagonal);
+                    checks++;
+                }
             }
-            IBlockState expected=catalogue.result(stone,Footprint.mask(cardinal,diagonal,level),level);
-            SkysTerrainSmoother.engine.smooth(world,owner,level);
-            require(world.getBlockState(p.up()).equals(expected==null?Blocks.AIR.getDefaultState():expected),"snapshot footprint "+level+"/"+cardinal+"/"+diagonal);checks++;
         }
-        world.setBlockState(p,Blocks.GRASS.getDefaultState(),2);world.setBlockToAir(p.up());world.setBlockState(p.east().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,1);
-        if(GrassSlabsApi.grassGenerationAllowed())require(world.getBlockState(p).equals(Blocks.DIRT.getDefaultState()),"support dirtified after grass placement");
-        else require(world.getBlockState(p).getBlock()==Blocks.GRASS&&world.isAirBlock(p.up()),"grass switch authoritative");
-        world.setBlockState(p.up(),Blocks.GLASS.getDefaultState(),2);SkysTerrainSmoother.engine.smooth(world,owner,3);
-        require(world.getBlockState(p.up()).getBlock()==Blocks.GLASS,"occupied target protected");
-        BlockPos veto=p.up(40);world.setBlockState(veto,Blocks.STONE.getDefaultState(),2);world.setBlockToAir(veto.up());world.setBlockState(veto.east().up(),Blocks.STONE.getDefaultState(),2);
-        SkysTerrainSmoother.engine.smooth(world,owner,3);require(world.isAirBlock(veto.up()),"protected area veto");
-        long start=System.nanoTime();for(int i=0;i<256;i++)SkysTerrainSmoother.engine.smooth(world,owner,3);
-        System.out.println("TERRAIN_SMOOTHER_BENCHMARK passes=256 mean_ns="+(System.nanoTime()-start)/256);
-        return checks+3;
+
+        world.setBlockState(position, Blocks.GRASS.getDefaultState(), 2);
+        world.setBlockToAir(position.up());
+        world.setBlockState(position.east().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 1);
+
+        if (GrassSlabsApi.grassGenerationAllowed()) {
+            require(world.getBlockState(position).equals(Blocks.DIRT.getDefaultState()),
+                    "support dirtified after grass placement");
+        } else {
+            require(world.getBlockState(position).getBlock() == Blocks.GRASS && world.isAirBlock(position.up()),
+                    "grass switch authoritative");
+        }
+
+        world.setBlockState(position.up(), Blocks.GLASS.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 3);
+        require(world.getBlockState(position.up()).getBlock() == Blocks.GLASS, "occupied target protected");
+
+        BlockPos veto = position.up(40);
+
+        world.setBlockState(veto, Blocks.STONE.getDefaultState(), 2);
+        world.setBlockToAir(veto.up());
+        world.setBlockState(veto.east().up(), Blocks.STONE.getDefaultState(), 2);
+        SkysTerrainSmoother.engine.smooth(world, owner, 3);
+        require(world.isAirBlock(veto.up()), "protected area veto");
+
+        long start = System.nanoTime();
+
+        for (int entryIndex = 0; entryIndex < 256; entryIndex++) {
+            SkysTerrainSmoother.engine.smooth(world, owner, 3);
+        }
+
+        System.out.println("TERRAIN_SMOOTHER_BENCHMARK passes=256 mean_ns=" + (System.nanoTime() - start) / 256);
+        return checks + 3;
     }
+
     private static int persistence(WorldServer world) {
-        int index=0;
-        for(Shape shape:new Shape[]{Shape.HORIZONTAL_STEP,Shape.CORNER})for(int direction=0;direction<shape.states;direction++)for(String material:new String[]{"minecraft:grass","minecraft:dirt"}) {
-            BlockPos pos=new BlockPos(1500+index,210,1500);IBlockState expected=Pieces.state(material,shape,direction);index++;
-            if(phase().equals("reload"))require(world.getBlockState(pos).equals(expected),"saved fine piece retains identity and orientation");
-            else world.setBlockState(pos,expected,2);
+        int index = 0;
+
+        for (Shape shape : new Shape[] { Shape.HORIZONTAL_STEP, Shape.CORNER }) {
+            for (int direction = 0; direction < shape.states; direction++) {
+                for (String material : new String[] { "minecraft:grass", "minecraft:dirt" }) {
+                    BlockPos pos = new BlockPos(1500 + index, 210, 1500);
+                    IBlockState expected = Pieces.state(material, shape, direction);
+
+                    index++;
+
+                    if (phase().equals("reload")) {
+                        require(world.getBlockState(pos).equals(expected),
+                                "saved fine piece retains identity and orientation");
+                    } else {
+                        world.setBlockState(pos, expected, 2);
+                    }
+                }
+            }
         }
-        BlockPos saved=new BlockPos(1600,210,1600);
+
+        BlockPos saved = new BlockPos(1600, 210, 1600);
+
         world.getChunkFromBlockCoords(saved);
-        world.setBlockState(saved,Blocks.STONE.getDefaultState(),2);world.setBlockState(saved.east().up(),Blocks.STONE.getDefaultState(),2);world.setBlockToAir(saved.up());
-        if(phase().equals("reload")) {
-            long skipped=SkysTerrainSmoother.engine.skippedExisting;
-            SkysTerrainSmoother.engine.beforeDecoration(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Pre(world,new Random(1),new BlockPos(saved.getX()&~15,0,saved.getZ()&~15)));
-            require(world.isAirBlock(saved.up()),"saved unpopulated chunks are never smoothed");
-            if(SkysTerrainSmoother.enabled)require(SkysTerrainSmoother.engine.skippedExisting==skipped+1,"existing entry skips before terrain access");
-            world.setBlockState(saved,Blocks.GRASS.getDefaultState(),2);
-            world.setBlockState(saved.east().up(),Blocks.HARDENED_CLAY.getDefaultState(),2);
-            SkysTerrainSmoother.engine.afterDecoration(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(world,new Random(1),new BlockPos(saved.getX()&~15,0,saved.getZ()&~15)));
-            require(world.isAirBlock(saved.up())&&world.getBlockState(saved).getBlock()==Blocks.GRASS,"late oasis pass never retrogenerates an indexed saved chunk");
+        world.setBlockState(saved, Blocks.STONE.getDefaultState(), 2);
+        world.setBlockState(saved.east().up(), Blocks.STONE.getDefaultState(), 2);
+        world.setBlockToAir(saved.up());
+
+        if (phase().equals("reload")) {
+            long skipped = SkysTerrainSmoother.engine.skippedExisting;
+
+            SkysTerrainSmoother.engine.beforeDecoration(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Pre(
+                    world, new Random(1), new BlockPos(saved.getX() & ~15, 0, saved.getZ() & ~15)));
+            require(world.isAirBlock(saved.up()), "saved unpopulated chunks are never smoothed");
+
+            if (SkysTerrainSmoother.enabled) {
+                require(SkysTerrainSmoother.engine.skippedExisting == skipped + 1,
+                        "existing entry skips before terrain access");
+            }
+
+            world.setBlockState(saved, Blocks.GRASS.getDefaultState(), 2);
+            world.setBlockState(saved.east().up(), Blocks.HARDENED_CLAY.getDefaultState(), 2);
+            SkysTerrainSmoother.engine.afterDecoration(new net.minecraftforge.event.terraingen.DecorateBiomeEvent.Post(
+                    world, new Random(1), new BlockPos(saved.getX() & ~15, 0, saved.getZ() & ~15)));
+            require(world.isAirBlock(saved.up()) && world.getBlockState(saved).getBlock() == Blocks.GRASS,
+                    "late oasis pass never retrogenerates an indexed saved chunk");
         }
+
         return index;
     }
+
     private static int grass(WorldServer world) {
-        int checks=0;BlockPos p=new BlockPos(1020,210,1020);world.getChunkFromBlockCoords(p);world.getChunkFromBlockCoords(p.add(-8,0,-8));world.getChunkFromBlockCoords(p.add(8,0,8));
-        for(Shape shape:new Shape[]{Shape.HORIZONTAL_STEP,Shape.VERTICAL_STEP,Shape.CORNER,Shape.STAIRS})for(int direction=0;direction<shape.states;direction++) {
-            IBlockState dirt=Pieces.state("minecraft:dirt",shape,direction),grass=Pieces.state("minecraft:grass",shape,direction);
-            require(GrassSlabsApi.grassFor(dirt).equals(grass)&&GrassSlabsApi.dirtFor(grass).equals(dirt),"shared orientation mapping");
-            world.setBlockToAir(p.up());world.setBlockState(p,dirt,2);world.setLightFor(EnumSkyBlock.SKY,p.up(),15);
-            require(GrassSpread.growTarget(world,p)&&world.getBlockState(p).equals(grass),"cross-mod grass growth preserves orientation");
-            PieceBlock piece=(PieceBlock)grass.getBlock();
-            boolean completeTop=Geometry.completeTop(piece.mask(grass));
-            require(piece.canGrow(world,p,grass,false)==completeTop&&piece.canUseBonemeal(world,new Random(1),p,grass)==completeTop,"bonemeal requires a complete upper supporting face");
-            require(!piece.canGrow(world,p,dirt,false),"dirt forms do not accept grass bonemeal");
-            world.setBlockState(p.north(),Blocks.SNOW_LAYER.getDefaultState(),2);
-            require(piece.getActualState(grass,world,p).getValue(net.minecraft.block.BlockGrass.SNOWY),"fine grass snow visual");
-            world.setBlockToAir(p.north());
-            require(!piece.getActualState(grass,world,p).getValue(net.minecraft.block.BlockGrass.SNOWY),"fine grass snow clears");
-            world.setBlockState(p.down(),Blocks.GRASS.getDefaultState(),2);grass.getBlock().neighborChanged(grass,world,p,Blocks.GRASS);
-            require(world.getBlockState(p.down()).getBlock()==Blocks.DIRT,"piece support dirtification");
-            require(!GrassSpread.growTarget(world,p.down()),"no grass beneath grass pieces");
-            world.setBlockState(p,dirt,2);world.setBlockState(p.up(),ModBlocks.GRASS_SLAB.getDefaultState(),2);
-            require(!GrassSpread.growTarget(world,p),"covered dirt piece rejected");
-            world.setBlockState(p,grass,2);world.setBlockState(p.up(),Blocks.STONE.getDefaultState(),2);
-            world.setLightFor(EnumSkyBlock.SKY,p.up(),0);world.setLightFor(EnumSkyBlock.BLOCK,p.up(),0);
-            grass.getBlock().updateTick(world,p,grass,new Random(1));require(world.getBlockState(p).equals(dirt),"covered decay keeps orientation");checks+=10;
+        int checks = 0;
+        BlockPos position = new BlockPos(1020, 210, 1020);
+
+        world.getChunkFromBlockCoords(position);
+        world.getChunkFromBlockCoords(position.add(-8, 0, -8));
+        world.getChunkFromBlockCoords(position.add(8, 0, 8));
+
+        for (Shape shape : new Shape[] { Shape.HORIZONTAL_STEP, Shape.VERTICAL_STEP, Shape.CORNER, Shape.STAIRS }) {
+            for (int direction = 0; direction < shape.states; direction++) {
+                IBlockState dirt = Pieces.state("minecraft:dirt", shape, direction);
+                IBlockState grass = Pieces.state("minecraft:grass", shape, direction);
+
+                require(GrassSlabsApi.grassFor(dirt).equals(grass) && GrassSlabsApi.dirtFor(grass).equals(dirt),
+                        "shared orientation mapping");
+                world.setBlockToAir(position.up());
+                world.setBlockState(position, dirt, 2);
+                world.setLightFor(EnumSkyBlock.SKY, position.up(), 15);
+                require(GrassSpread.growTarget(world, position) && world.getBlockState(position).equals(grass),
+                        "cross-mod grass growth preserves orientation");
+
+                PieceBlock piece = (PieceBlock) grass.getBlock();
+                boolean completeTop = Geometry.completeTop(piece.mask(grass));
+
+                require(piece.canGrow(world, position, grass, false) == completeTop
+                        && piece.canUseBonemeal(world, new Random(1), position, grass) == completeTop,
+                        "bonemeal requires a complete upper supporting face");
+                require(!piece.canGrow(world, position, dirt, false), "dirt forms do not accept grass bonemeal");
+                world.setBlockState(position.north(), Blocks.SNOW_LAYER.getDefaultState(), 2);
+                require(piece.getActualState(grass, world, position).getValue(net.minecraft.block.BlockGrass.SNOWY),
+                        "fine grass snow visual");
+                world.setBlockToAir(position.north());
+                require(!piece.getActualState(grass, world, position).getValue(net.minecraft.block.BlockGrass.SNOWY),
+                        "fine grass snow clears");
+                world.setBlockState(position.down(), Blocks.GRASS.getDefaultState(), 2);
+                grass.getBlock().neighborChanged(grass, world, position, Blocks.GRASS);
+                require(world.getBlockState(position.down()).getBlock() == Blocks.DIRT, "piece support dirtification");
+                require(!GrassSpread.growTarget(world, position.down()), "no grass beneath grass pieces");
+                world.setBlockState(position, dirt, 2);
+                world.setBlockState(position.up(), ModBlocks.GRASS_SLAB.getDefaultState(), 2);
+                require(!GrassSpread.growTarget(world, position), "covered dirt piece rejected");
+                world.setBlockState(position, grass, 2);
+                world.setBlockState(position.up(), Blocks.STONE.getDefaultState(), 2);
+                world.setLightFor(EnumSkyBlock.SKY, position.up(), 0);
+                world.setLightFor(EnumSkyBlock.BLOCK, position.up(), 0);
+                grass.getBlock().updateTick(world, position, grass, new Random(1));
+                require(world.getBlockState(position).equals(dirt), "covered decay keeps orientation");
+                checks += 10;
+            }
         }
+
         return checks;
     }
+
     private static int generate(WorldServer world) {
-        FakePlayer player=FakePlayerFactory.get(world,new GameProfile(UUID.fromString("4f5b04d6-9050-4e39-a06c-7793a3ffbe18"),"TerrainProbe"));
+        FakePlayer player = FakePlayerFactory.get(world,
+                new GameProfile(UUID.fromString("4f5b04d6-9050-4e39-a06c-7793a3ffbe18"), "TerrainProbe"));
+
         world.getPlayerChunkMap().setPlayerViewRadius(4);
-        long before=SkysTerrainSmoother.engine.passes;int found=0,caves=0,mineralogy=0,lushClay=0,lushGrass=0;
-        for(int attempt=0;attempt<4;attempt++) {
-            int centerX=Integer.getInteger("skysterrainsmoother.probeCenterX",400)+attempt*40+(phase().equals("reload")?200:0),centerZ=Integer.getInteger("skysterrainsmoother.probeCenterZ",400);
-            player.setPosition(centerX*16+8,90,centerZ*16+8);world.getPlayerChunkMap().addPlayer(player);
+
+        long before = SkysTerrainSmoother.engine.passes;
+        int found = 0;
+        int caves = 0;
+        int mineralogy = 0;
+        int lushClay = 0;
+        int lushGrass = 0;
+
+        for (int attempt = 0; attempt < 4; attempt++) {
+            int centerX = Integer.getInteger("skysterrainsmoother.probeCenterX", 400) + attempt * 40
+                    + (phase().equals("reload") ? 200 : 0);
+            int centerZ = Integer.getInteger("skysterrainsmoother.probeCenterZ", 400);
+
+            player.setPosition(centerX * 16 + 8, 90, centerZ * 16 + 8);
+            world.getPlayerChunkMap().addPlayer(player);
+
             try {
-                for(int tick=0;tick<100;tick++){world.getPlayerChunkMap().tick();world.getChunkProvider().tick();}
-                // This probe drives tracking during ServerTick END. Complete the
-                // WorldTick END that ordinary server-driven population receives.
-                MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(net.minecraftforge.fml.relauncher.Side.SERVER,TickEvent.Phase.END,world));
-                for(int z=centerZ-4;z<=centerZ+4;z++)for(int x=centerX-4;x<=centerX+4;x++) {
-                    Chunk chunk=world.getChunkProvider().getLoadedChunk(x,z);if(chunk==null)continue;
-                    for(ExtendedBlockStorage section:chunk.getBlockStorageArray())if(section!=null)
-                        for(int y=0;y<16;y++)for(int zz=0;zz<16;zz++)for(int xx=0;xx<16;xx++) {
-                            TerrainMaterial m=MaterialCatalogue.instance().piece(section.get(xx,y,zz));if(m!=null) {
-                                BlockPos piece=new BlockPos((x<<4)+xx,section.getYLocation()+y,(z<<4)+zz);
-                                IBlockState support=chunk.getBlockState(piece.down());
-                                require(m.sources.contains(support)||support.equals(m.supportAfterPlacement)||oreSupport(support),"normal decoration leaves no piece over unrelated support: "+piece+" / "+support);
-                                if(piece.getY()<chunk.getHeightValue(xx,zz)-1&&!m.grass){caves++;if(m.mineralogy)mineralogy++;}
-                                if(new ResourceLocation("biomesoplenty:lush_desert").equals(world.getBiome(piece).getRegistryName())) {
-                                    if(m.id.equals(new ResourceLocation("minecraft:hardened_clay")))lushClay++;
-                                    if(m.id.equals(new ResourceLocation("minecraft:grass")))lushGrass++;
+                for (int tick = 0; tick < 100; tick++) {
+                    world.getPlayerChunkMap().tick();
+                    world.getChunkProvider().tick();
+                }
+
+                // This probe drives tracking during ServerTick END. Complete the WorldTick END that ordinary
+                // server-driven population receives.
+                MinecraftForge.EVENT_BUS.post(new TickEvent.WorldTickEvent(
+                        net.minecraftforge.fml.relauncher.Side.SERVER, TickEvent.Phase.END, world));
+
+                for (int blockZ = centerZ - 4; blockZ <= centerZ + 4; blockZ++) {
+                    for (int blockX = centerX - 4; blockX <= centerX + 4; blockX++) {
+                        Chunk chunk = world.getChunkProvider().getLoadedChunk(blockX, blockZ);
+
+                        if (chunk == null) {
+                            continue;
+                        }
+                        for (ExtendedBlockStorage section : chunk.getBlockStorageArray()) {
+                            if (section != null) {
+                                for (int blockY = 0; blockY < 16; blockY++) {
+                                    for (int localZ = 0; localZ < 16; localZ++) {
+                                        for (int localX = 0; localX < 16; localX++) {
+                                            TerrainMaterial terrainMaterial = MaterialCatalogue.instance()
+                                                    .piece(section.get(localX, blockY, localZ));
+
+                                            if (terrainMaterial != null) {
+                                                BlockPos piece = new BlockPos((blockX << 4) + localX,
+                                                        section.getYLocation() + blockY, (blockZ << 4) + localZ);
+                                                IBlockState support = chunk.getBlockState(piece.down());
+
+                                                require(terrainMaterial.sources.contains(support)
+                                                        || support.equals(terrainMaterial.supportAfterPlacement)
+                                                        || oreSupport(support),
+                                                        "normal decoration leaves no piece over unrelated support: "
+                                                                + piece + " / " + support);
+
+                                                if (piece.getY() < chunk.getHeightValue(localX, localZ) - 1
+                                                        && !terrainMaterial.grass) {
+                                                    caves++;
+
+                                                    if (terrainMaterial.mineralogy) {
+                                                        mineralogy++;
+                                                    }
+                                                }
+                                                if (new ResourceLocation("biomesoplenty:lush_desert")
+                                                        .equals(world.getBiome(piece).getRegistryName())) {
+                                                    if (terrainMaterial.id
+                                                            .equals(new ResourceLocation("minecraft:hardened_clay"))) {
+                                                        lushClay++;
+                                                    }
+                                                    if (terrainMaterial.id
+                                                            .equals(new ResourceLocation("minecraft:grass"))) {
+                                                        lushGrass++;
+                                                    }
+                                                }
+
+                                                found++;
+                                            }
+                                        }
+                                    }
                                 }
-                                found++;
                             }
                         }
+                    }
                 }
-            }finally{world.getPlayerChunkMap().removePlayer(player);}
-            if(found>0)break;
+            } finally {
+                world.getPlayerChunkMap().removePlayer(player);
+            }
+            if (found > 0) {
+                break;
+            }
         }
-        if(SkysTerrainSmoother.enabled)require(SkysTerrainSmoother.engine.passes>before&&found>0,"normal player-tracked generation creates pieces");
-        else require(SkysTerrainSmoother.engine.passes==before&&found==0,"disabled master has no duplicate grass pass");
-        if(SkysTerrainSmoother.enabled)require(caves>0,"normal player-tracked generation also smooths real cave floors");
-        if(Boolean.getBoolean("skysterrainsmoother.verifyLushDesert")&&phase().equals("fresh")) {
-            require(lushClay>0,"player-tracked Lush Desert has hardened-clay transitions");
-            require(lushGrass>0,"player-tracked Lush Desert has grass oasis transitions");
-            System.out.println("TERRAIN_SMOOTHER_LUSH_DESERT_GENERATION_PASS clay="+lushClay+" grass="+lushGrass);
+        if (SkysTerrainSmoother.enabled) {
+            require(SkysTerrainSmoother.engine.passes > before && found > 0,
+                    "normal player-tracked generation creates pieces");
+        } else {
+            require(SkysTerrainSmoother.engine.passes == before && found == 0,
+                    "disabled master has no duplicate grass pass");
         }
-        System.out.println("TERRAIN_SMOOTHER_GENERATED_CAVES_PASS caves="+caves+" mineralogy="+mineralogy);
+        if (SkysTerrainSmoother.enabled) {
+            require(caves > 0, "normal player-tracked generation also smooths real cave floors");
+        }
+        if (Boolean.getBoolean("skysterrainsmoother.verifyLushDesert") && phase().equals("fresh")) {
+            require(lushClay > 0, "player-tracked Lush Desert has hardened-clay transitions");
+            require(lushGrass > 0, "player-tracked Lush Desert has grass oasis transitions");
+            System.out.println("TERRAIN_SMOOTHER_LUSH_DESERT_GENERATION_PASS clay=" + lushClay + " grass=" + lushGrass);
+        }
+
+        System.out.println("TERRAIN_SMOOTHER_GENERATED_CAVES_PASS caves=" + caves + " mineralogy=" + mineralogy);
         return found;
     }
+
     private static int generationOrder(WorldServer world) throws Exception {
-        for(int level=1;level<=3;level++) {
-            byte[][] hashes=new byte[2][];
-            for(int order=0;order<2;order++) {
-                int origin=order==0?128:256;
-                List<Chunk> chunks=new ArrayList<>();
-                for(int z=0;z<9;z++)for(int x=0;x<9;x++)chunks.add(world.getChunkFromChunkCoords(origin+x,128+z));
-                for(int z=0;z<144;z++)for(int x=0;x<144;x++) {
-                    int height=200+Math.floorMod(x*31+z*17+(x>>3)*(z>>3),3);
-                    Chunk chunk=chunks.get((x>>4)+(z>>4)*9);
-                    // Bulk fixture construction avoids relighting 20,736 artificially raised
-                    // columns one by one. The actual smoothing pass still uses real chunk writes.
-                    for(int y=170;y<205;y++) {
-                        ExtendedBlockStorage section=chunk.getBlockStorageArray()[y>>4];
-                        if(section==null)chunk.getBlockStorageArray()[y>>4]=section=new ExtendedBlockStorage(y&~15,true);
-                        section.set(x&15,y&15,z&15,Blocks.AIR.getDefaultState());
+        for (int level = 1; level <= 3; level++) {
+            byte[][] hashes = new byte[2][];
+
+            for (int order = 0; order < 2; order++) {
+                int origin = order == 0 ? 128 : 256;
+                List<Chunk> chunks = new ArrayList<>();
+
+                for (int blockZ = 0; blockZ < 9; blockZ++) {
+                    for (int blockX = 0; blockX < 9; blockX++) {
+                        chunks.add(world.getChunkFromChunkCoords(origin + blockX, 128 + blockZ));
                     }
-                    for(int floor:new int[]{170,188,200}) {
-                        int floorY=floor+height-200;
-                        chunk.getBlockStorageArray()[floorY>>4].set(x&15,floorY&15,z&15,Blocks.STONE.getDefaultState());
+                }
+                for (int blockZ = 0; blockZ < 144; blockZ++) {
+                    for (int blockX = 0; blockX < 144; blockX++) {
+                        int height = 200 + Math.floorMod(blockX * 31 + blockZ * 17 + (blockX >> 3) * (blockZ >> 3), 3);
+                        Chunk chunk = chunks.get((blockX >> 4) + (blockZ >> 4) * 9);
+
+                        // Bulk fixture construction avoids relighting 20,736 artificially raised columns one by one.
+                        // The actual smoothing pass still uses real chunk writes.
+                        for (int blockY = 170; blockY < 205; blockY++) {
+                            ExtendedBlockStorage section = chunk.getBlockStorageArray()[blockY >> 4];
+
+                            if (section == null) {
+                                chunk.getBlockStorageArray()[blockY >> 4] = section = new ExtendedBlockStorage(
+                                        blockY & ~15, true);
+                            }
+
+                            section.set(blockX & 15, blockY & 15, blockZ & 15, Blocks.AIR.getDefaultState());
+                        }
+                        for (int floor : new int[] { 170, 188, 200 }) {
+                            int floorY = floor + height - 200;
+
+                            chunk.getBlockStorageArray()[floorY >> 4].set(blockX & 15, floorY & 15, blockZ & 15,
+                                    Blocks.STONE.getDefaultState());
+                        }
+                        for (int roof : new int[] { 180, 198 }) {
+                            chunk.getBlockStorageArray()[roof >> 4].set(blockX & 15, roof & 15, blockZ & 15,
+                                    Blocks.BRICK_BLOCK.getDefaultState());
+                        }
+
+                        chunk.getHeightMap()[(blockX & 15) | ((blockZ & 15) << 4)] = height + 1;
                     }
-                    for(int roof:new int[]{180,198})chunk.getBlockStorageArray()[roof>>4].set(x&15,roof&15,z&15,Blocks.BRICK_BLOCK.getDefaultState());
-                    chunk.getHeightMap()[(x&15)|((z&15)<<4)]=height+1;
                 }
-                if(order==1)Collections.reverse(chunks);
-                for(Chunk chunk:chunks)SkysTerrainSmoother.engine.smooth(world,chunk,level);
-                MessageDigest digest=MessageDigest.getInstance("SHA-256");
-                for(int z=0;z<144;z++)for(int x=0;x<144;x++)for(int y=170;y<205;y++) {
-                    IBlockState state=world.getBlockState(new BlockPos((origin<<4)+x,y,(128<<4)+z));
-                    digest.update((state.getBlock().getRegistryName()+"/"+state.getBlock().getMetaFromState(state)+"\n").getBytes("UTF-8"));
+                if (order == 1) {
+                    Collections.reverse(chunks);
                 }
-                hashes[order]=digest.digest();
+                for (Chunk chunk : chunks) {
+                    SkysTerrainSmoother.engine.smooth(world, chunk, level);
+                }
+
+                MessageDigest digest = MessageDigest.getInstance("SHA-256");
+
+                for (int blockZ = 0; blockZ < 144; blockZ++) {
+                    for (int blockX = 0; blockX < 144; blockX++) {
+                        for (int blockY = 170; blockY < 205; blockY++) {
+                            IBlockState state = world
+                                    .getBlockState(new BlockPos((origin << 4) + blockX, blockY, (128 << 4) + blockZ));
+
+                            digest.update((state.getBlock().getRegistryName() + "/"
+                                    + state.getBlock().getMetaFromState(state) + "\n").getBytes("UTF-8"));
+                        }
+                    }
+                }
+
+                hashes[order] = digest.digest();
+            }
+
+            require(Arrays.equals(hashes[0], hashes[1]), "9x9 generation order differs at level " + level);
+
+            StringBuilder hexDigest = new StringBuilder();
+
+            for (byte value : hashes[0]) {
+                hexDigest.append(String.format("%02X", value & 255));
             }
-            require(Arrays.equals(hashes[0],hashes[1]),"9x9 generation order differs at level "+level);
-            StringBuilder hex=new StringBuilder();for(byte value:hashes[0])hex.append(String.format("%02X",value&255));
-            System.out.println("TERRAIN_SMOOTHER_GENERATION_ORDER_PASS level="+level+" chunks=81 sha256="+hex);
+
+            System.out.println(
+                    "TERRAIN_SMOOTHER_GENERATION_ORDER_PASS level=" + level + " chunks=81 sha256=" + hexDigest);
         }
+
         return 486;
     }
-    static void require(boolean condition,String message){if(!condition)throw new AssertionError(message);}
+
+    static void require(boolean condition, String message) {
+        if (!condition) {
+            throw new AssertionError(message);
+        }
+    }
+
     private static boolean oreSupport(IBlockState state) {
-        if(!state.isFullCube()||state.getBlock().hasTileEntity(state))return false;
-        if(state.getBlock() instanceof BlockOre||state.getBlock() instanceof BlockRedstoneOre)return true;
-        net.minecraft.item.ItemStack stack=new net.minecraft.item.ItemStack(state.getBlock(),1,state.getBlock().getMetaFromState(state));
-        for(int id:net.minecraftforge.oredict.OreDictionary.getOreIDs(stack))
-            if(net.minecraftforge.oredict.OreDictionary.getOreName(id).startsWith("ore"))return true;
+        if (!state.isFullCube() || state.getBlock().hasTileEntity(state)) {
+            return false;
+        }
+        if (state.getBlock() instanceof BlockOre || state.getBlock() instanceof BlockRedstoneOre) {
+            return true;
+        }
+
+        net.minecraft.item.ItemStack stack = new net.minecraft.item.ItemStack(state.getBlock(), 1,
+                state.getBlock().getMetaFromState(state));
+
+        for (int blockId : net.minecraftforge.oredict.OreDictionary.getOreIDs(stack)) {
+            if (net.minecraftforge.oredict.OreDictionary.getOreName(blockId).startsWith("ore")) {
+                return true;
+            }
+        }
+
         return false;
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/SkysTerrainSmoother.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/SkysTerrainSmoother.java
index 978b6dd..c42cfbe 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/SkysTerrainSmoother.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/SkysTerrainSmoother.java
@@ -12,35 +12,73 @@
 import zone.moddev.mc.skysterrainsmoother.api.TerrainSmoothingApi;
 import zone.moddev.mc.skysterrainsmoother.internal.*;
 
-@Mod(modid=SkysTerrainSmoother.ID,name="Sky's Terrain Smoother",version=SkysTerrainSmoother.VERSION,
-        acceptedMinecraftVersions="[1.10.2]",
-        dependencies="required-before:skysgrassslabs@[1.1.0.110021,2);required-before:skysbuildingpieces@[0.3.0.110021,0.4)")
+@Mod(
+        modid = SkysTerrainSmoother.ID,
+        name = "Sky's Terrain Smoother",
+        version = SkysTerrainSmoother.VERSION,
+        acceptedMinecraftVersions = "[1.10.2]",
+        dependencies = "required-before:skysgrassslabs@[1.1.0.110021,2);required-before:skysbuildingpieces@[0.3.0.110021,0.4)")
 public final class SkysTerrainSmoother {
-    public static final String ID="skysterrainsmoother",VERSION="0.1.0.110021";
-    public static boolean enabled=true,mineralogy=true;
-    public static int level=1;
+    public static final String ID = "skysterrainsmoother", VERSION = "0.1.0.110021";
+    public static boolean enabled = true, mineralogy = true;
+    public static int level = 1;
     public static Logger logger;
     public static SmoothingEngine engine;
-    @SidedProxy(clientSide="zone.moddev.mc.skysterrainsmoother.client.ClientProxy",serverSide="zone.moddev.mc.skysterrainsmoother.client.CommonProxy")
+    @SidedProxy(
+            clientSide = "zone.moddev.mc.skysterrainsmoother.client.ClientProxy",
+            serverSide = "zone.moddev.mc.skysterrainsmoother.client.CommonProxy")
     public static zone.moddev.mc.skysterrainsmoother.client.CommonProxy proxy;
-    @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) {
-        logger=event.getModLog();Configuration config=new Configuration(event.getSuggestedConfigurationFile());config.load();
-        enabled=config.getBoolean("enabled","worldgen",true,"Smooth newly generated dry Overworld slopes and cave floors. Requires restart.");
-        level=config.getInt("smoothingLevel","worldgen",1,1,3,"1: slabs; 2: slabs and steps; 3: slabs, steps and corners. Missing shapes use slabs. Requires restart.");
-        mineralogy=config.getBoolean("enableMineralogy","compat",true,"Reuse available natural Mineralogy rock slabs. No additional blocks are registered. Requires restart.");
-        if(config.hasChanged())config.save();GrassSlabsApi.claimSmoothing(ID,enabled);
-        zone.moddev.mc.skysterrainsmoother.content.SandContent.register();proxy.preInit();
-        engine=new SmoothingEngine(MaterialCatalogue.instance());MinecraftForge.EVENT_BUS.register(engine);
+
+    @Mod.EventHandler
+    public void preInit(FMLPreInitializationEvent event) {
+        logger = event.getModLog();
+
+        Configuration config = new Configuration(event.getSuggestedConfigurationFile());
+
+        config.load();
+        enabled = config.getBoolean("enabled", "worldgen", true,
+                "Smooth newly generated dry Overworld slopes and cave floors. Requires restart.");
+        level = config.getInt("smoothingLevel", "worldgen", 1, 1, 3,
+                "1: slabs; 2: slabs and steps; 3: slabs, steps and corners. Missing shapes use slabs. Requires restart.");
+        mineralogy = config.getBoolean("enableMineralogy", "compat", true,
+                "Reuse available natural Mineralogy rock slabs. No additional blocks are registered. Requires restart.");
+
+        if (config.hasChanged()) {
+            config.save();
+        }
+
+        GrassSlabsApi.claimSmoothing(ID, enabled);
+        zone.moddev.mc.skysterrainsmoother.content.SandContent.register();
+        proxy.preInit();
+        engine = new SmoothingEngine(MaterialCatalogue.instance());
+        MinecraftForge.EVENT_BUS.register(engine);
     }
-    @Mod.EventHandler public void init(FMLInitializationEvent event) { BuiltInMaterials.register();zone.moddev.mc.skysterrainsmoother.content.SandContent.recipes(); }
-    @Mod.EventHandler public void complete(FMLLoadCompleteEvent event) {
-        MaterialCatalogue.instance().freeze();logger.info("Terrain smoothing level {}: {} registered materials; one sand slab palette",level,MaterialCatalogue.instance().size());
+
+    @Mod.EventHandler
+    public void init(FMLInitializationEvent event) {
+        BuiltInMaterials.register();
+        zone.moddev.mc.skysterrainsmoother.content.SandContent.recipes();
     }
-    @Mod.EventHandler public void beforeServer(FMLServerAboutToStartEvent event) {
-        MinecraftServer server=event.getServer();
-        engine.start(server.isDedicatedServer()?server.getFile(server.getFolderName()):new File(server.getDataDirectory(),"saves/"+server.getFolderName()));
+
+    @Mod.EventHandler
+    public void complete(FMLLoadCompleteEvent event) {
+        MaterialCatalogue.instance().freeze();
+        logger.info("Terrain smoothing level {}: {} registered materials; one sand slab palette", level,
+                MaterialCatalogue.instance().size());
     }
-    @Mod.EventHandler public void stopped(FMLServerStoppedEvent event) {
-        logger.info("Terrain smoothing completed {} passes and placed {} pieces; {} existing-chunk events skipped",engine.passes,engine.placed,engine.skippedExisting);engine.stop();
+
+    @Mod.EventHandler
+    public void beforeServer(FMLServerAboutToStartEvent event) {
+        MinecraftServer server = event.getServer();
+
+        engine.start(server.isDedicatedServer() ? server.getFile(server.getFolderName())
+                : new File(server.getDataDirectory(), "saves/" + server.getFolderName()));
+    }
+
+    @Mod.EventHandler
+    public void stopped(FMLServerStoppedEvent event) {
+        logger.info("Terrain smoothing completed {} passes and placed {} pieces; {} existing-chunk events skipped",
+                engine.passes, engine.placed, engine.skippedExisting);
+        engine.stop();
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainMaterial.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainMaterial.java
index ad6d6ba..a862e27 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainMaterial.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainMaterial.java
@@ -15,34 +15,73 @@ public final class TerrainMaterial {
     public final IBlockState slab, supportAfterPlacement;
     private final IBlockState[] steps, corners;
 
-    public TerrainMaterial(ResourceLocation id, Set<IBlockState> sources, IBlockState slab,
-            IBlockState[] steps, IBlockState[] corners, boolean grass, IBlockState supportAfterPlacement) {
-        if (id == null || sources == null || sources.isEmpty() || slab == null)
+    public TerrainMaterial(ResourceLocation materialId, Set<IBlockState> sources, IBlockState slab, IBlockState[] steps,
+            IBlockState[] corners, boolean grass, IBlockState supportAfterPlacement) {
+        if (materialId == null || sources == null || sources.isEmpty() || slab == null) {
             throw new IllegalArgumentException("A material requires an identity, exact full states and a slab");
-        this.id = id; this.sources = Collections.unmodifiableSet(new LinkedHashSet<>(sources));
-        this.slab = slab; this.steps = copyShapes(steps); this.corners = copyShapes(corners);
-        this.grass = grass; this.supportAfterPlacement = supportAfterPlacement;
-        boolean mineral=false;
-        for(IBlockState source:this.sources) {
-            if(source==null)throw new IllegalArgumentException("A source cannot be null");
-            ResourceLocation name=source.getBlock().getRegistryName();
-            if(name!=null&&name.getResourceDomain().equals("mineralogy"))mineral=true;
         }
-        this.mineralogy=mineral;
+
+        this.id = materialId;
+        this.sources = Collections.unmodifiableSet(new LinkedHashSet<>(sources));
+        this.slab = slab;
+        this.steps = copyShapes(steps);
+        this.corners = copyShapes(corners);
+        this.grass = grass;
+        this.supportAfterPlacement = supportAfterPlacement;
+
+        boolean mineral = false;
+
+        for (IBlockState source : this.sources) {
+            if (source == null) {
+                throw new IllegalArgumentException("A source cannot be null");
+            }
+
+            ResourceLocation name = source.getBlock().getRegistryName();
+
+            if (name != null && name.getResourceDomain().equals("mineralogy")) {
+                mineral = true;
+            }
+        }
+
+        this.mineralogy = mineral;
     }
+
+    /** Copy complete directional sets so callers cannot alter a registered material afterwards. */
     private static IBlockState[] copyShapes(IBlockState[] shapes) {
-        if (shapes == null) return new IBlockState[4];
-        if (shapes.length != 4) throw new IllegalArgumentException("Provide all four directions");
+        if (shapes == null) {
+            return new IBlockState[4];
+        }
+        if (shapes.length != 4) {
+            throw new IllegalArgumentException("Provide all four directions");
+        }
+
         int present = 0;
-        for (IBlockState state : shapes) if (state != null) ++present;
-        if (present != 0 && present != 4) throw new IllegalArgumentException("A shape needs every direction or none");
+
+        for (IBlockState state : shapes) {
+            if (state != null) {
+                ++present;
+            }
+        }
+        if (present != 0 && present != 4) {
+            throw new IllegalArgumentException("A shape needs every direction or none");
+        }
+
         return shapes.clone();
     }
-    public IBlockState step(int direction) { return steps[direction]; }
-    public IBlockState corner(int direction) { return corners[direction]; }
+
+    public IBlockState step(int direction) {
+        return steps[direction];
+    }
+
+    public IBlockState corner(int direction) {
+        return corners[direction];
+    }
+
     public TerrainMaterial withAdditionalShapes(IBlockState[] addedSteps, IBlockState[] addedCorners) {
-        if (addedSteps != null && steps[0] != null || addedCorners != null && corners[0] != null)
+        if (addedSteps != null && steps[0] != null || addedCorners != null && corners[0] != null) {
             throw new IllegalArgumentException("An add-on may supply missing shapes, not replace existing shapes");
+        }
+
         return new TerrainMaterial(id, sources, slab, addedSteps == null ? steps : addedSteps,
                 addedCorners == null ? corners : addedCorners, grass, supportAfterPlacement);
     }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java
index bd9baff..9c2da17 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java
@@ -12,23 +12,53 @@
 public final class TerrainSmoothingApi {
     public static final int VERSION = 1;
     private static final MaterialCatalogue CATALOGUE = MaterialCatalogue.instance();
-    private TerrainSmoothingApi() { }
+
+    private TerrainSmoothingApi() {
+    }
 
     /** A restrictive rule; it cannot enable a material disabled by the player. */
-    public interface BiomeRule { boolean allows(ResourceLocation material, Biome biome); }
+    public interface BiomeRule {
+        boolean allows(ResourceLocation material, Biome biome);
+    }
+
     /** A read-only veto. No world object is exposed and the engine performs all writes. */
-    public interface AreaProtection { boolean protects(int dimension, BlockPos target, Biome biome); }
+    public interface AreaProtection {
+        boolean protects(int dimension, BlockPos target, Biome biome);
+    }
+
     private static void requireInitialization() {
-        if (!Loader.instance().isInState(LoaderState.INITIALIZATION) &&
-                !Loader.instance().isInState(LoaderState.POSTINITIALIZATION))
+        if (!Loader.instance().isInState(LoaderState.INITIALIZATION)
+                && !Loader.instance().isInState(LoaderState.POSTINITIALIZATION)) {
             throw new IllegalStateException("Terrain extensions must register during initialization");
+        }
+    }
+
+    /** Register exact full-block states and their pieces during initialization, before the catalogue freezes. */
+    public static void registerMaterial(TerrainMaterial material) {
+        requireInitialization();
+        CATALOGUE.register(material);
     }
-    public static void registerMaterial(TerrainMaterial material) { requireInitialization(); CATALOGUE.register(material); }
+
+    /** Supply missing finer shapes without replacing the material's slab or existing shapes. */
     public static void addShapes(ResourceLocation material, IBlockState[] steps, IBlockState[] corners) {
-        requireInitialization(); CATALOGUE.addShapes(material, steps, corners);
+        requireInitialization();
+        CATALOGUE.addShapes(material, steps, corners);
+    }
+
+    /** Restrict eligible biomes; an add-on cannot override a disabled player setting. */
+    public static void addBiomeRule(BiomeRule rule) {
+        requireInitialization();
+        CATALOGUE.addBiomeRule(rule);
     }
-    public static void addBiomeRule(BiomeRule rule) { requireInitialization(); CATALOGUE.addBiomeRule(rule); }
-    public static void addAreaProtection(AreaProtection rule) { requireInitialization(); CATALOGUE.addAreaProtection(rule); }
+
+    /** Add a read-only veto for protected areas; the engine remains responsible for world writes. */
+    public static void addAreaProtection(AreaProtection rule) {
+        requireInitialization();
+        CATALOGUE.addAreaProtection(rule);
+    }
+
     /** Allows an add-on to skip disabled or unavailable built-in material mappings. */
-    public static boolean hasMaterial(ResourceLocation id) { return CATALOGUE.material(id)!=null; }
+    public static boolean hasMaterial(ResourceLocation materialId) {
+        return CATALOGUE.material(materialId) != null;
+    }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/client/ClientProxy.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/client/ClientProxy.java
index b9cf62e..0b8b656 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/client/ClientProxy.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/client/ClientProxy.java
@@ -7,8 +7,13 @@
 import zone.moddev.mc.skysterrainsmoother.content.SandContent;
 
 public final class ClientProxy extends CommonProxy {
-    @Override public void preInit() {
-        for(int variant=0;variant<2;variant++)ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SandContent.slab),variant*2,
-                new ModelResourceLocation(new ResourceLocation("skysterrainsmoother",variant==0?"sand_slab":"red_sand_slab"),"inventory"));
+    @Override
+    public void preInit() {
+        for (int variant = 0; variant < 2; variant++) {
+            ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SandContent.slab), variant * 2,
+                    new ModelResourceLocation(
+                            new ResourceLocation("skysterrainsmoother", variant == 0 ? "sand_slab" : "red_sand_slab"),
+                            "inventory"));
+        }
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/client/CommonProxy.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/client/CommonProxy.java
index 42f5fd2..65aded0 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/client/CommonProxy.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/client/CommonProxy.java
@@ -1,3 +1,6 @@
 package zone.moddev.mc.skysterrainsmoother.client;
 
-public class CommonProxy { public void preInit() { } }
+public class CommonProxy {
+    public void preInit() {
+    }
+}
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandContent.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandContent.java
index 493646b..773d112 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandContent.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandContent.java
@@ -6,15 +6,22 @@
 
 public final class SandContent {
     public static SandSlabBlock slab;
-    private SandContent() { }
+
+    private SandContent() {
+    }
+
     public static void register() {
-        slab=new SandSlabBlock(); GameRegistry.register(slab);
+        slab = new SandSlabBlock();
+        GameRegistry.register(slab);
         GameRegistry.register(new SandSlabItem(slab).setRegistryName(slab.getRegistryName()));
     }
+
     public static void recipes() {
-        for(int variant=0;variant<2;variant++) {
-            GameRegistry.addShapedRecipe(new ItemStack(slab,6,variant*2),"SSS",'S',new ItemStack(Blocks.SAND,1,variant));
-            GameRegistry.addShapedRecipe(new ItemStack(Blocks.SAND,1,variant),"SS",'S',new ItemStack(slab,1,variant*2));
+        for (int variant = 0; variant < 2; variant++) {
+            GameRegistry.addShapedRecipe(new ItemStack(slab, 6, variant * 2), "SSS", 'S',
+                    new ItemStack(Blocks.SAND, 1, variant));
+            GameRegistry.addShapedRecipe(new ItemStack(Blocks.SAND, 1, variant), "SS", 'S',
+                    new ItemStack(slab, 1, variant * 2));
         }
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java
index b7423ca..d226580 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java
@@ -24,38 +24,119 @@ public SandSlabBlock() {
         setUnlocalizedName("skysterrainsmoother.sand_slab");
         setDefaultState(blockState.getBaseState().withProperty(BlockSand.VARIANT, BlockSand.EnumType.SAND)
                 .withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.BOTTOM));
-        setHardness(.5f); setSoundType(SoundType.SAND); setLightOpacity(0);
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS); useNeighborBrightness = true;
-    }
-    @Override protected BlockStateContainer createBlockState() { return new BlockStateContainer(this, BlockSand.VARIANT, BlockSlab.HALF); }
-    @Override public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(BlockSand.VARIANT, (meta & 2) == 0 ? BlockSand.EnumType.SAND : BlockSand.EnumType.RED_SAND)
-                .withProperty(BlockSlab.HALF, (meta & 1) == 0 ? BlockSlab.EnumBlockHalf.TOP : BlockSlab.EnumBlockHalf.BOTTOM);
-    }
-    @Override public int getMetaFromState(IBlockState state) { return state.getValue(BlockSand.VARIANT).getMetadata() * 2 + (state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM ? 1 : 0); }
-    @Override public int damageDropped(IBlockState state) { return getMetaFromState(state) & 2; }
-    @Override public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> items) { items.add(new ItemStack(item,1,0)); items.add(new ItemStack(item,1,2)); }
-    @Override public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing face, float x, float y, float z, int meta, EntityLivingBase placer, ItemStack stack) {
-        return getStateFromMeta(meta).withProperty(BlockSlab.HALF, face == EnumFacing.DOWN || face != EnumFacing.UP && y > .5 ? BlockSlab.EnumBlockHalf.TOP : BlockSlab.EnumBlockHalf.BOTTOM);
-    }
-    @Override public boolean isOpaqueCube(IBlockState state) { return false; }
-    @Override public boolean isFullCube(IBlockState state) { return false; }
-    @Override public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return side == (state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP ? EnumFacing.UP : EnumFacing.DOWN); }
-    @Override public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return isSideSolid(state,world,pos,side); }
-    @Override public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) { return true; }
-    @Override public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { return state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP ? new AxisAlignedBB(0,.5,0,1,1,1) : new AxisAlignedBB(0,0,0,1,.5,1); }
-    @Override public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) { return getBoundingBox(state,world,pos); }
-    @Override public String getHarvestTool(IBlockState state) { return "shovel"; }
-    @Override protected ItemStack getSilkTouchDrop(IBlockState state) { return new ItemStack(this,1,damageDropped(state)); }
-    @Override public void updateTick(World world, BlockPos pos, IBlockState state, Random random) {
-        if (world.isRemote || !world.getBlockState(pos).equals(state) || pos.getY() <= 0 || !canFallThrough(world.getBlockState(pos.down()))) return;
-        if (!fallInstantly && world.isAreaLoaded(pos.add(-32,-32,-32),pos.add(32,32,32))) {
-            world.spawnEntity(new EntityFallingBlock(world,pos.getX()+.5,pos.getY(),pos.getZ()+.5,state));
+        setHardness(.5f);
+        setSoundType(SoundType.SAND);
+        setLightOpacity(0);
+        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
+        useNeighborBrightness = true;
+    }
+
+    @Override
+    protected BlockStateContainer createBlockState() {
+        return new BlockStateContainer(this, BlockSand.VARIANT, BlockSlab.HALF);
+    }
+
+    @Override
+    public IBlockState getStateFromMeta(int meta) {
+        return getDefaultState()
+                .withProperty(BlockSand.VARIANT,
+                        (meta & 2) == 0 ? BlockSand.EnumType.SAND : BlockSand.EnumType.RED_SAND)
+                .withProperty(BlockSlab.HALF,
+                        (meta & 1) == 0 ? BlockSlab.EnumBlockHalf.TOP : BlockSlab.EnumBlockHalf.BOTTOM);
+    }
+
+    @Override
+    public int getMetaFromState(IBlockState state) {
+        return state.getValue(BlockSand.VARIANT).getMetadata() * 2
+                + (state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM ? 1 : 0);
+    }
+
+    @Override
+    public int damageDropped(IBlockState state) {
+        return getMetaFromState(state) & 2;
+    }
+
+    @Override
+    public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> items) {
+        items.add(new ItemStack(item, 1, 0));
+        items.add(new ItemStack(item, 1, 2));
+    }
+
+    @Override
+    public IBlockState getStateForPlacement(World world, BlockPos pos, EnumFacing face, float hitX, float hitY,
+            float hitZ, int meta, EntityLivingBase placer, ItemStack stack) {
+        return getStateFromMeta(meta).withProperty(BlockSlab.HALF,
+                face == EnumFacing.DOWN || face != EnumFacing.UP && hitY > .5 ? BlockSlab.EnumBlockHalf.TOP
+                        : BlockSlab.EnumBlockHalf.BOTTOM);
+    }
+
+    @Override
+    public boolean isOpaqueCube(IBlockState state) {
+        return false;
+    }
+
+    @Override
+    public boolean isFullCube(IBlockState state) {
+        return false;
+    }
+
+    @Override
+    public boolean isSideSolid(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
+        return side == (state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP ? EnumFacing.UP
+                : EnumFacing.DOWN);
+    }
+
+    @Override
+    public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
+        return isSideSolid(state, world, pos, side);
+    }
+
+    @Override
+    public boolean shouldSideBeRendered(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
+        return true;
+    }
+
+    @Override
+    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
+        return state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP ? new AxisAlignedBB(0, .5, 0, 1, 1, 1)
+                : new AxisAlignedBB(0, 0, 0, 1, .5, 1);
+    }
+
+    @Override
+    public AxisAlignedBB getCollisionBoundingBox(IBlockState state, World world, BlockPos pos) {
+        return getBoundingBox(state, world, pos);
+    }
+
+    @Override
+    public String getHarvestTool(IBlockState state) {
+        return "shovel";
+    }
+
+    @Override
+    protected ItemStack getSilkTouchDrop(IBlockState state) {
+        return new ItemStack(this, 1, damageDropped(state));
+    }
+
+    @Override
+    public void updateTick(World world, BlockPos pos, IBlockState state, Random random) {
+        if (world.isRemote || !world.getBlockState(pos).equals(state) || pos.getY() <= 0
+                || !canFallThrough(world.getBlockState(pos.down()))) {
+            return;
+        }
+        if (!fallInstantly && world.isAreaLoaded(pos.add(-32, -32, -32), pos.add(32, 32, 32))) {
+            world.spawnEntity(new EntityFallingBlock(world, pos.getX() + .5, pos.getY(), pos.getZ() + .5, state));
         } else {
             // Vanilla's instant path uses a default state. Keep red sand and the half here.
-            world.setBlockToAir(pos); BlockPos landing=pos.down();
-            while (landing.getY() > 0 && canFallThrough(world.getBlockState(landing))) landing=landing.down();
-            if (landing.getY() > 0) world.setBlockState(landing.up(),state,3);
+            world.setBlockToAir(pos);
+
+            BlockPos landing = pos.down();
+
+            while (landing.getY() > 0 && canFallThrough(world.getBlockState(landing))) {
+                landing = landing.down();
+            }
+            if (landing.getY() > 0) {
+                world.setBlockState(landing.up(), state, 3);
+            }
         }
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabItem.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabItem.java
index 27a8c99..a64a576 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabItem.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabItem.java
@@ -14,25 +14,66 @@
 
 /** Horizontal placement only. Matching halves normalize to the original sand. */
 public final class SandSlabItem extends ItemBlock {
-    public SandSlabItem(SandSlabBlock block) { super(block); setHasSubtypes(true); setMaxDamage(0); }
-    @Override public int getMetadata(int damage) { return damage & 2; }
-    @Override public String getUnlocalizedName(ItemStack stack) { return "tile.skysterrainsmoother." + ((stack.getItemDamage() & 2) == 0 ? "sand_slab" : "red_sand_slab"); }
-    @Override public boolean canPlaceBlockOnSide(World world,BlockPos pos,EnumFacing side,EntityPlayer player,ItemStack stack) {
-        if(world.getBlockState(pos).getBlock()==block||world.getBlockState(pos.offset(side)).getBlock()==block)return player.canPlayerEdit(pos,side,stack);
-        return super.canPlaceBlockOnSide(world,pos,side,player,stack);
+    public SandSlabItem(SandSlabBlock block) {
+        super(block);
+        setHasSubtypes(true);
+        setMaxDamage(0);
     }
-    @Override public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing face, float x, float y, float z) {
-        IBlockState state=world.getBlockState(pos);
-        boolean exposed=state.getBlock()==block && (face==EnumFacing.UP && state.getValue(BlockSlab.HALF)==BlockSlab.EnumBlockHalf.BOTTOM || face==EnumFacing.DOWN && state.getValue(BlockSlab.HALF)==BlockSlab.EnumBlockHalf.TOP);
-        BlockPos target=exposed?pos:pos.offset(face); state=world.getBlockState(target);
-        if(state.getBlock()==block && ((SandSlabBlock)block).damageDropped(state)==getMetadata(stack.getItemDamage())) {
-            if(stack.stackSize<=0||!player.canPlayerEdit(target,face,stack)||!world.checkNoEntityCollision(Block.FULL_BLOCK_AABB.offset(target)))return EnumActionResult.FAIL;
-            IBlockState full=Blocks.SAND.getDefaultState().withProperty(BlockSand.VARIANT,state.getValue(BlockSand.VARIANT));
-            if(!world.setBlockState(target,full,11))return EnumActionResult.FAIL;
-            world.playSound(player,target,SoundEvents.BLOCK_SAND_PLACE,SoundCategory.BLOCKS,1,.8f);
-            if(!player.capabilities.isCreativeMode)--stack.stackSize;
+
+    @Override
+    public int getMetadata(int damage) {
+        return damage & 2;
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack stack) {
+        return "tile.skysterrainsmoother." + ((stack.getItemDamage() & 2) == 0 ? "sand_slab" : "red_sand_slab");
+    }
+
+    @Override
+    public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side, EntityPlayer player,
+            ItemStack stack) {
+        if (world.getBlockState(pos).getBlock() == block || world.getBlockState(pos.offset(side)).getBlock() == block) {
+            return player.canPlayerEdit(pos, side, stack);
+        }
+
+        return super.canPlaceBlockOnSide(world, pos, side, player, stack);
+    }
+
+    @Override
+    public EnumActionResult onItemUse(ItemStack stack, EntityPlayer player, World world, BlockPos pos, EnumHand hand,
+            EnumFacing face, float hitX, float hitY, float hitZ) {
+        IBlockState state = world.getBlockState(pos);
+        boolean exposed = state.getBlock() == block
+                && (face == EnumFacing.UP && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM
+                        || face == EnumFacing.DOWN && state.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.TOP);
+        BlockPos target = exposed ? pos : pos.offset(face);
+
+        state = world.getBlockState(target);
+
+        if (state.getBlock() == block
+                && ((SandSlabBlock) block).damageDropped(state) == getMetadata(stack.getItemDamage())) {
+            if (stack.stackSize <= 0 || !player.canPlayerEdit(target, face, stack)
+                    || !world.checkNoEntityCollision(Block.FULL_BLOCK_AABB.offset(target))) {
+                return EnumActionResult.FAIL;
+            }
+
+            IBlockState full = Blocks.SAND.getDefaultState().withProperty(BlockSand.VARIANT,
+                    state.getValue(BlockSand.VARIANT));
+
+            if (!world.setBlockState(target, full, 11)) {
+                return EnumActionResult.FAIL;
+            }
+
+            world.playSound(player, target, SoundEvents.BLOCK_SAND_PLACE, SoundCategory.BLOCKS, 1, .8f);
+
+            if (!player.capabilities.isCreativeMode) {
+                --stack.stackSize;
+            }
+
             return EnumActionResult.SUCCESS;
         }
-        return super.onItemUse(stack,player,world,pos,hand,face,x,y,z);
+
+        return super.onItemUse(stack, player, world, pos, hand, face, hitX, hitY, hitZ);
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java
index 6823273..56c012a 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java
@@ -13,52 +13,94 @@
 import zone.moddev.mc.skysterrainsmoother.SkysTerrainSmoother;
 import zone.moddev.mc.skysterrainsmoother.api.*;
 
+/** Registers known natural surfaces without treating ores or decorative blocks as terrain. */
 public final class BuiltInMaterials {
-    private static final String[] ROCKS = {"basalt","rhyolite","basaltic_glass","scoria","tuff","pumice",
-            "pegmatite","diabase","gabbro","peridotite","shale","conglomerate","dolomite","limestone",
-            "siltstone","rock_salt","chert","gypsum","chalk","marble","slate","schist","gneiss",
-            "phyllite","amphibolite","hornfels","quartzite","novaculite"};
-    private BuiltInMaterials() { }
+    private static final String[] ROCKS = { "basalt", "rhyolite", "basaltic_glass", "scoria", "tuff", "pumice",
+            "pegmatite", "diabase", "gabbro", "peridotite", "shale", "conglomerate", "dolomite", "limestone",
+            "siltstone", "rock_salt", "chert", "gypsum", "chalk", "marble", "slate", "schist", "gneiss", "phyllite",
+            "amphibolite", "hornfels", "quartzite", "novaculite" };
+
+    private BuiltInMaterials() {
+    }
+
     public static void register() {
-        vanilla("grass",Blocks.GRASS.getDefaultState(),true,ModBlocks.GRASS_SLAB.getDefaultState());
-        vanilla("dirt",Blocks.DIRT.getStateFromMeta(0),false,ModBlocks.DIRT_SLAB.getDefaultState());
-        vanilla("stone",Blocks.STONE.getStateFromMeta(0),false,null);
-        vanilla("granite",Blocks.STONE.getStateFromMeta(1),false,null);
-        vanilla("diorite",Blocks.STONE.getStateFromMeta(3),false,null);
-        vanilla("andesite",Blocks.STONE.getStateFromMeta(5),false,null);
-        vanilla("sandstone",Blocks.SANDSTONE.getStateFromMeta(0),false,null);
-        vanilla("red_sandstone",Blocks.RED_SANDSTONE.getStateFromMeta(0),false,null);
-        vanilla("hardened_clay",Blocks.HARDENED_CLAY.getDefaultState(),false,null);
-        for(int variant=0;variant<2;variant++)TerrainSmoothingApi.registerMaterial(new TerrainMaterial(
-                new ResourceLocation("minecraft",variant==0?"sand":"red_sand"),Collections.singleton(Blocks.SAND.getStateFromMeta(variant)),
-                zone.moddev.mc.skysterrainsmoother.content.SandContent.slab.getStateFromMeta(variant*2+1),null,null,false,null));
-        if (!SkysTerrainSmoother.mineralogy || !Loader.isModLoaded("mineralogy")) return;
-        int count=0,missing=0;
-        for(String rock:ROCKS) {
-            ResourceLocation fullId=new ResourceLocation("mineralogy",rock),slabId=new ResourceLocation("mineralogy",rock+"_slab");
-            if(!Block.REGISTRY.containsKey(fullId)||!Block.REGISTRY.containsKey(slabId)){++missing;continue;}
-            IBlockState slab=bottom(Block.REGISTRY.getObject(slabId).getDefaultState());
+        vanilla("grass", Blocks.GRASS.getDefaultState(), true, ModBlocks.GRASS_SLAB.getDefaultState());
+        vanilla("dirt", Blocks.DIRT.getStateFromMeta(0), false, ModBlocks.DIRT_SLAB.getDefaultState());
+        vanilla("stone", Blocks.STONE.getStateFromMeta(0), false, null);
+        vanilla("granite", Blocks.STONE.getStateFromMeta(1), false, null);
+        vanilla("diorite", Blocks.STONE.getStateFromMeta(3), false, null);
+        vanilla("andesite", Blocks.STONE.getStateFromMeta(5), false, null);
+        vanilla("sandstone", Blocks.SANDSTONE.getStateFromMeta(0), false, null);
+        vanilla("red_sandstone", Blocks.RED_SANDSTONE.getStateFromMeta(0), false, null);
+        vanilla("hardened_clay", Blocks.HARDENED_CLAY.getDefaultState(), false, null);
+
+        for (int variant = 0; variant < 2; variant++) {
+            TerrainSmoothingApi.registerMaterial(new TerrainMaterial(
+                    new ResourceLocation("minecraft", variant == 0 ? "sand" : "red_sand"),
+                    Collections.singleton(Blocks.SAND.getStateFromMeta(variant)),
+                    zone.moddev.mc.skysterrainsmoother.content.SandContent.slab.getStateFromMeta(variant * 2 + 1), null,
+                    null, false, null));
+        }
+        if (!SkysTerrainSmoother.mineralogy || !Loader.isModLoaded("mineralogy")) {
+            return;
+        }
+
+        int count = 0;
+        int missing = 0;
+
+        for (String rock : ROCKS) {
+            ResourceLocation fullId = new ResourceLocation("mineralogy", rock);
+            ResourceLocation slabId = new ResourceLocation("mineralogy", rock + "_slab");
+
+            if (!Block.REGISTRY.containsKey(fullId) || !Block.REGISTRY.containsKey(slabId)) {
+                ++missing;
+                continue;
+            }
+
+            IBlockState slab = bottom(Block.REGISTRY.getObject(slabId).getDefaultState());
+
             TerrainSmoothingApi.registerMaterial(new TerrainMaterial(fullId,
-                    Collections.singleton(Block.REGISTRY.getObject(fullId).getDefaultState()),slab,null,null,false,null));++count;
+                    Collections.singleton(Block.REGISTRY.getObject(fullId).getDefaultState()), slab, null, null, false,
+                    null));
+            ++count;
         }
-        SkysTerrainSmoother.logger.info("Mineralogy smoothing: {} natural rocks available, {} unavailable slab forms skipped",count,missing);
+
+        SkysTerrainSmoother.logger.info(
+                "Mineralogy smoothing: {} natural rocks available, {} unavailable slab forms skipped", count, missing);
     }
-    private static void vanilla(String name,IBlockState source,boolean grass,IBlockState slab) {
-        String material="minecraft:"+name;
-        if(slab==null)slab=BuildingPiecesApi.bottomPiece(material,BuildingPiecesApi.TerrainShape.SLAB,EnumFacing.NORTH);
-        IBlockState[] steps=new IBlockState[4],corners=new IBlockState[4];
-        EnumFacing[] directions={EnumFacing.NORTH,EnumFacing.EAST,EnumFacing.SOUTH,EnumFacing.WEST};
-        for(int i=0;i<4;++i) {
-            steps[i]=BuildingPiecesApi.bottomPiece(material,BuildingPiecesApi.TerrainShape.STEP,directions[i]);
-            corners[i]=BuildingPiecesApi.bottomPiece(material,BuildingPiecesApi.TerrainShape.CORNER,directions[i]);
+
+    private static void vanilla(String name, IBlockState source, boolean grass, IBlockState slab) {
+        String material = "minecraft:" + name;
+
+        if (slab == null) {
+            slab = BuildingPiecesApi.bottomPiece(material, BuildingPiecesApi.TerrainShape.SLAB, EnumFacing.NORTH);
         }
-        TerrainSmoothingApi.registerMaterial(new TerrainMaterial(new ResourceLocation(material),Collections.singleton(source),
-                slab,steps,corners,grass,grass?Blocks.DIRT.getDefaultState():null));
+
+        IBlockState[] steps = new IBlockState[4];
+        IBlockState[] corners = new IBlockState[4];
+
+        EnumFacing[] directions = { EnumFacing.NORTH, EnumFacing.EAST, EnumFacing.SOUTH, EnumFacing.WEST };
+
+        for (int directionIndex = 0; directionIndex < 4; ++directionIndex) {
+            steps[directionIndex] = BuildingPiecesApi.bottomPiece(material, BuildingPiecesApi.TerrainShape.STEP,
+                    directions[directionIndex]);
+            corners[directionIndex] = BuildingPiecesApi.bottomPiece(material, BuildingPiecesApi.TerrainShape.CORNER,
+                    directions[directionIndex]);
+        }
+
+        TerrainSmoothingApi
+                .registerMaterial(new TerrainMaterial(new ResourceLocation(material), Collections.singleton(source),
+                        slab, steps, corners, grass, grass ? Blocks.DIRT.getDefaultState() : null));
     }
-    @SuppressWarnings({"rawtypes","unchecked"})
+
+    @SuppressWarnings({ "rawtypes", "unchecked" })
     private static IBlockState bottom(IBlockState state) {
-        for(IProperty property:state.getPropertyKeys())if(property.getName().equals("facing")&&property.getAllowedValues().contains(EnumFacing.UP))
-            return state.withProperty(property,EnumFacing.UP);
-        throw new IllegalStateException("Unsupported Mineralogy slab orientation property: "+state);
+        for (IProperty property : state.getPropertyKeys()) {
+            if (property.getName().equals("facing") && property.getAllowedValues().contains(EnumFacing.UP)) {
+                return state.withProperty(property, EnumFacing.UP);
+            }
+        }
+
+        throw new IllegalStateException("Unsupported Mineralogy slab orientation property: " + state);
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/EmptyAccess.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/EmptyAccess.java
index 04e5562..39fe4b1 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/EmptyAccess.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/EmptyAccess.java
@@ -12,12 +12,36 @@
 
 final class EmptyAccess implements IBlockAccess {
     static final EmptyAccess INSTANCE = new EmptyAccess();
-    public TileEntity getTileEntity(BlockPos pos) { return null; }
-    public int getCombinedLight(BlockPos pos,int light) { return 0; }
-    public IBlockState getBlockState(BlockPos pos) { return Blocks.AIR.getDefaultState(); }
-    public boolean isAirBlock(BlockPos pos) { return true; }
-    public Biome getBiome(BlockPos pos) { return Biomes.PLAINS; }
-    public int getStrongPower(BlockPos pos,EnumFacing side) { return 0; }
-    public WorldType getWorldType() { return WorldType.DEFAULT; }
-    public boolean isSideSolid(BlockPos pos,EnumFacing side,boolean fallback) { return false; }
+
+    public TileEntity getTileEntity(BlockPos pos) {
+        return null;
+    }
+
+    public int getCombinedLight(BlockPos pos, int light) {
+        return 0;
+    }
+
+    public IBlockState getBlockState(BlockPos pos) {
+        return Blocks.AIR.getDefaultState();
+    }
+
+    public boolean isAirBlock(BlockPos pos) {
+        return true;
+    }
+
+    public Biome getBiome(BlockPos pos) {
+        return Biomes.PLAINS;
+    }
+
+    public int getStrongPower(BlockPos pos, EnumFacing side) {
+        return 0;
+    }
+
+    public WorldType getWorldType() {
+        return WorldType.DEFAULT;
+    }
+
+    public boolean isSideSolid(BlockPos pos, EnumFacing side, boolean fallback) {
+        return false;
+    }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/ExistingChunkIndex.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/ExistingChunkIndex.java
index 843c2b3..fd796a8 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/ExistingChunkIndex.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/ExistingChunkIndex.java
@@ -4,30 +4,64 @@
 import java.util.*;
 import java.util.regex.*;
 
-/** Reads Anvil location headers, never chunks. Includes unpopulated saved entries. */
+/** Indexes saved Anvil entries without loading chunks, including entries not yet populated. */
 public final class ExistingChunkIndex {
     private static final Pattern REGION = Pattern.compile("r\\.(-?\\d+)\\.(-?\\d+)\\.mca");
     private final Map<Long, BitSet> regions = new HashMap<>();
+
     public ExistingChunkIndex(File worldDirectory) throws IOException {
         File folder = new File(worldDirectory, "region");
-        if (!folder.exists()) return;
+
+        if (!folder.exists()) {
+            return;
+        }
+
         File[] files = folder.listFiles();
-        if (files == null) throw new IOException("Cannot index existing world region headers");
+
+        if (files == null) {
+            throw new IOException("Cannot index existing world region headers");
+        }
         for (File file : files) {
             Matcher matcher = REGION.matcher(file.getName());
-            if (!matcher.matches()) continue;
-            int x = Integer.parseInt(matcher.group(1)), z = Integer.parseInt(matcher.group(2));
+
+            if (!matcher.matches()) {
+                continue;
+            }
+
+            int regionX = Integer.parseInt(matcher.group(1));
+            int regionZ = Integer.parseInt(matcher.group(2));
+
             BitSet entries = new BitSet(1024);
+
             try (DataInputStream header = new DataInputStream(new BufferedInputStream(new FileInputStream(file)))) {
-                for (int slot = 0; slot < 1024; ++slot) if (header.readInt() != 0) entries.set(slot);
+                for (int slot = 0; slot < 1024; ++slot) {
+                    if (header.readInt() != 0) {
+                        entries.set(slot);
+                    }
+                }
             }
-            regions.put(key(x,z), entries);
+
+            regions.put(key(regionX, regionZ), entries);
+        }
+    }
+
+    public boolean contains(int chunkX, int chunkZ) {
+        BitSet region = regions.get(key(chunkX >> 5, chunkZ >> 5));
+
+        return region != null && region.get((chunkX & 31) | ((chunkZ & 31) << 5));
+    }
+
+    public int size() {
+        int count = 0;
+
+        for (BitSet region : regions.values()) {
+            count += region.cardinality();
         }
+
+        return count;
     }
-    public boolean contains(int x,int z) {
-        BitSet region = regions.get(key(x>>5,z>>5));
-        return region != null && region.get((x&31)|((z&31)<<5));
+
+    public static long key(int chunkX, int chunkZ) {
+        return ((long) chunkX << 32) ^ (chunkZ & 0xffffffffL);
     }
-    public int size() { int count=0; for(BitSet region:regions.values())count+=region.cardinality(); return count; }
-    public static long key(int x,int z) { return ((long)x << 32) ^ (z & 0xffffffffL); }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/Footprint.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/Footprint.java
index 2b7aad6..6653cf3 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/Footprint.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/Footprint.java
@@ -2,33 +2,73 @@
 
 /** Four lower half-height cells: NW, NE, SE, SW. No arbitrary composites. */
 public final class Footprint {
-    public static final int[] EDGES = {3, 6, 12, 9};
-    private Footprint() { }
+    public static final int[] EDGES = { 3, 6, 12, 9 };
+
+    private Footprint() {
+    }
+
     public static int mask(int cardinalHigher, int diagonalHigher, int level) {
         validateLevel(level);
+
         int mask = 0;
-        for (int direction = 0; direction < 4; ++direction)
-            if ((cardinalHigher & 1 << direction) != 0) mask |= EDGES[direction];
-        if (level == 3) mask |= diagonalHigher & 15;
+
+        for (int direction = 0; direction < 4; ++direction) {
+            if ((cardinalHigher & 1 << direction) != 0) {
+                mask |= EDGES[direction];
+            }
+        }
+        if (level == 3) {
+            mask |= diagonalHigher & 15;
+        }
+
         return mask;
     }
-    /** 0=no piece, 1=slab, 2=step, 3=corner. */
+
+    /** Returns no piece (0), a slab (1), a step (2), or a corner (3); no arbitrary composites. */
     public static int shape(int mask, int level) {
         validateLevel(level);
-        if ((mask & ~15) != 0) throw new IllegalArgumentException("Invalid footprint");
-        if (mask == 0) return 0;
-        if (level == 3 && Integer.bitCount(mask) == 1) return 3;
-        if (level >= 2) for (int edge : EDGES) if (mask == edge) return 2;
+
+        if ((mask & ~15) != 0) {
+            throw new IllegalArgumentException("Invalid footprint");
+        }
+        if (mask == 0) {
+            return 0;
+        }
+        if (level == 3 && Integer.bitCount(mask) == 1) {
+            return 3;
+        }
+        if (level >= 2) {
+            for (int edge : EDGES) {
+                if (mask == edge) {
+                    return 2;
+                }
+            }
+        }
+
         return 1;
     }
+
     public static int direction(int mask, int shape) {
-        if (shape == 3) return Integer.numberOfTrailingZeros(mask);
-        if (shape == 2) for (int direction = 0; direction < 4; ++direction) if (EDGES[direction] == mask) return direction;
+        if (shape == 3) {
+            return Integer.numberOfTrailingZeros(mask);
+        }
+        if (shape == 2) {
+            for (int direction = 0; direction < 4; ++direction) {
+                if (EDGES[direction] == mask) {
+                    return direction;
+                }
+            }
+        }
+
         return 0;
     }
+
     public static void validateLevel(int level) {
-        if (level < 1 || level > 3) throw new IllegalArgumentException("Smoothing level must be 1, 2 or 3");
+        if (level < 1 || level > 3) {
+            throw new IllegalArgumentException("Smoothing level must be 1, 2 or 3");
+        }
     }
+
     /** Cross-border reads retain the established east/south-only policy. */
     public static boolean allowedNeighbour(int localX, int localZ) {
         return localX >= 0 && localZ >= 0 && localX <= 16 && localZ <= 16;
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/MaterialCatalogue.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/MaterialCatalogue.java
index 3f6e97a..fd94a58 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/MaterialCatalogue.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/MaterialCatalogue.java
@@ -10,92 +10,225 @@
 
 /** Baked lookup tables. No registry scans or reflective lookups in the column pass. */
 public final class MaterialCatalogue {
-    private static final MaterialCatalogue INSTANCE=new MaterialCatalogue();
-    public static MaterialCatalogue instance(){return INSTANCE;}
+    private static final MaterialCatalogue INSTANCE = new MaterialCatalogue();
+
+    public static MaterialCatalogue instance() {
+        return INSTANCE;
+    }
+
     private final Map<ResourceLocation, TerrainMaterial> materials = new LinkedHashMap<>();
     private final Map<IBlockState, TerrainMaterial> sources = new HashMap<>(), pieces = new HashMap<>();
     private final List<TerrainSmoothingApi.BiomeRule> biomeRules = new ArrayList<>();
     private final List<TerrainSmoothingApi.AreaProtection> protections = new ArrayList<>();
     private boolean frozen;
+
     public void register(TerrainMaterial material) {
-        requireOpen(); validate(material);
-        if (materials.containsKey(material.id)) throw new IllegalArgumentException("Duplicate material " + material.id);
-        for (IBlockState source : material.sources) if (sources.containsKey(canonical(source)))
-            throw new IllegalArgumentException("Conflicting terrain source " + source);
-        Map<ResourceLocation,TerrainMaterial> candidate=new LinkedHashMap<>(materials);
-        candidate.put(material.id, material); commit(candidate);
-    }
-    public void addShapes(ResourceLocation id, IBlockState[] steps, IBlockState[] corners) {
-        requireOpen(); TerrainMaterial current = materials.get(id);
-        if (current == null) throw new IllegalArgumentException("Register the base material first: " + id);
-        TerrainMaterial updated = current.withAdditionalShapes(steps, corners); validate(updated);
-        Map<ResourceLocation,TerrainMaterial> candidate=new LinkedHashMap<>(materials);
-        candidate.put(id, updated); commit(candidate);
-    }
-    public void addBiomeRule(TerrainSmoothingApi.BiomeRule rule) { requireOpen(); biomeRules.add(Objects.requireNonNull(rule)); }
-    public void addAreaProtection(TerrainSmoothingApi.AreaProtection rule) { requireOpen(); protections.add(Objects.requireNonNull(rule)); }
-    public void freeze() { requireOpen(); frozen = true; }
-    public boolean frozen() { return frozen; }
-    public int size() { return materials.size(); }
-    public TerrainMaterial material(ResourceLocation id){return materials.get(id);}
-    public Collection<TerrainMaterial> materials() { return Collections.unmodifiableCollection(materials.values()); }
-    public TerrainMaterial source(IBlockState state) { return sources.get(canonical(state)); }
-    public TerrainMaterial piece(IBlockState state) { return pieces.get(canonical(state)); }
+        requireOpen();
+        validate(material);
+
+        if (materials.containsKey(material.id)) {
+            throw new IllegalArgumentException("Duplicate material " + material.id);
+        }
+        for (IBlockState source : material.sources) {
+            if (sources.containsKey(canonical(source))) {
+                throw new IllegalArgumentException("Conflicting terrain source " + source);
+            }
+        }
+
+        Map<ResourceLocation, TerrainMaterial> candidate = new LinkedHashMap<>(materials);
+
+        candidate.put(material.id, material);
+        commit(candidate);
+    }
+
+    public void addShapes(ResourceLocation materialId, IBlockState[] steps, IBlockState[] corners) {
+        requireOpen();
+
+        TerrainMaterial current = materials.get(materialId);
+
+        if (current == null) {
+            throw new IllegalArgumentException("Register the base material first: " + materialId);
+        }
+
+        TerrainMaterial updated = current.withAdditionalShapes(steps, corners);
+
+        validate(updated);
+
+        Map<ResourceLocation, TerrainMaterial> candidate = new LinkedHashMap<>(materials);
+
+        candidate.put(materialId, updated);
+        commit(candidate);
+    }
+
+    public void addBiomeRule(TerrainSmoothingApi.BiomeRule rule) {
+        requireOpen();
+        biomeRules.add(Objects.requireNonNull(rule));
+    }
+
+    public void addAreaProtection(TerrainSmoothingApi.AreaProtection rule) {
+        requireOpen();
+        protections.add(Objects.requireNonNull(rule));
+    }
+
+    public void freeze() {
+        requireOpen();
+        frozen = true;
+    }
+
+    public boolean frozen() {
+        return frozen;
+    }
+
+    public int size() {
+        return materials.size();
+    }
+
+    public TerrainMaterial material(ResourceLocation materialId) {
+        return materials.get(materialId);
+    }
+
+    public Collection<TerrainMaterial> materials() {
+        return Collections.unmodifiableCollection(materials.values());
+    }
+
+    public TerrainMaterial source(IBlockState state) {
+        return sources.get(canonical(state));
+    }
+
+    public TerrainMaterial piece(IBlockState state) {
+        return pieces.get(canonical(state));
+    }
+
     public boolean allows(TerrainMaterial material, Biome biome, int dimension, BlockPos target) {
-        for (TerrainSmoothingApi.BiomeRule rule : biomeRules) if (!rule.allows(material.id, biome)) return false;
-        for (TerrainSmoothingApi.AreaProtection rule : protections) if (rule.protects(dimension, target, biome)) return false;
+        for (TerrainSmoothingApi.BiomeRule rule : biomeRules) {
+            if (!rule.allows(material.id, biome)) {
+                return false;
+            }
+        }
+        for (TerrainSmoothingApi.AreaProtection rule : protections) {
+            if (rule.protects(dimension, target, biome)) {
+                return false;
+            }
+        }
+
         return true;
     }
+
+    /** Use the requested finer shape when available, otherwise fall back to this material's slab. */
     public IBlockState result(TerrainMaterial material, int mask, int level) {
-        int shape = Footprint.shape(mask, level), direction = Footprint.direction(mask, shape);
-        if (shape == 0) return null;
+        int shape = Footprint.shape(mask, level);
+        int direction = Footprint.direction(mask, shape);
+
+        if (shape == 0) {
+            return null;
+        }
+
         IBlockState fine = shape == 2 ? material.step(direction) : shape == 3 ? material.corner(direction) : null;
+
         return fine == null ? material.slab : fine;
     }
-    private void requireOpen() { if (frozen) throw new IllegalStateException("Terrain catalogue is frozen"); }
-    private void commit(Map<ResourceLocation,TerrainMaterial> candidate) {
-        Map<IBlockState,TerrainMaterial> newSources=new HashMap<>(),newPieces=new HashMap<>();
+
+    private void requireOpen() {
+        if (frozen) {
+            throw new IllegalStateException("Terrain catalogue is frozen");
+        }
+    }
+
+    /** Build replacement indexes first, leaving the active catalogue intact if validation fails. */
+    private void commit(Map<ResourceLocation, TerrainMaterial> candidate) {
+        Map<IBlockState, TerrainMaterial> newSources = new HashMap<>();
+        Map<IBlockState, TerrainMaterial> newPieces = new HashMap<>();
+
         for (TerrainMaterial material : candidate.values()) {
             for (IBlockState source : material.sources) {
-                TerrainMaterial prior=newSources.put(canonical(source),material);
-                if(prior!=null)throw new IllegalArgumentException("Conflicting terrain source "+source);
+                TerrainMaterial prior = newSources.put(canonical(source), material);
+
+                if (prior != null) {
+                    throw new IllegalArgumentException("Conflicting terrain source " + source);
+                }
             }
-            indexPiece(newPieces,material.slab, material);
+
+            indexPiece(newPieces, material.slab, material);
+
             for (int direction = 0; direction < 4; ++direction) {
-                indexPiece(newPieces,material.step(direction), material); indexPiece(newPieces,material.corner(direction), material);
+                indexPiece(newPieces, material.step(direction), material);
+                indexPiece(newPieces, material.corner(direction), material);
             }
         }
-        materials.clear();materials.putAll(candidate);
-        sources.clear();sources.putAll(newSources);pieces.clear();pieces.putAll(newPieces);
+
+        materials.clear();
+        materials.putAll(candidate);
+        sources.clear();
+        sources.putAll(newSources);
+        pieces.clear();
+        pieces.putAll(newPieces);
     }
-    private static void indexPiece(Map<IBlockState,TerrainMaterial> outputs,IBlockState state, TerrainMaterial material) {
-        if (state == null) return;
+
+    private static void indexPiece(Map<IBlockState, TerrainMaterial> outputs, IBlockState state,
+            TerrainMaterial material) {
+        if (state == null) {
+            return;
+        }
+
         TerrainMaterial prior = outputs.put(canonical(state), material);
-        if (prior != null && prior != material) throw new IllegalArgumentException("Conflicting terrain output " + state);
+
+        if (prior != null && prior != material) {
+            throw new IllegalArgumentException("Conflicting terrain output " + state);
+        }
     }
+
     private static void validate(TerrainMaterial material) {
-        for (IBlockState source : material.sources) if (!source.isFullCube() || source.getBlock().hasTileEntity(source))
-            throw new IllegalArgumentException("Terrain sources must be full blocks without tile entities");
-        if (material.supportAfterPlacement != null && (!material.supportAfterPlacement.isFullCube() ||
-                material.supportAfterPlacement.getBlock().hasTileEntity(material.supportAfterPlacement)))
+        for (IBlockState source : material.sources) {
+            if (!source.isFullCube() || source.getBlock().hasTileEntity(source)) {
+                throw new IllegalArgumentException("Terrain sources must be full blocks without tile entities");
+            }
+        }
+        if (material.supportAfterPlacement != null && (!material.supportAfterPlacement.isFullCube()
+                || material.supportAfterPlacement.getBlock().hasTileEntity(material.supportAfterPlacement))) {
             throw new IllegalArgumentException("Support conversion requires a full non-tile state");
+        }
+
         validatePiece(material.slab, 15);
+
         for (int direction = 0; direction < 4; ++direction) {
-            if (material.step(direction) != null) validatePiece(material.step(direction), Footprint.EDGES[direction]);
-            if (material.corner(direction) != null) validatePiece(material.corner(direction), 1 << direction);
+            if (material.step(direction) != null) {
+                validatePiece(material.step(direction), Footprint.EDGES[direction]);
+            }
+            if (material.corner(direction) != null) {
+                validatePiece(material.corner(direction), 1 << direction);
+            }
         }
     }
+
     private static void validatePiece(IBlockState state, int footprint) {
-        if (state.getBlock().hasTileEntity(state) || state.isFullCube()) throw new IllegalArgumentException("A terrain piece cannot be full or tile-backed");
-        AxisAlignedBB box = state.getBoundingBox(EmptyAccess.INSTANCE, BlockPos.ORIGIN);
-        double x0=1,z0=1,x1=0,z1=0;
-        for(int cell=0;cell<4;++cell)if((footprint&1<<cell)!=0) {
-            double x=cell==0||cell==3?0:.5,z=cell<2?0:.5;
-            x0=Math.min(x0,x);z0=Math.min(z0,z);x1=Math.max(x1,x+.5);z1=Math.max(z1,z+.5);
-        }
-        if (box == null || box.minX != x0 || box.maxX != x1 || box.minZ != z0 || box.maxZ != z1 || box.minY != 0 || box.maxY != .5)
+        if (state.getBlock().hasTileEntity(state) || state.isFullCube()) {
+            throw new IllegalArgumentException("A terrain piece cannot be full or tile-backed");
+        }
+
+        AxisAlignedBB boundingBox = state.getBoundingBox(EmptyAccess.INSTANCE, BlockPos.ORIGIN);
+        double minimumX = 1;
+        double minimumZ = 1;
+        double maximumX = 0;
+        double maximumZ = 0;
+
+        for (int cell = 0; cell < 4; ++cell) {
+            if ((footprint & 1 << cell) != 0) {
+                double cellMinimumX = cell == 0 || cell == 3 ? 0 : .5;
+                double cellMinimumZ = cell < 2 ? 0 : .5;
+
+                minimumX = Math.min(minimumX, cellMinimumX);
+                minimumZ = Math.min(minimumZ, cellMinimumZ);
+                maximumX = Math.max(maximumX, cellMinimumX + .5);
+                maximumZ = Math.max(maximumZ, cellMinimumZ + .5);
+            }
+        }
+        if (boundingBox == null || boundingBox.minX != minimumX || boundingBox.maxX != maximumX
+                || boundingBox.minZ != minimumZ || boundingBox.maxZ != maximumZ || boundingBox.minY != 0
+                || boundingBox.maxY != .5) {
             throw new IllegalArgumentException("Incorrect bottom-piece geometry: " + state);
+        }
     }
+
     private static IBlockState canonical(IBlockState state) {
         return state.getBlock().getStateFromMeta(state.getBlock().getMetaFromState(state));
     }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java
index b23edca..2071196 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java
@@ -24,266 +24,526 @@
 import zone.moddev.mc.skysterrainsmoother.SkysTerrainSmoother;
 import zone.moddev.mc.skysterrainsmoother.api.*;
 
-/** Two-pass loaded-only floor decoration; it never obtains or generates a chunk. */
+/** Plans dry floor transitions before writing them, using only chunks already loaded. */
 public final class SmoothingEngine {
-    private static final int[] DX={0,1,0,-1}, DZ={-1,0,1,0}, CORNER_X={-1,1,1,-1}, CORNER_Z={-1,-1,1,1};
+    private static final int[] DX = { 0, 1, 0, -1 }, DZ = { -1, 0, 1, 0 }, CORNER_X = { -1, 1, 1, -1 },
+            CORNER_Z = { -1, -1, 1, 1 };
     private final MaterialCatalogue catalogue;
     private ExistingChunkIndex existing;
     private final Set<Long> processed = new HashSet<>();
     private final Set<Long> populated = new HashSet<>(), dirtyOwners = new HashSet<>();
-    private final Map<Long,List<Placement>> pending = new HashMap<>();
-    private final Map<IBlockState,Boolean> oreSupports = new HashMap<>();
-    private final ThreadLocal<Decisions> decisions=ThreadLocal.withInitial(Decisions::new);
+    private final Map<Long, List<Placement>> pending = new HashMap<>();
+    private final Map<IBlockState, Boolean> oreSupports = new HashMap<>();
+    private final ThreadLocal<Decisions> decisions = ThreadLocal.withInitial(Decisions::new);
     public long passes, placed, elapsedNanos, skippedExisting;
-    public SmoothingEngine(MaterialCatalogue catalogue) { this.catalogue=catalogue; }
+
+    public SmoothingEngine(MaterialCatalogue catalogue) {
+        this.catalogue = catalogue;
+    }
+
     public void start(File worldDirectory) {
-        try { existing=new ExistingChunkIndex(worldDirectory); }
-        catch(IOException failure){throw new IllegalStateException("Cannot safely index existing chunks; terrain smoothing stopped",failure);}
-        processed.clear();populated.clear();dirtyOwners.clear();pending.clear();oreSupports.clear();passes=placed=elapsedNanos=skippedExisting=0;
-        SkysTerrainSmoother.logger.info("Indexed {} saved Overworld chunks; no smoothing retrogen will run",existing.size());
+        try {
+            existing = new ExistingChunkIndex(worldDirectory);
+        } catch (IOException failure) {
+            throw new IllegalStateException("Cannot safely index existing chunks; terrain smoothing stopped", failure);
+        }
+
+        processed.clear();
+        populated.clear();
+        dirtyOwners.clear();
+        pending.clear();
+        oreSupports.clear();
+        passes = placed = elapsedNanos = skippedExisting = 0;
+        SkysTerrainSmoother.logger.info("Indexed {} saved Overworld chunks; no smoothing retrogen will run",
+                existing.size());
+    }
+
+    public void stop() {
+        existing = null;
+        processed.clear();
+        populated.clear();
+        dirtyOwners.clear();
+        pending.clear();
+        oreSupports.clear();
+        decisions.remove();
     }
-    public void stop() { existing=null;processed.clear();populated.clear();dirtyOwners.clear();pending.clear();oreSupports.clear();decisions.remove(); }
-    public int indexedChunks() { return existing==null?0:existing.size(); }
 
-    @SubscribeEvent(priority=EventPriority.LOWEST)
+    public int indexedChunks() {
+        return existing == null ? 0 : existing.size();
+    }
+
+    @SubscribeEvent(
+            priority = EventPriority.LOWEST)
     public void beforeDecoration(DecorateBiomeEvent.Pre event) {
-        World world=event.getWorld();
-        if(world.isRemote||world.provider.getDimension()!=0||!SkysTerrainSmoother.enabled||existing==null)return;
-        int chunkX=event.getPos().getX()>>4,chunkZ=event.getPos().getZ()>>4;
-        if(existing.contains(chunkX,chunkZ)){++skippedExisting;return;}
-        Chunk owner=loaded(world,chunkX,chunkZ);
-        if(owner==null||!processed.add(ExistingChunkIndex.key(chunkX,chunkZ)))return;
-        long start=System.nanoTime();
-        placed+=smooth(world,owner,SkysTerrainSmoother.level);
-        elapsedNanos+=System.nanoTime()-start;++passes;
+        World world = event.getWorld();
+
+        if (world.isRemote || world.provider.getDimension() != 0 || !SkysTerrainSmoother.enabled || existing == null) {
+            return;
+        }
+
+        int chunkX = event.getPos().getX() >> 4;
+        int chunkZ = event.getPos().getZ() >> 4;
+
+        if (existing.contains(chunkX, chunkZ)) {
+            ++skippedExisting;
+            return;
+        }
+
+        Chunk owner = loaded(world, chunkX, chunkZ);
+
+        if (owner == null || !processed.add(ExistingChunkIndex.key(chunkX, chunkZ))) {
+            return;
+        }
+
+        long start = System.nanoTime();
+
+        placed += smooth(world, owner, SkysTerrainSmoother.level);
+        elapsedNanos += System.nanoTime() - start;
+        ++passes;
     }
 
-    @SubscribeEvent(priority=EventPriority.LOWEST)
+    @SubscribeEvent(
+            priority = EventPriority.LOWEST)
     public void afterDecoration(DecorateBiomeEvent.Post event) {
-        World world=event.getWorld();
-        if(world.isRemote||world.provider.getDimension()!=0)return;
-        int chunkX=event.getPos().getX()>>4,chunkZ=event.getPos().getZ()>>4;
-        checkAdjacent(world,chunkX,chunkZ);
+        World world = event.getWorld();
+
+        if (world.isRemote || world.provider.getDimension() != 0) {
+            return;
+        }
+
+        int chunkX = event.getPos().getX() >> 4;
+        int chunkZ = event.getPos().getZ() >> 4;
+
+        checkAdjacent(world, chunkX, chunkZ);
     }
-    @SubscribeEvent(priority=EventPriority.LOWEST)
+
+    @SubscribeEvent(
+            priority = EventPriority.LOWEST)
     public void afterPopulation(PopulateChunkEvent.Post event) {
-        World world=event.getWorld();
-        if(world.isRemote||world.provider.getDimension()!=0)return;
-        populated.add(ExistingChunkIndex.key(event.getChunkX(),event.getChunkZ()));
-        checkAdjacent(world,event.getChunkX(),event.getChunkZ());
+        World world = event.getWorld();
+
+        if (world.isRemote || world.provider.getDimension() != 0) {
+            return;
+        }
+
+        populated.add(ExistingChunkIndex.key(event.getChunkX(), event.getChunkZ()));
+        checkAdjacent(world, event.getChunkX(), event.getChunkZ());
     }
-    private void checkAdjacent(World world,int chunkX,int chunkZ) {
-        // Legacy decoration uses an eight-block offset and can touch the next
-        // chunk east/south. Each repair is restricted to its recorded owner.
-        for(int z=chunkZ;z<=chunkZ+1;z++)for(int x=chunkX;x<=chunkX+1;x++) {
-            long key=ExistingChunkIndex.key(x,z);List<Placement> placements=pending.get(key);
-            if(placements==null)continue;
-            validate(world,x,z,placements);
-            dirtyOwners.add(key);
+
+    private void checkAdjacent(World world, int chunkX, int chunkZ) {
+        // The decoration offset can reach the next chunk east or south. Repairs still belong to their original owner.
+        for (int adjacentChunkZ = chunkZ; adjacentChunkZ <= chunkZ + 1; adjacentChunkZ++) {
+            for (int adjacentChunkX = chunkX; adjacentChunkX <= chunkX + 1; adjacentChunkX++) {
+                long key = ExistingChunkIndex.key(adjacentChunkX, adjacentChunkZ);
+                List<Placement> placements = pending.get(key);
+
+                if (placements == null) {
+                    continue;
+                }
+
+                validate(world, adjacentChunkX, adjacentChunkZ, placements);
+                dirtyOwners.add(key);
+            }
         }
     }
-    @SubscribeEvent(priority=EventPriority.LOWEST)
+
+    @SubscribeEvent(
+            priority = EventPriority.LOWEST)
     public void endWorldTick(TickEvent.WorldTickEvent event) {
-        World world=event.world;
-        if(event.phase!=TickEvent.Phase.END||world.isRemote||world.provider.getDimension()!=0)return;
-        // Biome-specific ores and Forge world generators can run after Decorate
-        // Post. Validate only freshly touched owners after the full call returns.
-        for(long key:new ArrayList<>(dirtyOwners)) {
-            List<Placement> placements=pending.get(key);if(placements==null)continue;
-            int x=(int)(key>>32),z=(int)key;
-            validate(world,x,z,placements);
-            if(populated.contains(key)&&populated.contains(ExistingChunkIndex.key(x-1,z))&&
-                    populated.contains(ExistingChunkIndex.key(x,z-1))&&populated.contains(ExistingChunkIndex.key(x-1,z-1)))pending.remove(key);
+        World world = event.world;
+
+        if (event.phase != TickEvent.Phase.END || world.isRemote || world.provider.getDimension() != 0) {
+            return;
         }
+        // Ore generators can run after decoration. Recheck only freshly touched owners when that work has returned.
+        for (long key : new ArrayList<>(dirtyOwners)) {
+            List<Placement> placements = pending.get(key);
+
+            if (placements == null) {
+                continue;
+            }
+
+            int chunkX = (int) (key >> 32);
+            int chunkZ = (int) key;
+
+            validate(world, chunkX, chunkZ, placements);
+
+            if (populated.contains(key) && populated.contains(ExistingChunkIndex.key(chunkX - 1, chunkZ))
+                    && populated.contains(ExistingChunkIndex.key(chunkX, chunkZ - 1))
+                    && populated.contains(ExistingChunkIndex.key(chunkX - 1, chunkZ - 1))) {
+                pending.remove(key);
+            }
+        }
+
         dirtyOwners.clear();
     }
-    @SubscribeEvent public void unload(net.minecraftforge.event.world.ChunkEvent.Unload event) {
-        Chunk owner=event.getChunk();World world=event.getWorld();
-        if(world.isRemote||world.provider.getDimension()!=0)return;
-        long key=ExistingChunkIndex.key(owner.xPosition,owner.zPosition);
-        List<Placement> placements=pending.remove(key);dirtyOwners.remove(key);
-        if(placements!=null)validate(world,owner.xPosition,owner.zPosition,placements);
+
+    @SubscribeEvent
+    public void unload(net.minecraftforge.event.world.ChunkEvent.Unload event) {
+        Chunk owner = event.getChunk();
+        World world = event.getWorld();
+
+        if (world.isRemote || world.provider.getDimension() != 0) {
+            return;
+        }
+
+        long key = ExistingChunkIndex.key(owner.xPosition, owner.zPosition);
+        List<Placement> placements = pending.remove(key);
+
+        dirtyOwners.remove(key);
+
+        if (placements != null) {
+            validate(world, owner.xPosition, owner.zPosition, placements);
+        }
     }
-    private void validate(World world,int chunkX,int chunkZ,List<Placement> placements) {
-        Chunk owner=loaded(world,chunkX,chunkZ);
-        if(owner==null)return;
-        // Decide the repairs from one snapshot. Only replace our unchanged cap,
-        // and never restore terrain overwritten by the biome decorator.
-        Map<Placement,IBlockState> repairs=new LinkedHashMap<>();
-        Map<Placement,TerrainMaterial> materials=new HashMap<>();
-        List<StructureBoundingBox> structures=StructureProtection.bounds(world,chunkX<<4,chunkZ<<4);
-        for(Placement placement:placements) {
-            IBlockState support=owner.getBlockState(placement.pos.down());
-            TerrainMaterial material=placement.material;
-            boolean blocked=placement.cave&&!caveHeadroom(world,owner,placement.pos.down());
-            // Late ore veins may hide beneath a cap. Keep both blocks intact;
-            // this exception does not make ores eligible smoothing sources.
-            if((blocked||!material.sources.contains(support)&&!support.equals(material.supportAfterPlacement)&&!oreSupport(support))&&
-                    owner.getBlockState(placement.pos).equals(placement.state)) {
-                TerrainMaterial replacement=catalogue.source(support);
-                IBlockState result=null;
-                if(!blocked&&replacement!=null&&(!replacement.grass||GrassSlabsApi.grassGenerationAllowed())&&
-                        (!replacement.mineralogy||SkysTerrainSmoother.mineralogy)&&
-                        support.isSideSolid(world,placement.pos.down(),EnumFacing.UP)&&
-                        !support.getBlock().hasTileEntity(support)&&owner.getTileEntity(placement.pos,Chunk.EnumCreateEntityType.CHECK)==null&&
-                        !StructureProtection.contains(structures,placement.pos)&&!StructureProtection.contains(structures,placement.pos.down())&&
-                        catalogue.allows(replacement,world.getBiome(placement.pos),0,placement.pos)) {
-                    int x=placement.pos.getX()&15,z=placement.pos.getZ()&15,y=placement.pos.getY()-1,cardinal=0,diagonal=0;
-                    for(int d=0;d<4;d++)if(higher(world,owner,x+DX[d],z+DZ[d],y))cardinal|=1<<d;
-                    if(placement.level==3)for(int d=0;d<4;d++)if(higher(world,owner,x+CORNER_X[d],z+CORNER_Z[d],y))diagonal|=1<<d;
-                    result=catalogue.result(replacement,Footprint.mask(cardinal,diagonal,placement.level),placement.level);
+
+    private void validate(World world, int chunkX, int chunkZ, List<Placement> placements) {
+        Chunk owner = loaded(world, chunkX, chunkZ);
+
+        if (owner == null) {
+            return;
+        }
+
+        // Plan repairs from one snapshot. Replace only our unchanged caps; never restore a decorator's old terrain.
+        Map<Placement, IBlockState> repairs = new LinkedHashMap<>();
+        Map<Placement, TerrainMaterial> materials = new HashMap<>();
+        List<StructureBoundingBox> structures = StructureProtection.bounds(world, chunkX << 4, chunkZ << 4);
+
+        for (Placement placement : placements) {
+            IBlockState support = owner.getBlockState(placement.pos.down());
+            TerrainMaterial material = placement.material;
+            boolean blocked = placement.cave && !caveHeadroom(world, owner, placement.pos.down());
+
+            // Keep ore veins hidden beneath existing caps, but never use ore as a new smoothing source.
+            if ((blocked || !material.sources.contains(support) && !support.equals(material.supportAfterPlacement)
+                    && !oreSupport(support)) && owner.getBlockState(placement.pos).equals(placement.state)) {
+                TerrainMaterial replacement = catalogue.source(support);
+                IBlockState result = null;
+
+                if (!blocked && replacement != null && (!replacement.grass || GrassSlabsApi.grassGenerationAllowed())
+                        && (!replacement.mineralogy || SkysTerrainSmoother.mineralogy)
+                        && support.isSideSolid(world, placement.pos.down(), EnumFacing.UP)
+                        && !support.getBlock().hasTileEntity(support)
+                        && owner.getTileEntity(placement.pos, Chunk.EnumCreateEntityType.CHECK) == null
+                        && !StructureProtection.contains(structures, placement.pos)
+                        && !StructureProtection.contains(structures, placement.pos.down())
+                        && catalogue.allows(replacement, world.getBiome(placement.pos), 0, placement.pos)) {
+                    int localBlockX = placement.pos.getX() & 15;
+                    int localBlockZ = placement.pos.getZ() & 15;
+                    int supportY = placement.pos.getY() - 1;
+                    int cardinal = 0;
+                    int diagonal = 0;
+
+                    for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                        if (higher(world, owner, localBlockX + DX[directionIndex], localBlockZ + DZ[directionIndex],
+                                supportY)) {
+                            cardinal |= 1 << directionIndex;
+                        }
+                    }
+                    if (placement.level == 3) {
+                        for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                            if (higher(world, owner, localBlockX + CORNER_X[directionIndex],
+                                    localBlockZ + CORNER_Z[directionIndex], supportY)) {
+                                diagonal |= 1 << directionIndex;
+                            }
+                        }
+                    }
+
+                    result = catalogue.result(replacement, Footprint.mask(cardinal, diagonal, placement.level),
+                            placement.level);
                 }
-                repairs.put(placement,result==null?Blocks.AIR.getDefaultState():result);
-                materials.put(placement,replacement);
+
+                repairs.put(placement, result == null ? Blocks.AIR.getDefaultState() : result);
+                materials.put(placement, replacement);
             }
         }
-        for(Map.Entry<Placement,IBlockState> repair:repairs.entrySet()) {
-            Placement placement=repair.getKey();
-            if(!owner.getBlockState(placement.pos).equals(placement.state))continue;
-            IBlockState state=repair.getValue();
-            owner.setBlockState(placement.pos,state);
-            placement.state=state;placement.material=materials.get(placement);
-            if(placement.material!=null&&state.getBlock()!=Blocks.AIR&&placement.material.supportAfterPlacement!=null)
-                owner.setBlockState(placement.pos.down(),placement.material.supportAfterPlacement);
+        for (Map.Entry<Placement, IBlockState> repair : repairs.entrySet()) {
+            Placement placement = repair.getKey();
+
+            if (!owner.getBlockState(placement.pos).equals(placement.state)) {
+                continue;
+            }
+
+            IBlockState state = repair.getValue();
+
+            owner.setBlockState(placement.pos, state);
+            placement.state = state;
+            placement.material = materials.get(placement);
+
+            if (placement.material != null && state.getBlock() != Blocks.AIR
+                    && placement.material.supportAfterPlacement != null) {
+                owner.setBlockState(placement.pos.down(), placement.material.supportAfterPlacement);
+            }
         }
-        placements.removeIf(p->p.state.getBlock()==Blocks.AIR);
-        // Biome decoration can introduce new grass oases as well as beaches.
-        // Re-snapshot registered dry floors only in this tracked fresh owner;
-        // occupied targets and existing saved chunks remain untouched.
-        placed+=smooth(world,owner,SkysTerrainSmoother.level,true);
+
+        placements.removeIf(placement -> placement.state.getBlock() == Blocks.AIR);
+        // Biome decoration can introduce new grass oases as well as beaches. Re-snapshot registered dry floors only in
+        // this tracked fresh owner; occupied targets and existing saved chunks remain untouched.
+        placed += smooth(world, owner, SkysTerrainSmoother.level, true);
     }
 
     /** Calculate all placements before writing. Normal generation calls this through the event. */
-    public int smooth(World world,Chunk owner,int level) {
-        return smooth(world,owner,level,false);
+    public int smooth(World world, Chunk owner, int level) {
+        return smooth(world, owner, level, false);
     }
-    private int smooth(World world,Chunk owner,int level,boolean afterDecoration) {
+
+    private int smooth(World world, Chunk owner, int level, boolean afterDecoration) {
         Footprint.validateLevel(level);
-        long key=ExistingChunkIndex.key(owner.xPosition,owner.zPosition);
-        if(afterDecoration&&!pending.containsKey(key))return 0;
-        Decisions buffer=decisions.get();buffer.clear();
-        int startX=owner.xPosition<<4,startZ=owner.zPosition<<4;
-        List<StructureBoundingBox> structures=StructureProtection.bounds(world,startX,startZ);
-        boolean grassAllowed=GrassSlabsApi.grassGenerationAllowed();
-        BlockPos.MutableBlockPos cursor=new BlockPos.MutableBlockPos();
-        for(int z=0;z<16;++z)for(int x=0;x<16;++x) {
-            int surfaceY=owner.getHeightValue(x,z)-1;
-            // Examine upward-facing floors at every depth, not cave ceilings or
-            // solid walls. All decisions for all floors precede the first write.
-            if(surfaceY<0)continue;
-            IBlockState previous=owner.getBlockState(cursor.setPos(startX+x,Math.min(surfaceY,254)+1,startZ+z));
-            for(int y=Math.min(surfaceY,254);y>=0;--y) {
-                IBlockState lower=owner.getBlockState(cursor.setPos(startX+x,y,startZ+z));
-                IBlockState above=previous;previous=lower;
-                // Look up mappings only at full-block/air boundaries, not for
-                // every block in solid rock or every cell in an empty chamber.
-                if(above.getMaterial()!=Material.AIR||lower.getMaterial()==Material.AIR)continue;
-                TerrainMaterial material=catalogue.source(lower);
-                if(material==null||material.grass&&!grassAllowed||material.mineralogy&&!SkysTerrainSmoother.mineralogy)continue;
-                BlockPos support=new BlockPos(startX+x,y,startZ+z),target=support.up();
-                boolean cave=y<surfaceY;
-                if(cave&&!caveHeadroom(world,owner,support)||!lower.isSideSolid(world,support,EnumFacing.UP)||
-                        !above.getBlock().isAir(above,world,target)||lower.getBlock().hasTileEntity(lower)||
-                        owner.getTileEntity(target,Chunk.EnumCreateEntityType.CHECK)!=null||
-                        StructureProtection.contains(structures,target)||StructureProtection.contains(structures,support)||
-                        !catalogue.allows(material,world.getBiome(target),0,target))continue;
-                int cardinal=0,diagonal=0;
-                for(int direction=0;direction<4;++direction)
-                    if(higher(world,owner,x+DX[direction],z+DZ[direction],y))cardinal|=1<<direction;
-                if(level==3) {
-                    for(int direction=0;direction<4;++direction)
-                        if(higher(world,owner,x+CORNER_X[direction],z+CORNER_Z[direction],y))diagonal|=1<<direction;
+
+        long key = ExistingChunkIndex.key(owner.xPosition, owner.zPosition);
+
+        if (afterDecoration && !pending.containsKey(key)) {
+            return 0;
+        }
+
+        Decisions buffer = decisions.get();
+
+        buffer.clear();
+
+        int startX = owner.xPosition << 4;
+        int startZ = owner.zPosition << 4;
+
+        List<StructureBoundingBox> structures = StructureProtection.bounds(world, startX, startZ);
+        boolean grassAllowed = GrassSlabsApi.grassGenerationAllowed();
+        BlockPos.MutableBlockPos cursor = new BlockPos.MutableBlockPos();
+
+        for (int localBlockZ = 0; localBlockZ < 16; ++localBlockZ) {
+            for (int localBlockX = 0; localBlockX < 16; ++localBlockX) {
+                int surfaceY = owner.getHeightValue(localBlockX, localBlockZ) - 1;
+
+                // Visit upward-facing floors at every depth. Finish every decision before the first world write.
+                if (surfaceY < 0) {
+                    continue;
+                }
+
+                IBlockState previous = owner.getBlockState(
+                        cursor.setPos(startX + localBlockX, Math.min(surfaceY, 254) + 1, startZ + localBlockZ));
+
+                for (int floorY = Math.min(surfaceY, 254); floorY >= 0; --floorY) {
+                    IBlockState lower = owner
+                            .getBlockState(cursor.setPos(startX + localBlockX, floorY, startZ + localBlockZ));
+                    IBlockState above = previous;
+
+                    previous = lower;
+
+                    // Only floor/air boundaries need a material lookup, not solid rock or the inside of an air pocket.
+                    if (above.getMaterial() != Material.AIR || lower.getMaterial() == Material.AIR) {
+                        continue;
+                    }
+
+                    TerrainMaterial material = catalogue.source(lower);
+
+                    if (material == null || material.grass && !grassAllowed
+                            || material.mineralogy && !SkysTerrainSmoother.mineralogy) {
+                        continue;
+                    }
+
+                    BlockPos support = new BlockPos(startX + localBlockX, floorY, startZ + localBlockZ);
+                    BlockPos target = support.up();
+
+                    boolean cave = floorY < surfaceY;
+
+                    if (cave && !caveHeadroom(world, owner, support)
+                            || !lower.isSideSolid(world, support, EnumFacing.UP)
+                            || !above.getBlock().isAir(above, world, target) || lower.getBlock().hasTileEntity(lower)
+                            || owner.getTileEntity(target, Chunk.EnumCreateEntityType.CHECK) != null
+                            || StructureProtection.contains(structures, target)
+                            || StructureProtection.contains(structures, support)
+                            || !catalogue.allows(material, world.getBiome(target), 0, target)) {
+                        continue;
+                    }
+
+                    int cardinal = 0;
+                    int diagonal = 0;
+
+                    for (int direction = 0; direction < 4; ++direction) {
+                        if (higher(world, owner, localBlockX + DX[direction], localBlockZ + DZ[direction], floorY)) {
+                            cardinal |= 1 << direction;
+                        }
+                    }
+                    if (level == 3) {
+                        for (int direction = 0; direction < 4; ++direction) {
+                            if (higher(world, owner, localBlockX + CORNER_X[direction],
+                                    localBlockZ + CORNER_Z[direction], floorY)) {
+                                diagonal |= 1 << direction;
+                            }
+                        }
+                    }
+
+                    IBlockState result = catalogue.result(material, Footprint.mask(cardinal, diagonal, level), level);
+
+                    if (result != null) {
+                        buffer.add(localBlockX | localBlockZ << 4 | (floorY + 1) << 8, result, material, cave);
+                    }
                 }
-                IBlockState result=catalogue.result(material,Footprint.mask(cardinal,diagonal,level),level);
-                if(result!=null)buffer.add(x|z<<4|(y+1)<<8,result,material,cave);
             }
         }
-        int count=0;
-        List<Placement> placements=new ArrayList<>();
-        for(int index=0;index<buffer.size;++index) {
-            int position=buffer.positions[index];
-            BlockPos target=new BlockPos(startX+(position&15),position>>8,startZ+((position>>4)&15));
-            IBlockState above=owner.getBlockState(target);
-            if(!above.getBlock().isAir(above,world,target))continue;
-            if(owner.setBlockState(target,buffer.results[index])!=null) {
-                if(buffer.supports[index]!=null)owner.setBlockState(target.down(),buffer.supports[index]);
-                placements.add(new Placement(target,buffer.results[index],buffer.materials[index],level,buffer.caves[index]));
+
+        int count = 0;
+        List<Placement> placements = new ArrayList<>();
+
+        for (int index = 0; index < buffer.size; ++index) {
+            int position = buffer.positions[index];
+            BlockPos target = new BlockPos(startX + (position & 15), position >> 8, startZ + ((position >> 4) & 15));
+            IBlockState above = owner.getBlockState(target);
+
+            if (!above.getBlock().isAir(above, world, target)) {
+                continue;
+            }
+            if (owner.setBlockState(target, buffer.results[index]) != null) {
+                if (buffer.supports[index] != null) {
+                    owner.setBlockState(target.down(), buffer.supports[index]);
+                }
+
+                placements.add(new Placement(target, buffer.results[index], buffer.materials[index], level,
+                        buffer.caves[index]));
                 ++count;
             }
         }
-        if(afterDecoration)pending.get(key).addAll(placements);
-        // Even an initially flat or unsupported surface may gain eligible floors
-        // during decoration. Track it until its bordering decorators finish.
-        else {pending.put(key,placements);dirtyOwners.add(key);}
+        if (afterDecoration) {
+            pending.get(key).addAll(placements);
+        } else {
+            // Decoration can create new floors. Track this owner until its bordering decorators finish.
+            pending.put(key, placements);
+            dirtyOwners.add(key);
+        }
+
         return count;
     }
-    private boolean caveHeadroom(World world,Chunk owner,BlockPos support) {
-        // Three air blocks before adding a half-height cap leave 2.5 blocks of
-        // headroom. Never turn an otherwise walkable two-block tunnel into 1.5.
-        if(support.getY()>252)return false;
-        for(int height=2;height<=3;height++) {
-            BlockPos pos=support.up(height);IBlockState state=owner.getBlockState(pos);
-            if(state.getMaterial()!=Material.AIR||!state.getBlock().isAir(state,world,pos)||
-                    owner.getTileEntity(pos,Chunk.EnumCreateEntityType.CHECK)!=null)return false;
+
+    private boolean caveHeadroom(World world, Chunk owner, BlockPos support) {
+        // Three clear blocks leave 2.5 blocks above a new cap. A two-block tunnel must stay walkable.
+        if (support.getY() > 252) {
+            return false;
         }
+        for (int height = 2; height <= 3; height++) {
+            BlockPos pos = support.up(height);
+            IBlockState state = owner.getBlockState(pos);
+
+            if (state.getMaterial() != Material.AIR || !state.getBlock().isAir(state, world, pos)
+                    || owner.getTileEntity(pos, Chunk.EnumCreateEntityType.CHECK) != null) {
+                return false;
+            }
+        }
+
         return true;
     }
+
     private boolean oreSupport(IBlockState state) {
-        Boolean cached=oreSupports.get(state);if(cached!=null)return cached;
-        boolean ore=false;
-        if(state.isFullCube()&&!state.getBlock().hasTileEntity(state)&&!state.getMaterial().isLiquid()) {
-            ore=state.getBlock() instanceof BlockOre||state.getBlock() instanceof BlockRedstoneOre;
-            if(!ore) {
-                ItemStack stack=new ItemStack(state.getBlock(),1,state.getBlock().getMetaFromState(state));
-                if(stack.getItem()!=null)for(int id:OreDictionary.getOreIDs(stack)) {
-                    if(OreDictionary.getOreName(id).startsWith("ore")){ore=true;break;}
+        Boolean cached = oreSupports.get(state);
+
+        if (cached != null) {
+            return cached;
+        }
+
+        boolean isOre = false;
+
+        if (state.isFullCube() && !state.getBlock().hasTileEntity(state) && !state.getMaterial().isLiquid()) {
+            isOre = state.getBlock() instanceof BlockOre || state.getBlock() instanceof BlockRedstoneOre;
+
+            if (!isOre) {
+                ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));
+
+                if (stack.getItem() != null) {
+                    for (int oreId : OreDictionary.getOreIDs(stack)) {
+                        if (OreDictionary.getOreName(oreId).startsWith("ore")) {
+                            isOre = true;
+                            break;
+                        }
+                    }
                 }
             }
         }
-        oreSupports.put(state,ore);return ore;
+
+        oreSupports.put(state, isOre);
+        return isOre;
     }
-    private boolean higher(World world,Chunk owner,int localX,int localZ,int lowerY) {
-        if(!Footprint.allowedNeighbour(localX,localZ))return false;
-        int worldX=(owner.xPosition<<4)+localX,worldZ=(owner.zPosition<<4)+localZ;
-        Chunk neighbour=loaded(world,worldX>>4,worldZ>>4);
-        if(neighbour==null)return false;
-        // Compare this elevation both inside caves and across cave entrances.
-        // Ignore roofs/walls and normalize previously placed caps, including
-        // transparent BOP caps over their unregistered native dirt counterparts.
-        BlockPos floor=new BlockPos(worldX,lowerY+1,worldZ);
-        IBlockState state=neighbour.getBlockState(floor),above=neighbour.getBlockState(floor.up());
-        TerrainMaterial source=catalogue.source(state),cap=catalogue.piece(above);
-        if(cap!=null)return source!=null||cap.sources.contains(state)||cap.supportAfterPlacement!=null&&state.equals(cap.supportAfterPlacement)||oreSupport(state);
-        return source!=null&&above.getMaterial()==Material.AIR&&above.getBlock().isAir(above,world,floor.up());
+
+    private boolean higher(World world, Chunk owner, int localX, int localZ, int lowerY) {
+        if (!Footprint.allowedNeighbour(localX, localZ)) {
+            return false;
+        }
+
+        int worldX = (owner.xPosition << 4) + localX;
+        int worldZ = (owner.zPosition << 4) + localZ;
+
+        Chunk neighbour = loaded(world, worldX >> 4, worldZ >> 4);
+
+        if (neighbour == null) {
+            return false;
+        }
+
+        // Compare logical floors at this height, including existing caps over BOP's native soil.
+        BlockPos floor = new BlockPos(worldX, lowerY + 1, worldZ);
+        IBlockState state = neighbour.getBlockState(floor);
+        IBlockState above = neighbour.getBlockState(floor.up());
+
+        TerrainMaterial source = catalogue.source(state);
+        TerrainMaterial cap = catalogue.piece(above);
+
+        if (cap != null) {
+            return source != null || cap.sources.contains(state)
+                    || cap.supportAfterPlacement != null && state.equals(cap.supportAfterPlacement)
+                    || oreSupport(state);
+        }
+
+        return source != null && above.getMaterial() == Material.AIR
+                && above.getBlock().isAir(above, world, floor.up());
     }
-    private static Chunk loaded(World world,int x,int z) {
-        return world.getChunkProvider() instanceof ChunkProviderServer?
-                ((ChunkProviderServer)world.getChunkProvider()).getLoadedChunk(x,z):null;
+
+    /** A missing neighbour is unavailable, never a reason to request or generate another chunk. */
+    private static Chunk loaded(World world, int chunkX, int chunkZ) {
+        return world.getChunkProvider() instanceof ChunkProviderServer
+                ? ((ChunkProviderServer) world.getChunkProvider()).getLoadedChunk(chunkX, chunkZ)
+                : null;
     }
+
     private static final class Decisions {
         int size;
-        int[] positions=new int[256];
-        IBlockState[] results=new IBlockState[256],supports=new IBlockState[256];
-        TerrainMaterial[] materials=new TerrainMaterial[256];
-        boolean[] caves=new boolean[256];
+        int[] positions = new int[256];
+        IBlockState[] results = new IBlockState[256], supports = new IBlockState[256];
+        TerrainMaterial[] materials = new TerrainMaterial[256];
+        boolean[] caves = new boolean[256];
+
         void clear() {
-            Arrays.fill(results,0,size,null);Arrays.fill(supports,0,size,null);Arrays.fill(materials,0,size,null);size=0;
+            Arrays.fill(results, 0, size, null);
+            Arrays.fill(supports, 0, size, null);
+            Arrays.fill(materials, 0, size, null);
+            size = 0;
         }
-        void add(int position,IBlockState result,TerrainMaterial material,boolean cave) {
-            if(size==positions.length) {
-                int capacity=positions.length*2;
-                positions=Arrays.copyOf(positions,capacity);results=Arrays.copyOf(results,capacity);
-                supports=Arrays.copyOf(supports,capacity);materials=Arrays.copyOf(materials,capacity);caves=Arrays.copyOf(caves,capacity);
+
+        void add(int position, IBlockState result, TerrainMaterial material, boolean cave) {
+            if (size == positions.length) {
+                int capacity = positions.length * 2;
+
+                positions = Arrays.copyOf(positions, capacity);
+                results = Arrays.copyOf(results, capacity);
+                supports = Arrays.copyOf(supports, capacity);
+                materials = Arrays.copyOf(materials, capacity);
+                caves = Arrays.copyOf(caves, capacity);
             }
-            positions[size]=position;results[size]=result;supports[size]=material.supportAfterPlacement;materials[size]=material;caves[size++]=cave;
+
+            positions[size] = position;
+            results[size] = result;
+            supports[size] = material.supportAfterPlacement;
+            materials[size] = material;
+            caves[size++] = cave;
         }
     }
+
     private static final class Placement {
         final BlockPos pos;
         IBlockState state;
         TerrainMaterial material;
         final int level;
         final boolean cave;
-        Placement(BlockPos pos,IBlockState state,TerrainMaterial material,int level,boolean cave){this.pos=pos;this.state=state;this.material=material;this.level=level;this.cave=cave;}
+
+        Placement(BlockPos pos, IBlockState state, TerrainMaterial material, int level, boolean cave) {
+            this.pos = pos;
+            this.state = state;
+            this.material = material;
+            this.level = level;
+            this.cave = cave;
+        }
     }
 }
diff --git a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/StructureProtection.java b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/StructureProtection.java
index baf7e21..8a1acb7 100644
--- a/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/StructureProtection.java
+++ b/src/main/java/zone/moddev/mc/skysterrainsmoother/internal/StructureProtection.java
@@ -8,24 +8,48 @@
 import net.minecraft.world.gen.structure.StructureBoundingBox;
 
 final class StructureProtection {
-    private StructureProtection() { }
-    static List<StructureBoundingBox> bounds(World world,int startX,int startZ) {
+    private StructureProtection() {
+    }
+
+    static List<StructureBoundingBox> bounds(World world, int startX, int startZ) {
         List<StructureBoundingBox> result = new ArrayList<>();
-        for (String id : new String[]{"Mineshaft","Village","Stronghold","Temple","Monument","Fortress"}) {
-            MapGenStructureData data = (MapGenStructureData)world.getPerWorldStorage().getOrLoadData(MapGenStructureData.class,id);
-            if (data == null) continue;
+
+        for (String registryId : new String[] { "Mineshaft", "Village", "Stronghold", "Temple", "Monument",
+                "Fortress" }) {
+            MapGenStructureData data = (MapGenStructureData) world.getPerWorldStorage()
+                    .getOrLoadData(MapGenStructureData.class, registryId);
+
+            if (data == null) {
+                continue;
+            }
+
             NBTTagCompound starts = data.getTagCompound();
+
             for (String key : starts.getKeySet()) {
                 int[] saved = starts.getCompoundTag(key).getIntArray("BB");
-                if (saved.length != 6) continue;
+
+                if (saved.length != 6) {
+                    continue;
+                }
+
                 StructureBoundingBox box = new StructureBoundingBox(saved);
-                if (box.intersectsWith(startX,startZ,startX+15,startZ+15)) result.add(box);
+
+                if (box.intersectsWith(startX, startZ, startX + 15, startZ + 15)) {
+                    result.add(box);
+                }
             }
         }
+
         return result;
     }
-    static boolean contains(List<StructureBoundingBox> bounds,BlockPos target) {
-        for(StructureBoundingBox box:bounds)if(box.isVecInside(target)||box.isVecInside(target.down()))return true;
+
+    static boolean contains(List<StructureBoundingBox> bounds, BlockPos target) {
+        for (StructureBoundingBox box : bounds) {
+            if (box.isVecInside(target) || box.isVecInside(target.down())) {
+                return true;
+            }
+        }
+
         return false;
     }
 }
diff --git a/src/test/java/zone/moddev/mc/skysterrainsmoother/CatalogueTest.java b/src/test/java/zone/moddev/mc/skysterrainsmoother/CatalogueTest.java
index 71e8f9a..14a8f0c 100644
--- a/src/test/java/zone/moddev/mc/skysterrainsmoother/CatalogueTest.java
+++ b/src/test/java/zone/moddev/mc/skysterrainsmoother/CatalogueTest.java
@@ -14,45 +14,121 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class CatalogueTest {
-    @BeforeAll static void boot(){Bootstrap.register();}
+    @BeforeAll
+    static void boot() {
+        Bootstrap.register();
+    }
+
     private static IBlockState piece(int mask) {
-        double x0=1,z0=1,x1=0,z1=0;
-        for(int i=0;i<4;i++)if((mask&(1<<i))!=0){double x=i==0||i==3?0:.5,z=i<2?0:.5;x0=Math.min(x0,x);z0=Math.min(z0,z);x1=Math.max(x1,x+.5);z1=Math.max(z1,z+.5);}
-        final AxisAlignedBB box=new AxisAlignedBB(x0,0,z0,x1,.5,z1);
+        double x0 = 1;
+        double z0 = 1;
+        double x1 = 0;
+        double z1 = 0;
+
+        for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+            if ((mask & (1 << directionIndex)) != 0) {
+                double vertexX = directionIndex == 0 || directionIndex == 3 ? 0 : .5;
+                double vertexZ = directionIndex < 2 ? 0 : .5;
+
+                x0 = Math.min(x0, vertexX);
+                z0 = Math.min(z0, vertexZ);
+                x1 = Math.max(x1, vertexX + .5);
+                z1 = Math.max(z1, vertexZ + .5);
+            }
+        }
+
+        final AxisAlignedBB boundingBox = new AxisAlignedBB(x0, 0, z0, x1, .5, z1);
+
         return new Block(Material.ROCK) {
-            @Override public AxisAlignedBB getBoundingBox(IBlockState s,IBlockAccess w,BlockPos p){return box;}
-            @Override public boolean isFullCube(IBlockState s){return false;}
+            @Override
+            public AxisAlignedBB getBoundingBox(IBlockState blockState, IBlockAccess blockAccess, BlockPos position) {
+                return boundingBox;
+            }
+
+            @Override
+            public boolean isFullCube(IBlockState blockState) {
+                return false;
+            }
         }.getDefaultState();
     }
-    private static TerrainMaterial material(String name,IBlockState full,IBlockState slab,IBlockState[] steps,IBlockState[] corners){
-        return new TerrainMaterial(new ResourceLocation("test",name),Collections.singleton(full),slab,steps,corners,false,null);
+
+    private static TerrainMaterial material(String name, IBlockState full, IBlockState slab, IBlockState[] steps,
+            IBlockState[] corners) {
+        return new TerrainMaterial(new ResourceLocation("test", name), Collections.singleton(full), slab, steps,
+                corners, false, null);
     }
-    @Test void missingFormsFallbackAndAdditiveExtensionDoesNotReplaceSlab() {
-        MaterialCatalogue c=new MaterialCatalogue();IBlockState slab=piece(15);
-        TerrainMaterial m=material("stone",Blocks.STONE.getDefaultState(),slab,null,null);c.register(m);
-        for(int level=1;level<=3;level++)for(int mask=1;mask<16;mask++)assertSame(slab,c.result(m,mask,level));
-        IBlockState[] steps=new IBlockState[4],corners=new IBlockState[4];
-        for(int d=0;d<4;d++){steps[d]=piece(Footprint.EDGES[d]);corners[d]=piece(1<<d);}
-        c.addShapes(m.id,steps,corners);TerrainMaterial extended=c.source(Blocks.STONE.getDefaultState());
-        for(int d=0;d<4;d++){assertSame(steps[d],c.result(extended,Footprint.EDGES[d],2));assertSame(corners[d],c.result(extended,1<<d,3));}
-        steps[0]=slab;assertNotSame(slab,extended.step(0));assertSame(slab,extended.slab);
-        assertThrows(IllegalArgumentException.class,()->c.addShapes(m.id,new IBlockState[4],null));
-        c.freeze();assertThrows(IllegalStateException.class,()->c.addBiomeRule((id,b)->true));
+
+    @Test
+    void missingFormsFallbackAndAdditiveExtensionDoesNotReplaceSlab() {
+        MaterialCatalogue catalogue = new MaterialCatalogue();
+        IBlockState slab = piece(15);
+        TerrainMaterial terrainMaterial = material("stone", Blocks.STONE.getDefaultState(), slab, null, null);
+
+        catalogue.register(terrainMaterial);
+
+        for (int level = 1; level <= 3; level++) {
+            for (int mask = 1; mask < 16; mask++) {
+                assertSame(slab, catalogue.result(terrainMaterial, mask, level));
+            }
+        }
+
+        IBlockState[] steps = new IBlockState[4];
+        IBlockState[] corners = new IBlockState[4];
+
+        for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+            steps[directionIndex] = piece(Footprint.EDGES[directionIndex]);
+            corners[directionIndex] = piece(1 << directionIndex);
+        }
+
+        catalogue.addShapes(terrainMaterial.id, steps, corners);
+
+        TerrainMaterial extended = catalogue.source(Blocks.STONE.getDefaultState());
+
+        for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+            assertSame(steps[directionIndex], catalogue.result(extended, Footprint.EDGES[directionIndex], 2));
+            assertSame(corners[directionIndex], catalogue.result(extended, 1 << directionIndex, 3));
+        }
+
+        steps[0] = slab;
+        assertNotSame(slab, extended.step(0));
+        assertSame(slab, extended.slab);
+        assertThrows(IllegalArgumentException.class, () -> catalogue.addShapes(terrainMaterial.id, new IBlockState[4], null));
+        catalogue.freeze();
+        assertThrows(IllegalStateException.class, () -> catalogue.addBiomeRule((id, b) -> true));
     }
-    @Test void conflictsAreAtomicAndInvalidGeometryIsRejected() {
-        MaterialCatalogue c=new MaterialCatalogue();IBlockState slab=piece(15);
-        TerrainMaterial m=material("stone",Blocks.STONE.getDefaultState(),slab,null,null);c.register(m);
-        assertThrows(IllegalArgumentException.class,()->c.register(material("dirt",Blocks.DIRT.getDefaultState(),slab,null,null)));
-        assertEquals(1,c.size());assertSame(m,c.piece(slab));assertNull(c.source(Blocks.DIRT.getDefaultState()));
-        assertThrows(IllegalArgumentException.class,()->c.register(material("full",Blocks.DIRT.getDefaultState(),Blocks.STONE.getDefaultState(),null,null)));
-        assertThrows(IllegalArgumentException.class,()->c.register(material("tile",Blocks.CHEST.getDefaultState(),piece(15),null,null)));
-        assertThrows(IllegalArgumentException.class,()->c.register(material("wrong",Blocks.DIRT.getDefaultState(),piece(3),null,null)));
-        assertThrows(IllegalArgumentException.class,()->c.register(material("dupe",Blocks.STONE.getDefaultState(),piece(15),null,null)));
+
+    @Test
+    void conflictsAreAtomicAndInvalidGeometryIsRejected() {
+        MaterialCatalogue catalogue = new MaterialCatalogue();
+        IBlockState slab = piece(15);
+        TerrainMaterial terrainMaterial = material("stone", Blocks.STONE.getDefaultState(), slab, null, null);
+
+        catalogue.register(terrainMaterial);
+        assertThrows(IllegalArgumentException.class,
+                () -> catalogue.register(material("dirt", Blocks.DIRT.getDefaultState(), slab, null, null)));
+        assertEquals(1, catalogue.size());
+        assertSame(terrainMaterial, catalogue.piece(slab));
+        assertNull(catalogue.source(Blocks.DIRT.getDefaultState()));
+        assertThrows(IllegalArgumentException.class, () -> catalogue
+                .register(material("full", Blocks.DIRT.getDefaultState(), Blocks.STONE.getDefaultState(), null, null)));
+        assertThrows(IllegalArgumentException.class,
+                () -> catalogue.register(material("tile", Blocks.CHEST.getDefaultState(), piece(15), null, null)));
+        assertThrows(IllegalArgumentException.class,
+                () -> catalogue.register(material("wrong", Blocks.DIRT.getDefaultState(), piece(3), null, null)));
+        assertThrows(IllegalArgumentException.class,
+                () -> catalogue.register(material("dupe", Blocks.STONE.getDefaultState(), piece(15), null, null)));
     }
-    @Test void biomeRestrictionsAndProtectedAreasAreOnlyVetoes() {
-        MaterialCatalogue c=new MaterialCatalogue();TerrainMaterial m=material("stone",Blocks.STONE.getDefaultState(),piece(15),null,null);c.register(m);
-        c.addBiomeRule((id,biome)->biome==Biomes.PLAINS);c.addAreaProtection((dimension,pos,biome)->pos.getX()<0);
-        assertTrue(c.allows(m,Biomes.PLAINS,0,BlockPos.ORIGIN));assertFalse(c.allows(m,Biomes.DESERT,0,BlockPos.ORIGIN));
-        assertFalse(c.allows(m,Biomes.PLAINS,0,new BlockPos(-1,1,1)));
+
+    @Test
+    void biomeRestrictionsAndProtectedAreasAreOnlyVetoes() {
+        MaterialCatalogue catalogue = new MaterialCatalogue();
+        TerrainMaterial terrainMaterial = material("stone", Blocks.STONE.getDefaultState(), piece(15), null, null);
+
+        catalogue.register(terrainMaterial);
+        catalogue.addBiomeRule((id, biome) -> biome == Biomes.PLAINS);
+        catalogue.addAreaProtection((dimension, pos, biome) -> pos.getX() < 0);
+        assertTrue(catalogue.allows(terrainMaterial, Biomes.PLAINS, 0, BlockPos.ORIGIN));
+        assertFalse(catalogue.allows(terrainMaterial, Biomes.DESERT, 0, BlockPos.ORIGIN));
+        assertFalse(catalogue.allows(terrainMaterial, Biomes.PLAINS, 0, new BlockPos(-1, 1, 1)));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/skysterrainsmoother/ExistingChunkIndexTest.java b/src/test/java/zone/moddev/mc/skysterrainsmoother/ExistingChunkIndexTest.java
index 280dcb2..06f90a9 100644
--- a/src/test/java/zone/moddev/mc/skysterrainsmoother/ExistingChunkIndexTest.java
+++ b/src/test/java/zone/moddev/mc/skysterrainsmoother/ExistingChunkIndexTest.java
@@ -8,19 +8,37 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class ExistingChunkIndexTest {
-    @TempDir Path directory;
-    @Test void savedEntriesIncludingNegativeAndUnpopulatedAreExcludedWithoutDecodingChunks() throws Exception {
-        Path regions=Files.createDirectories(directory.resolve("region"));
-        try(DataOutputStream out=new DataOutputStream(Files.newOutputStream(regions.resolve("r.-1.2.mca")))) {
-            for(int i=0;i<1024;i++)out.writeInt(i==0||i==1023?0x201:0);
+    @TempDir
+    Path directory;
+
+    @Test
+    void savedEntriesIncludingNegativeAndUnpopulatedAreExcludedWithoutDecodingChunks() throws Exception {
+        Path regions = Files.createDirectories(directory.resolve("region"));
+
+        try (DataOutputStream out = new DataOutputStream(Files.newOutputStream(regions.resolve("r.-1.2.mca")))) {
+            for (int chunkEntryIndex = 0; chunkEntryIndex < 1024; chunkEntryIndex++) {
+                out.writeInt(chunkEntryIndex == 0 || chunkEntryIndex == 1023 ? 0x201 : 0);
+            }
         }
-        ExistingChunkIndex index=new ExistingChunkIndex(directory.toFile());
-        assertEquals(2,index.size());assertTrue(index.contains(-32,64));assertTrue(index.contains(-1,95));
-        assertFalse(index.contains(-31,64));assertFalse(index.contains(0,64));
+
+        ExistingChunkIndex index = new ExistingChunkIndex(directory.toFile());
+
+        assertEquals(2, index.size());
+        assertTrue(index.contains(-32, 64));
+        assertTrue(index.contains(-1, 95));
+        assertFalse(index.contains(-31, 64));
+        assertFalse(index.contains(0, 64));
     }
-    @Test void damagedHeaderStopsSafely() throws Exception {
-        Files.createDirectories(directory.resolve("region"));Files.write(directory.resolve("region/r.0.0.mca"),new byte[10]);
-        assertThrows(IOException.class,()->new ExistingChunkIndex(directory.toFile()));
+
+    @Test
+    void damagedHeaderStopsSafely() throws Exception {
+        Files.createDirectories(directory.resolve("region"));
+        Files.write(directory.resolve("region/r.0.0.mca"), new byte[10]);
+        assertThrows(IOException.class, () -> new ExistingChunkIndex(directory.toFile()));
+    }
+
+    @Test
+    void newWorldHasNoSavedChunks() throws Exception {
+        assertEquals(0, new ExistingChunkIndex(directory.toFile()).size());
     }
-    @Test void newWorldHasNoSavedChunks() throws Exception {assertEquals(0,new ExistingChunkIndex(directory.toFile()).size());}
 }
diff --git a/src/test/java/zone/moddev/mc/skysterrainsmoother/FootprintTest.java b/src/test/java/zone/moddev/mc/skysterrainsmoother/FootprintTest.java
index acca72a..e668346 100644
--- a/src/test/java/zone/moddev/mc/skysterrainsmoother/FootprintTest.java
+++ b/src/test/java/zone/moddev/mc/skysterrainsmoother/FootprintTest.java
@@ -5,30 +5,68 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class FootprintTest {
-    @Test void everyFootprintLevelAndRotation() {
-        for(int level=1;level<=3;level++)for(int cardinal=0;cardinal<16;cardinal++)for(int diagonal=0;diagonal<16;diagonal++) {
-            int expected=0;
-            for(int d=0;d<4;d++)if((cardinal&(1<<d))!=0)expected|=Footprint.EDGES[d];
-            if(level==3)expected|=diagonal;
-            int mask=Footprint.mask(cardinal,diagonal,level);assertEquals(expected,mask);
-            int shape=Footprint.shape(mask,level);
-            if(mask==0)assertEquals(0,shape);
-            else if(level==3&&Integer.bitCount(mask)==1)assertEquals(3,shape);
-            else if(level>=2&&(mask==3||mask==6||mask==12||mask==9))assertEquals(2,shape);
-            else assertEquals(1,shape);
-            int rotation=((mask<<1)&15)|(mask>>3);
-            assertEquals(shape,Footprint.shape(rotation,level));
-            if(shape>1)assertEquals((Footprint.direction(mask,shape)+1)&3,Footprint.direction(rotation,shape));
+    @Test
+    void everyFootprintLevelAndRotation() {
+        for (int level = 1; level <= 3; level++) {
+            for (int cardinal = 0; cardinal < 16; cardinal++) {
+                for (int diagonal = 0; diagonal < 16; diagonal++) {
+                    int expected = 0;
+
+                    for (int directionIndex = 0; directionIndex < 4; directionIndex++) {
+                        if ((cardinal & (1 << directionIndex)) != 0) {
+                            expected |= Footprint.EDGES[directionIndex];
+                        }
+                    }
+                    if (level == 3) {
+                        expected |= diagonal;
+                    }
+
+                    int mask = Footprint.mask(cardinal, diagonal, level);
+
+                    assertEquals(expected, mask);
+
+                    int shape = Footprint.shape(mask, level);
+
+                    if (mask == 0) {
+                        assertEquals(0, shape);
+                    } else if (level == 3 && Integer.bitCount(mask) == 1) {
+                        assertEquals(3, shape);
+                    } else if (level >= 2 && (mask == 3 || mask == 6 || mask == 12 || mask == 9)) {
+                        assertEquals(2, shape);
+                    } else {
+                        assertEquals(1, shape);
+                    }
+
+                    int rotation = ((mask << 1) & 15) | (mask >> 3);
+
+                    assertEquals(shape, Footprint.shape(rotation, level));
+
+                    if (shape > 1) {
+                        assertEquals((Footprint.direction(mask, shape) + 1) & 3, Footprint.direction(rotation, shape));
+                    }
+                }
+            }
         }
     }
-    @Test void disconnectedAndThreeQuadrantFootprintsAreSlabs() {
-        for(int mask:new int[]{5,10,7,11,13,14})assertEquals(1,Footprint.shape(mask,3));
+
+    @Test
+    void disconnectedAndThreeQuadrantFootprintsAreSlabs() {
+        for (int mask : new int[] { 5, 10, 7, 11, 13, 14 }) {
+            assertEquals(1, Footprint.shape(mask, 3));
+        }
     }
-    @Test void borderPolicyNeverReadsTheUnownedNorthOrWestBorder() {
-        for(int x=-2;x<=18;x++)for(int z=-2;z<=18;z++)
-            assertEquals(x>=0&&x<=16&&z>=0&&z<=16,Footprint.allowedNeighbour(x,z));
-        assertThrows(IllegalArgumentException.class,()->Footprint.mask(0,0,0));
-        assertThrows(IllegalArgumentException.class,()->Footprint.shape(16,3));
-        assertThrows(IllegalArgumentException.class,()->Footprint.shape(0,4));
+
+    @Test
+    void borderPolicyNeverReadsTheUnownedNorthOrWestBorder() {
+        for (int blockX = -2; blockX <= 18; blockX++) {
+            for (int blockZ = -2; blockZ <= 18; blockZ++) {
+                assertEquals(blockX >= 0 && blockX <= 16 && blockZ >= 0 && blockZ <= 16,
+                        Footprint.allowedNeighbour(blockX, blockZ));
+            }
+        }
+
+        assertThrows(IllegalArgumentException.class, () -> Footprint.mask(0, 0, 0));
+        assertThrows(IllegalArgumentException.class, () -> Footprint.shape(16, 3));
+        assertThrows(IllegalArgumentException.class, () -> Footprint.shape(0, 4));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/skysterrainsmoother/ProjectContractTest.java b/src/test/java/zone/moddev/mc/skysterrainsmoother/ProjectContractTest.java
index f8cae11..a05e7f9 100644
--- a/src/test/java/zone/moddev/mc/skysterrainsmoother/ProjectContractTest.java
+++ b/src/test/java/zone/moddev/mc/skysterrainsmoother/ProjectContractTest.java
@@ -1,67 +1,138 @@
 package zone.moddev.mc.skysterrainsmoother;
+
 import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.util.*;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.*;
+
 class ProjectContractTest {
-    @Test void onlySandPaletteIsNewAndMigrationStateAndToolchainArePreserved() throws Exception {
-        String properties=text("gradle.properties"),build=text("build.gradle");
-        assertTrue(properties.contains("mod_version=0.1.0.110021"));assertTrue(properties.contains("mapping_version=29-1.10.2"));
-        assertTrue(build.contains("version '7.0.34'"));assertTrue(build.contains("verifyEclipseProductionClasspath"));
-        try(java.util.stream.Stream<Path> paths=Files.walk(Paths.get("src/main/java"))) {
-            paths.filter(Files::isRegularFile).forEach(path->{try{
-                String source=new String(Files.readAllBytes(path),StandardCharsets.UTF_8);
-                assertFalse(source.contains("extends WorldSavedData"));
-                if(!path.toString().contains("content"))assertFalse(source.contains("setRegistryName("));
-            }catch(Exception failure){throw new AssertionError(failure);}});
+    @Test
+    void onlySandPaletteIsNewAndMigrationStateAndToolchainArePreserved() throws Exception {
+        String properties = text("gradle.properties");
+        String build = text("build.gradle");
+
+        assertTrue(properties.contains("mod_version=0.1.0.110021"));
+        assertTrue(properties.contains("mapping_version=29-1.10.2"));
+        assertTrue(build.contains("version '7.0.34'"));
+        assertTrue(build.contains("verifyEclipseProductionClasspath"));
+
+        try (java.util.stream.Stream<Path> paths = Files.walk(Paths.get("src/main/java"))) {
+            paths.filter(Files::isRegularFile).forEach(path -> {
+                try {
+                    String source = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
+
+                    assertFalse(source.contains("extends WorldSavedData"));
+
+                    if (!path.toString().contains("content")) {
+                        assertFalse(source.contains("setRegistryName("));
+                    }
+                } catch (Exception failure) {
+                    throw new AssertionError(failure);
+                }
+            });
         }
-        String api=text("src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java");
-        assertFalse(api.contains("public static MaterialCatalogue"));assertTrue(api.contains("INITIALIZATION"));
+
+        String api = source("src/main/java/zone/moddev/mc/skysterrainsmoother/api/TerrainSmoothingApi.java");
+
+        assertFalse(api.contains("publicstaticMaterialCatalogue"));
+        assertTrue(api.contains("INITIALIZATION"));
     }
-    @Test void generationAndResourceContracts() throws Exception {
-        String engine=text("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
-        assertTrue(engine.contains("priority=EventPriority.LOWEST"));assertTrue(engine.contains("existing.contains"));
-        assertTrue(engine.contains("getLoadedChunk"));assertFalse(engine.contains("provideChunk"));
-        assertTrue(engine.contains("new int[256]"));assertTrue(engine.contains("new IBlockState[256]"));
+
+    @Test
+    void generationAndResourceContracts() throws Exception {
+        String engine = source("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
+
+        assertTrue(engine.contains("priority=EventPriority.LOWEST"));
+        assertTrue(engine.contains("existing.contains"));
+        assertTrue(engine.contains("getLoadedChunk"));
+        assertFalse(engine.contains("provideChunk"));
+        assertTrue(engine.contains("newint[256]"));
+        assertTrue(engine.contains("newIBlockState[256]"));
         assertTrue(text("src/main/resources/pack.mcmeta").contains("\"pack_format\":2"));
-        for(String workflow:new String[]{"ci.yml","codeql-analysis.yml","validate-gradle-build.yml","release-on-tag.yml"})assertTrue(Files.isRegularFile(Paths.get(".github/workflows",workflow)));
+
+        for (String workflow : new String[] { "ci.yml", "codeql-analysis.yml", "validate-gradle-build.yml",
+                "release-on-tag.yml" }) {
+            assertTrue(Files.isRegularFile(Paths.get(".github/workflows", workflow)));
+        }
+
         assertTrue(text(".github/workflows/ci.yml").contains("if-no-files-found: error"));
     }
-    private static String text(String path)throws Exception{return new String(Files.readAllBytes(Paths.get(path)),StandardCharsets.UTF_8);}
-    @Test void caveFloorsRetainTwoPassLoadedOnlyAndOreSupportContracts() throws Exception {
-        String engine=text("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
-        assertTrue(engine.contains("for(int y=Math.min(surfaceY,254);y>=0;--y)"));
+
+    /** Compare Java structure without tying these contracts to spacing or line breaks. */
+    private static String source(String path) throws Exception {
+        return text(path).replaceAll("\\s+", "");
+    }
+
+    private static String text(String path) throws Exception {
+        return new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8);
+    }
+
+    @Test
+    void caveFloorsRetainTwoPassLoadedOnlyAndOreSupportContracts() throws Exception {
+        String engine = source("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
+
+        assertTrue(engine.contains("for(intfloorY=Math.min(surfaceY,254);floorY>=0;--floorY)"));
         assertTrue(engine.contains("height=2;height<=3"));
         assertTrue(engine.contains("Arrays.copyOf(positions,capacity)"));
-        assertTrue(engine.indexOf("buffer.add(")<engine.indexOf("owner.setBlockState(target,buffer.results[index])"));
-        assertTrue(engine.contains("PopulateChunkEvent.Post"));assertTrue(engine.contains("TickEvent.WorldTickEvent"));
-        assertTrue(engine.contains("!oreSupport(support)"));assertTrue(engine.contains("OreDictionary.getOreIDs"));
+        assertTrue(engine.indexOf("buffer.add(") < engine.indexOf("owner.setBlockState(target,buffer.results[index])"));
+        assertTrue(engine.contains("PopulateChunkEvent.Post"));
+        assertTrue(engine.contains("TickEvent.WorldTickEvent"));
+        assertTrue(engine.contains("!oreSupport(support)"));
+        assertTrue(engine.contains("OreDictionary.getOreIDs"));
         assertFalse(engine.contains("getChunkFromChunkCoords"));
         assertTrue(text("README.md").contains("including cave floors"));
         assertTrue(text("docs/CONFIGURATION.md").contains("no retrogen"));
     }
-    @Test void sandResourcesAndGravityContract() throws Exception {
-        String block=text("src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java");
-        assertTrue(block.contains("extends BlockFalling"));assertTrue(block.contains("EntityFallingBlock"));
-        assertTrue(block.contains("BlockSand.VARIANT"));assertTrue(block.contains("BlockSlab.HALF"));
-        assertFalse(block.contains("VERTICAL"));assertFalse(block.contains("TileEntity"));
-        Path root=Paths.get("src/main/resources/assets/skysterrainsmoother");
+
+    @Test
+    void sandResourcesAndGravityContract() throws Exception {
+        String block = text("src/main/java/zone/moddev/mc/skysterrainsmoother/content/SandSlabBlock.java");
+
+        assertTrue(block.contains("extends BlockFalling"));
+        assertTrue(block.contains("EntityFallingBlock"));
+        assertTrue(block.contains("BlockSand.VARIANT"));
+        assertTrue(block.contains("BlockSlab.HALF"));
+        assertFalse(block.contains("VERTICAL"));
+        assertFalse(block.contains("TileEntity"));
+
+        Path root = Paths.get("src/main/resources/assets/skysterrainsmoother");
+
         assertTrue(Files.isRegularFile(root.resolve("blockstates/sand_slab.json")));
-        for(String type:new String[]{"sand","red_sand"})for(String half:new String[]{"top","bottom"})
-            assertTrue(Files.isRegularFile(root.resolve("models/block/"+type+"_slab"+(half.equals("top")?"_top":"")+".json")));
-        try(java.util.stream.Stream<Path> paths=Files.list(root.resolve("lang"))) {
-            List<Path> languages=paths.collect(java.util.stream.Collectors.toList());assertEquals(18,languages.size());
-            for(Path language:languages){String content=new String(Files.readAllBytes(language),StandardCharsets.UTF_8);assertTrue(content.endsWith("\n"));assertFalse(content.contains("\r"));assertFalse(content.contains("\uFEFF"));assertEquals(2,content.split("\n").length);}
+
+        for (String type : new String[] { "sand", "red_sand" }) {
+            for (String half : new String[] { "top", "bottom" }) {
+                assertTrue(Files.isRegularFile(
+                        root.resolve("models/block/" + type + "_slab" + (half.equals("top") ? "_top" : "") + ".json")));
+            }
+        }
+        try (java.util.stream.Stream<Path> paths = Files.list(root.resolve("lang"))) {
+            List<Path> languages = paths.collect(java.util.stream.Collectors.toList());
+
+            assertEquals(18, languages.size());
+
+            for (Path language : languages) {
+                String content = new String(Files.readAllBytes(language), StandardCharsets.UTF_8);
+
+                assertTrue(content.endsWith("\n"));
+                assertFalse(content.contains("\r"));
+                assertFalse(content.contains("\uFEFF"));
+                assertEquals(2, content.split("\n").length);
+            }
         }
     }
-    @Test void clayAndLateOasesReusePiecesWithoutRetrogen() throws Exception {
-        String materials=text("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java");
+
+    @Test
+    void clayAndLateOasesReusePiecesWithoutRetrogen() throws Exception {
+        String materials = source("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/BuiltInMaterials.java");
+
         assertTrue(materials.contains("vanilla(\"hardened_clay\",Blocks.HARDENED_CLAY.getDefaultState(),false,null)"));
-        String engine=text("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
-        assertTrue(engine.contains("if(afterDecoration&&!pending.containsKey(key))return 0"));
+
+        String engine = source("src/main/java/zone/moddev/mc/skysterrainsmoother/internal/SmoothingEngine.java");
+
+        assertTrue(engine.contains("if(afterDecoration&&!pending.containsKey(key)){return0;}"));
         assertFalse(engine.contains("sandOnly"));
-        assertTrue(engine.contains("if(afterDecoration)pending.get(key).addAll(placements)"));
+        assertTrue(engine.contains("if(afterDecoration){pending.get(key).addAll(placements);}"));
         assertTrue(text("README.md").contains("hardened clay"));
     }
 }
diff --git a/src/test/java/zone/moddev/mc/skysterrainsmoother/PublicationContractTest.java b/src/test/java/zone/moddev/mc/skysterrainsmoother/PublicationContractTest.java
index e85e185..08f4e50 100644
--- a/src/test/java/zone/moddev/mc/skysterrainsmoother/PublicationContractTest.java
+++ b/src/test/java/zone/moddev/mc/skysterrainsmoother/PublicationContractTest.java
@@ -7,17 +7,26 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class PublicationContractTest {
-    @Test void publicationNeedsThisModsMetadataAndExplicitApproval() throws Exception {
+    @Test
+    void publicationNeedsThisModsMetadataAndExplicitApproval() throws Exception {
         String properties = text("gradle.properties");
         java.util.Properties metadata = new java.util.Properties();
+
         metadata.load(new java.io.StringReader(properties));
+
         String projectId = metadata.getProperty("curseforge_project_id", "");
+
         assertTrue(metadata.getProperty("release_enabled").matches("true|false"));
-        if (!projectId.matches("[1-9][0-9]*"))
+
+        if (!projectId.matches("[1-9][0-9]*")) {
             assertEquals("false", metadata.getProperty("release_enabled"));
+        }
+
         assertNotEquals("1677588", projectId);
         assertTrue(properties.contains("release_repository=MinecraftModDevelopmentMods/SkysTerrainSmoother"));
+
         String workflow = text(".github/workflows/deploy-release.yml");
+
         assertTrue(workflow.contains("confirm_live_publication"));
         assertTrue(workflow.contains("default: false"));
         assertTrue(workflow.contains("value release_enabled"));
@@ -28,8 +37,11 @@ class PublicationContractTest {
         assertTrue(workflow.indexOf("  publish_maven:") < workflow.indexOf("  publish_curseforge:"));
         assertTrue(workflow.indexOf("  publish_curseforge:") < workflow.indexOf("  publish_github:"));
     }
-    @Test void mavenUsesTheVerifiedBundleAndCiRunsOnPushAndPullRequest() throws Exception {
+
+    @Test
+    void mavenUsesTheVerifiedBundleAndCiRunsOnPushAndPullRequest() throws Exception {
         String release = text("gradle/release.gradle");
+
         assertTrue(release.contains("if (!releaseEnabled"));
         assertTrue(release.contains("Prepared artifact checksum mismatch"));
         assertTrue(release.contains("lines.size() != 3"));
@@ -37,13 +49,16 @@ class PublicationContractTest {
         assertTrue(release.contains("verifyPreparedReleaseArtifacts"));
         assertTrue(release.contains("collect { it.toString() }"));
         assertTrue(release.contains("verifyReleaseBundleContract"));
-        String ci = text(".github/workflows/ci.yml");
-        assertTrue(ci.contains("  push:"));
-        assertTrue(ci.contains("  pull_request:"));
-        assertTrue(ci.contains("if-no-files-found: error"));
-        assertTrue(ci.contains("integrationTest"));
-        assertTrue(ci.contains("--offline"));
+
+        String ciWorkflow = text(".github/workflows/ci.yml");
+
+        assertTrue(ciWorkflow.contains("  push:"));
+        assertTrue(ciWorkflow.contains("  pull_request:"));
+        assertTrue(ciWorkflow.contains("if-no-files-found: error"));
+        assertTrue(ciWorkflow.contains("integrationTest"));
+        assertTrue(ciWorkflow.contains("--offline"));
     }
+
     private String text(String path) throws Exception {
         return new String(Files.readAllBytes(Paths.get(path)), StandardCharsets.UTF_8).replace("\r\n", "\n");
     }
diff --git a/style/eclipse-java-formatter.xml b/style/eclipse-java-formatter.xml
new file mode 100644
index 0000000..a0229cc
--- /dev/null
+++ b/style/eclipse-java-formatter.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="23"><profile kind="CodeFormatterProfile" name="Sky Java" version="23">
+  <setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+  <setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+  <setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+  <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="49"/>
+  <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="120"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+  <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+  <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="insert"/>
+  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+  <setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+  <setting id="org.eclipse.jdt.core.formatter.join_line_comments" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_guardian_clause_on_one_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_method_body_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_simple_if_on_one_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+  <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
+  <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="120"/>
+  <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+  <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+  <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+</profile></profiles>