From 7880531bdb8cf1c3b8b7f46ae14bdd2f95d9297a Mon Sep 17 00:00:00 2001
From: Master290 <Master290@users.noreply.github.com>
Date: Mon, 27 Jul 2026 03:27:09 +0300
Subject: [PATCH] Send three real heightmaps instead of one repeated three
 times

writeHeightmaps computed "highest non-air" once and wrote the same 37 longs
under all three ids, on the stated assumption that our terrain has no leaves or
transparency. That stopped being true the moment the generator grew trees and
flowers.

Vanilla's three client heightmaps stop at different blocks: WORLD_SURFACE at the
first thing that is not air, MOTION_BLOCKING at the first that blocks motion or
holds fluid, MOTION_BLOCKING_NO_LEAVES at the first such thing that is not a
LeavesBlock -- an instanceof, not the minecraft:leaves tag. The client places
rain and snow particles off MOTION_BLOCKING and lands a fishing bobber on it, so
a tree canopy reported as solid ground rains under itself.

Neither blocksMotion() nor the leaves test is derivable from blocks.json: the
first reads cached VoxelShape collision geometry and the forceSolidOn/Off
properties, the second is a Java class check. So the Java dumper grows three
flag bits and the whole thing is renamed for what it now is -- block state
properties, not just lighting. tools/VanillaBlockStateDump.java writes
internal/world/block_properties.bin at format 2; the light bytes are unchanged
byte for byte and only the previously unused high flag bits moved.

Verified the dumper round trip while doing it: recompiling the old
VanillaLightDump against the jar reproduces the committed binary exactly, so the
data really does come from the runtime registry and not from a stale checkout.
CLAUDE.md now carries the command to rebuild it.
---
 CLAUDE.md                                     |  23 +++-
 internal/world/block_properties.bin           | Bin 0 -> 204677 bytes
 ...ight_properties.go => block_properties.go} |  71 +++++++++---
 internal/world/encode.go                      |  80 ++++++++++---
 internal/world/heightmap_test.go              | 106 ++++++++++++++++++
 internal/world/light_properties.bin           | Bin 204677 -> 0 bytes
 internal/world/store.go                       |   2 +-
 ...htDump.java => VanillaBlockStateDump.java} |  46 ++++++--
 8 files changed, 280 insertions(+), 48 deletions(-)
 create mode 100644 internal/world/block_properties.bin
 rename internal/world/{light_properties.go => block_properties.go} (50%)
 create mode 100644 internal/world/heightmap_test.go
 delete mode 100644 internal/world/light_properties.bin
 rename tools/{VanillaLightDump.java => VanillaBlockStateDump.java} (65%)

diff --git a/CLAUDE.md b/CLAUDE.md
index efadf03..b7d8a38 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -60,11 +60,22 @@ threshold was pinned down: `Strategy$2` switches `{0..3}` and everything above f
 global palette, which `.refjava/` alone could not show.
 
 When a constant has to come from vanilla's *runtime* rather than its source or reports, dump it with
-a throwaway Java program run against the jar. `tools/VanillaLightDump.java` is the precedent — it
-walks the block-state registry and emits opacity, emission and voxel face shapes into
-`internal/world/light_properties.bin`. Substring-matching block names is how the light table was
-wrong before (`grass_block` matched "grass", `bedrock` matched "bed"); don't reintroduce that shape
-of guess anywhere.
+a Java program run against the jar. `tools/VanillaBlockStateDump.java` is the one that exists — it
+walks the block-state registry and emits, per state, light opacity and emission, voxel face-occlusion
+masks, and the `blocksMotion` / fluid / leaves flags the heightmaps need, into
+`internal/world/block_properties.bin`. Rebuild it with:
+
+```
+CP="versions/26.1.2/server-26.1.2.jar;$(find libraries -name '*.jar' | tr '\n' ';')"
+javac -nowarn -cp "$CP" -d <out> tools/VanillaBlockStateDump.java
+java -cp "<out>;$CP" VanillaBlockStateDump > internal/world/block_properties.bin
+```
+
+The 39 jars under `libraries/` are required; the server jar alone will not boot the registry. Bump
+the format version in both the Java and `internal/world/block_properties.go` whenever the layout or
+a flag's meaning changes. Substring-matching block names is how the light table was wrong before
+(`grass_block` matched "grass", `bedrock` matched "bed"); don't reintroduce that shape of guess
+anywhere.
 
 ## Layout
 
@@ -74,7 +85,7 @@ cmd/gendump/      client-free generator diagnostics — biome spread, surface bl
                   subsurface banding, deep-layer composition, bedrock band, fluid census,
                   cross-section
 cmd/genblocks/    generates internal/worldgen/generated_blocks.go from the block report
-cmd/genlight/     legacy light-table generator, superseded by tools/VanillaLightDump.java
+cmd/genlight/     legacy light-table generator, superseded by tools/VanillaBlockStateDump.java
 tools/            Java dumpers run against the jar, plus their Go-side fixtures
 internal/protocol/  VarInt, framing, compression, packet IDs
 internal/nbt/       NBT codec (modified UTF-8)
diff --git a/internal/world/block_properties.bin b/internal/world/block_properties.bin
new file mode 100644
index 0000000000000000000000000000000000000000..a37bb1ce88ab06a865d6e219e9e77768334d410b
GIT binary patch
literal 204677
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%0Dc#&+k?^E!XE@bJmj=`uYU=!HEp!
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

literal 0
HcmV?d00001

diff --git a/internal/world/light_properties.go b/internal/world/block_properties.go
similarity index 50%
rename from internal/world/light_properties.go
rename to internal/world/block_properties.go
index c864455..ef8719e 100644
--- a/internal/world/light_properties.go
+++ b/internal/world/block_properties.go
@@ -6,40 +6,57 @@ import (
 	"fmt"
 )
 
-// lightPropertiesBinary is generated by tools/VanillaLightDump.java directly
-// from the 26.1.2 runtime block-state registry.
+// blockPropertiesBinary is generated by tools/VanillaBlockStateDump.java
+// directly from the 26.1.2 runtime block-state registry. None of what it holds
+// appears in generated/reports/blocks.json or in any tag file: light dampening,
+// emission, voxel face-occlusion masks, whether a state blocks motion, whether
+// it holds a fluid, and whether its block is a LeavesBlock all exist only once
+// vanilla has built the registry.
 //
-//go:embed light_properties.bin
-var lightPropertiesBinary []byte
+//go:embed block_properties.bin
+var blockPropertiesBinary []byte
 
 var (
 	blockOpacity    [totalBlockStates]byte
 	blockEmission   [totalBlockStates]byte
-	blockLightFlags [totalBlockStates]byte
+	blockStateFlags [totalBlockStates]byte
 	blockLightShape [totalBlockStates]uint16
 	lightFaceShapes [][lightShapeBytes]byte
 )
 
 const (
-	lightPropertiesMagic   = 0x52494f4c // RIOL
-	lightPropertiesVersion = 1
+	blockPropertiesMagic   = 0x52494f4c // RIOL
+	blockPropertiesVersion = 2
 	lightShapeBytes        = 6 * 32 // six 16x16 face masks
 )
 
+// Per-state flag bits, as written by tools/VanillaBlockStateDump.java. The
+// first three drive lighting; the rest drive the heightmaps, and none of them
+// can be derived from blocks.json or from a tag file — they only exist once
+// vanilla's block-state registry is built.
+const (
+	flagPropagatesSkylight = 1 << iota
+	flagCanOcclude
+	flagShapeForOcclusion
+	flagBlocksMotion
+	flagFluid
+	flagLeaves
+)
+
 func init() {
-	if err := decodeLightProperties(lightPropertiesBinary); err != nil {
-		panic(fmt.Sprintf("world: decode vanilla light properties: %v", err))
+	if err := decodeBlockProperties(blockPropertiesBinary); err != nil {
+		panic(fmt.Sprintf("world: decode vanilla block properties: %v", err))
 	}
 }
 
-func decodeLightProperties(data []byte) error {
+func decodeBlockProperties(data []byte) error {
 	if len(data) < 16 {
 		return fmt.Errorf("header is truncated")
 	}
-	if binary.BigEndian.Uint32(data[0:4]) != lightPropertiesMagic {
+	if binary.BigEndian.Uint32(data[0:4]) != blockPropertiesMagic {
 		return fmt.Errorf("invalid magic")
 	}
-	if version := binary.BigEndian.Uint32(data[4:8]); version != lightPropertiesVersion {
+	if version := binary.BigEndian.Uint32(data[4:8]); version != blockPropertiesVersion {
 		return fmt.Errorf("unsupported version %d", version)
 	}
 	states := int(binary.BigEndian.Uint32(data[8:12]))
@@ -56,7 +73,7 @@ func decodeLightProperties(data []byte) error {
 	for id := 0; id < states; id++ {
 		blockOpacity[id] = data[offset]
 		blockEmission[id] = data[offset+1]
-		blockLightFlags[id] = data[offset+2]
+		blockStateFlags[id] = data[offset+2]
 		blockLightShape[id] = binary.BigEndian.Uint16(data[offset+3 : offset+5])
 		if int(blockLightShape[id]) >= shapes {
 			return fmt.Errorf("state %d references shape %d of %d", id, blockLightShape[id], shapes)
@@ -85,6 +102,29 @@ func lightEmission(state uint16) byte {
 	return blockEmission[state]
 }
 
+func stateFlags(state uint16) byte {
+	if int(state) >= len(blockStateFlags) {
+		return 0
+	}
+	return blockStateFlags[state]
+}
+
+// blocksMotionOrFluid is Heightmap.Types.MOTION_BLOCKING's predicate:
+// blocksMotion() || !getFluidState().isEmpty(). Note that a waterlogged block
+// satisfies the fluid half, which is why the flag is per state and not per
+// block.
+func blocksMotionOrFluid(state uint16) bool {
+	return stateFlags(state)&(flagBlocksMotion|flagFluid) != 0
+}
+
+// blocksMotionNoLeaves is MOTION_BLOCKING_NO_LEAVES's predicate: the same, less
+// anything that is a LeavesBlock. Vanilla tests instanceof, not the
+// minecraft:leaves tag, and the two sets are not the same.
+func blocksMotionNoLeaves(state uint16) bool {
+	f := stateFlags(state)
+	return f&(flagBlocksMotion|flagFluid) != 0 && f&flagLeaves == 0
+}
+
 // lightShapeOccludes mirrors Shapes.faceShapeOccludes for the 1/16-resolution
 // face masks emitted from vanilla's VoxelShape data.
 func lightShapeOccludes(from, into uint16, direction int) bool {
@@ -95,10 +135,11 @@ func lightShapeOccludes(from, into uint16, direction int) bool {
 	// Vanilla substitutes an empty shape unless both flags are true. Ordinary
 	// full cubes are handled by dampening; only shape-aware blocks (slabs,
 	// stairs, etc.) participate in face occlusion.
-	if int(from) < len(blockLightFlags) && blockLightFlags[from]&6 == 6 {
+	const shapeAware = flagCanOcclude | flagShapeForOcclusion
+	if int(from) < len(blockStateFlags) && blockStateFlags[from]&shapeAware == shapeAware {
 		fromShape = lightFaceShapes[blockLightShape[from]]
 	}
-	if int(into) < len(blockLightFlags) && blockLightFlags[into]&6 == 6 {
+	if int(into) < len(blockStateFlags) && blockStateFlags[into]&shapeAware == shapeAware {
 		intoShape = lightFaceShapes[blockLightShape[into]]
 	}
 	opposite := [...]int{1, 0, 3, 2, 5, 4}
diff --git a/internal/world/encode.go b/internal/world/encode.go
index 6755485..2da7c38 100644
--- a/internal/world/encode.go
+++ b/internal/world/encode.go
@@ -286,22 +286,36 @@ func (c *Chunk) encode() []byte {
 	return w.Bytes()
 }
 
-// Heightmap.Types ordinals sent to the client.
+// Heightmap.Types ids whose Usage is CLIENT. Vanilla sends exactly these three
+// and no others.
 const (
 	hmWorldSurface           = 1
 	hmMotionBlocking         = 4
 	hmMotionBlockingNoLeaves = 5
 )
 
-// writeHeightmaps emits the three client-relevant heightmaps. For our blocky
-// terrain (no leaves/transparency) they share the same column heights.
+// writeHeightmaps emits the three heightmaps the client is sent.
+//
+// They are not the same map, which is what this code used to assume. Each stops
+// at a different block: WORLD_SURFACE at the first thing that is not air,
+// MOTION_BLOCKING at the first thing that blocks movement or holds fluid, and
+// MOTION_BLOCKING_NO_LEAVES at the first such thing that is not leaves. A
+// flower, a torch, a sapling or a tree canopy separates them — the client uses
+// MOTION_BLOCKING to place rain and snow particles and to decide where a
+// fishing bobber lands, so a canopy reported as solid ground rains indoors.
 func (c *Chunk) writeHeightmaps(w *protocol.Writer) {
-	heights := c.columnHeights()
-	packed := packHeightmap(heights)
-
+	surface, motion, motionNoLeaves := c.heightmaps()
 	w.VarInt(3)
-	for _, t := range []int32{hmMotionBlockingNoLeaves, hmMotionBlocking, hmWorldSurface} {
-		w.VarInt(t)
+	for _, hm := range [...]struct {
+		id     int32
+		values [256]uint16
+	}{
+		{hmWorldSurface, surface},
+		{hmMotionBlocking, motion},
+		{hmMotionBlockingNoLeaves, motionNoLeaves},
+	} {
+		packed := packHeightmap(hm.values)
+		w.VarInt(hm.id)
 		w.VarInt(int32(len(packed)))
 		for _, v := range packed {
 			w.Int64(int64(v))
@@ -309,24 +323,54 @@ func (c *Chunk) writeHeightmaps(w *protocol.Writer) {
 	}
 }
 
-// columnHeights returns, per column, (highestNonAirY + 1) - MinY, clamped to 0.
-func (c *Chunk) columnHeights() [256]uint16 {
-	var h [256]uint16
+// heightmaps walks every column once from the top down, recording the first
+// block that satisfies each predicate. The stored value is one above the
+// matching block, relative to the world floor — what Heightmap.setHeight
+// writes — so 0 means the column has no matching block at all.
+func (c *Chunk) heightmaps() (surface, motion, motionNoLeaves [256]uint16) {
 	for lx := 0; lx < 16; lx++ {
 		for lz := 0; lz < 16; lz++ {
-			height := 0
-			for y := MinY + WorldHeight - 1; y >= MinY; y-- {
-				si := (y - MinY) >> 4
+			i := lz*16 + lx
+			var haveSurface, haveMotion, haveNoLeaves bool
+			for si := SectionCount - 1; si >= 0; si-- {
 				s := c.sections[si]
-				if s != nil && s[blockIndex(lx, y, lz)] != StateAir {
-					height = y + 1 - MinY
+				if s == nil {
+					continue
+				}
+				for ly := 15; ly >= 0; ly-- {
+					y := MinY + si*16 + ly
+					state := s[blockIndex(lx, y, lz)]
+					if state == StateAir {
+						continue
+					}
+					h := uint16(y + 1 - MinY)
+					if !haveSurface {
+						surface[i], haveSurface = h, true
+					}
+					if !haveMotion && blocksMotionOrFluid(state) {
+						motion[i], haveMotion = h, true
+					}
+					if !haveNoLeaves && blocksMotionNoLeaves(state) {
+						motionNoLeaves[i], haveNoLeaves = h, true
+					}
+					if haveSurface && haveMotion && haveNoLeaves {
+						break
+					}
+				}
+				if haveSurface && haveMotion && haveNoLeaves {
 					break
 				}
 			}
-			h[lz*16+lx] = uint16(height)
 		}
 	}
-	return h
+	return surface, motion, motionNoLeaves
+}
+
+// columnHeights returns the WORLD_SURFACE heightmap on its own, for the
+// on-disk Heightmaps tag and the parity test.
+func (c *Chunk) columnHeights() [256]uint16 {
+	surface, _, _ := c.heightmaps()
+	return surface
 }
 
 // packHeightmap packs 256 column heights at 9 bits each, 7 values per long,
diff --git a/internal/world/heightmap_test.go b/internal/world/heightmap_test.go
new file mode 100644
index 0000000..3e97ef2
--- /dev/null
+++ b/internal/world/heightmap_test.go
@@ -0,0 +1,106 @@
+package world
+
+import "testing"
+
+// TestHeightmapsDiffer is the check the old code could not pass: the three
+// heightmaps sent to the client are different maps. They were all written from
+// one "highest non-air" array, on the stated assumption that our terrain has no
+// leaves or transparency — untrue the moment the generator grew trees and
+// flowers.
+//
+// The client reads MOTION_BLOCKING to place rain and snow and to land a fishing
+// bobber, and MOTION_BLOCKING_NO_LEAVES to decide what counts as sky cover.
+func TestHeightmapsDiffer(t *testing.T) {
+	c := NewChunk(0, 0, BiomePlains)
+	const floor = 64
+
+	dandelion := nameToStateID("minecraft:dandelion", nil)
+	if dandelion == StateAir {
+		t.Fatal("dandelion is missing from the block table")
+	}
+	for lx := 0; lx < 16; lx++ {
+		for lz := 0; lz < 16; lz++ {
+			c.SetBlock(lx, floor, lz, StateStone)
+		}
+	}
+	// A flower: non-air, but it neither blocks motion nor holds fluid.
+	c.SetBlock(1, floor+1, 1, dandelion)
+	// A canopy: leaves block motion, so MOTION_BLOCKING counts them and
+	// MOTION_BLOCKING_NO_LEAVES does not.
+	c.SetBlock(2, floor+3, 2, StateOakLeaf)
+	// Water blocks neither entities nor light but does hold fluid, so it
+	// counts for both motion maps.
+	c.SetBlock(3, floor+1, 3, StateWater)
+
+	surface, motion, noLeaves := c.heightmaps()
+	at := func(h [256]uint16, lx, lz int) int { return int(h[lz*16+lx]) + MinY }
+
+	cases := []struct {
+		name                            string
+		lx, lz                          int
+		wantSurface, wantMotion, wantNo int
+	}{
+		{"plain stone: all three agree", 0, 0, floor + 1, floor + 1, floor + 1},
+		{"flower: only the surface map sees it", 1, 1, floor + 2, floor + 1, floor + 1},
+		{"leaves: no-leaves map falls through to the stone", 2, 2, floor + 4, floor + 4, floor + 1},
+		{"water: counts as fluid for both motion maps", 3, 3, floor + 2, floor + 2, floor + 2},
+	}
+	for _, c := range cases {
+		gotS := at(surface, c.lx, c.lz)
+		gotM := at(motion, c.lx, c.lz)
+		gotN := at(noLeaves, c.lx, c.lz)
+		if gotS != c.wantSurface || gotM != c.wantMotion || gotN != c.wantNo {
+			t.Errorf("%s: surface=%d motion=%d noLeaves=%d, want %d/%d/%d",
+				c.name, gotS, gotM, gotN, c.wantSurface, c.wantMotion, c.wantNo)
+		}
+	}
+
+	// A column with no matching block at all stores zero, not the world floor.
+	// A chunk of pure air is the clearest case, and it also exercises the
+	// nil-section fast path.
+	emptySurface, emptyMotion, emptyNoLeaves := NewChunk(0, 0, BiomePlains).heightmaps()
+	for i := range emptySurface {
+		if emptySurface[i] != 0 || emptyMotion[i] != 0 || emptyNoLeaves[i] != 0 {
+			t.Fatalf("empty chunk column %d reported %d/%d/%d, want all zero",
+				i, emptySurface[i], emptyMotion[i], emptyNoLeaves[i])
+		}
+	}
+}
+
+// TestBlockStatePredicates spot-checks the flags the dump carries against
+// blocks whose behaviour is not in doubt. A silently wrong dump would make the
+// heightmaps wrong everywhere at once.
+func TestBlockStatePredicates(t *testing.T) {
+	cases := []struct {
+		name                       string
+		state                      uint16
+		motion, noLeaves, isLeaves bool
+	}{
+		{"stone", StateStone, true, true, false},
+		{"grass block", StateGrass, true, true, false},
+		{"oak log", StateOakLog, true, true, false},
+		{"oak leaves", StateOakLeaf, true, false, true},
+		{"water", StateWater, true, true, false},
+		{"lava", StateLava, true, true, false},
+		{"air", StateAir, false, false, false},
+	}
+	for _, c := range cases {
+		if got := blocksMotionOrFluid(c.state); got != c.motion {
+			t.Errorf("%s: blocksMotionOrFluid = %v, want %v", c.name, got, c.motion)
+		}
+		if got := blocksMotionNoLeaves(c.state); got != c.noLeaves {
+			t.Errorf("%s: blocksMotionNoLeaves = %v, want %v", c.name, got, c.noLeaves)
+		}
+		if got := stateFlags(c.state)&flagLeaves != 0; got != c.isLeaves {
+			t.Errorf("%s: leaves flag = %v, want %v", c.name, got, c.isLeaves)
+		}
+	}
+	// A flower is the case that separates WORLD_SURFACE from MOTION_BLOCKING.
+	dandelion := nameToStateID("minecraft:dandelion", nil)
+	if dandelion == StateAir {
+		t.Fatal("dandelion is missing from the block table")
+	}
+	if blocksMotionOrFluid(dandelion) {
+		t.Error("dandelion blocks motion; it should not")
+	}
+}
diff --git a/internal/world/light_properties.bin b/internal/world/light_properties.bin
deleted file mode 100644
index b121079f24e30e6ecc66c25b7990f144248dd6d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 204677
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
Xu8#iG&G=26LzlYe{X<uCXEptQVNr-2

diff --git a/internal/world/store.go b/internal/world/store.go
index c5de4d4..68a771a 100644
--- a/internal/world/store.go
+++ b/internal/world/store.go
@@ -32,7 +32,7 @@ const dataVersion26 = 4790
 // first time it ran: chunkAt prefers the store over the generator, so the
 // already-explored area around spawn keeps its old terrain and every later fix
 // looks like it did nothing in exactly the place you are standing.
-const generatorVersion = 6
+const generatorVersion = 7
 
 // generatorVersionTag is the NBT key holding generatorVersion. It is namespaced
 // because it is ours, not part of the vanilla chunk format.
diff --git a/tools/VanillaLightDump.java b/tools/VanillaBlockStateDump.java
similarity index 65%
rename from tools/VanillaLightDump.java
rename to tools/VanillaBlockStateDump.java
index 91f4b6e..a2a7705 100644
--- a/tools/VanillaLightDump.java
+++ b/tools/VanillaBlockStateDump.java
@@ -10,14 +10,26 @@ import net.minecraft.SharedConstants;
 import net.minecraft.core.Direction;
 import net.minecraft.server.Bootstrap;
 import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.LeavesBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.shapes.VoxelShape;
 
-// Dumps protocol-775 lighting properties directly from vanilla runtime state.
-// Compile/run against the unpacked 26.1.2 server classpath and redirect stdout
-// to internal/world/light_properties.bin.
-public final class VanillaLightDump {
+// Dumps the per-block-state properties the chunk pipeline needs, straight from
+// vanilla runtime state. generated/reports/blocks.json carries none of them:
+// they only exist once the block-state registry is built.
+//
+// Compile and run against the unpacked 26.1.2 server classpath and redirect
+// stdout to internal/world/block_properties.bin:
+//
+//   CP="versions/26.1.2/server-26.1.2.jar;$(find libraries -name '*.jar' | tr '\n' ';')"
+//   javac -nowarn -cp "$CP" -d <out> tools/VanillaBlockStateDump.java
+//   java -cp "<out>;$CP" VanillaBlockStateDump > internal/world/block_properties.bin
+//
+// Was VanillaLightDump: it dumped only lighting until the heightmaps needed
+// blocksMotion and the leaves test, neither of which is derivable from any
+// report or tag file.
+public final class VanillaBlockStateDump {
     private record MaskKey(byte[] data) {
         @Override public boolean equals(Object other) {
             return other instanceof MaskKey key && Arrays.equals(data, key.data);
@@ -25,6 +37,18 @@ public final class VanillaLightDump {
         @Override public int hashCode() { return Arrays.hashCode(data); }
     }
 
+    // Format version. Bump whenever the byte layout or the meaning of a flag
+    // bit changes; the Go decoder rejects anything it does not know.
+    private static final int FORMAT_VERSION = 2;
+
+    // Flag bits. 1..4 drive lighting, 8..32 drive the heightmaps.
+    private static final int FLAG_PROPAGATES_SKYLIGHT = 1;
+    private static final int FLAG_CAN_OCCLUDE = 2;
+    private static final int FLAG_SHAPE_FOR_OCCLUSION = 4;
+    private static final int FLAG_BLOCKS_MOTION = 8;
+    private static final int FLAG_FLUID = 16;
+    private static final int FLAG_LEAVES = 32;
+
     public static void main(String[] args) throws Exception {
         SharedConstants.tryDetectVersion();
         Bootstrap.bootStrap();
@@ -42,9 +66,15 @@ public final class VanillaLightDump {
             dampening[id] = (byte) state.getLightDampening();
             emission[id] = (byte) state.getLightEmission();
             int stateFlags = 0;
-            if (state.propagatesSkylightDown()) stateFlags |= 1;
-            if (state.canOcclude()) stateFlags |= 2;
-            if (state.useShapeForLightOcclusion()) stateFlags |= 4;
+            if (state.propagatesSkylightDown()) stateFlags |= FLAG_PROPAGATES_SKYLIGHT;
+            if (state.canOcclude()) stateFlags |= FLAG_CAN_OCCLUDE;
+            if (state.useShapeForLightOcclusion()) stateFlags |= FLAG_SHAPE_FOR_OCCLUSION;
+            // Heightmap.Types: MOTION_BLOCKING is blocksMotion || fluid, and
+            // MOTION_BLOCKING_NO_LEAVES additionally excludes LeavesBlock --
+            // an instanceof, not the minecraft:leaves tag, so the two differ.
+            if (state.blocksMotion()) stateFlags |= FLAG_BLOCKS_MOTION;
+            if (!state.getFluidState().isEmpty()) stateFlags |= FLAG_FLUID;
+            if (state.getBlock() instanceof LeavesBlock) stateFlags |= FLAG_LEAVES;
             flags[id] = (byte) stateFlags;
 
             byte[] masks = faceMasks(state);
@@ -60,7 +90,7 @@ public final class VanillaLightDump {
 
         DataOutputStream out = new DataOutputStream(new BufferedOutputStream(System.out));
         out.writeInt(0x52494f4c); // RIOL
-        out.writeInt(1);
+        out.writeInt(FORMAT_VERSION);
         out.writeInt(count);
         out.writeInt(shapes.size());
         for (int id = 0; id < count; id++) {