diff --git a/benchmarks/rust-world-movement-2026-10-07/geometry-regression.json b/benchmarks/rust-world-movement-2026-10-07/geometry-regression.json new file mode 100644 index 000000000..b8f01cb16 --- /dev/null +++ b/benchmarks/rust-world-movement-2026-10-07/geometry-regression.json @@ -0,0 +1,112 @@ +{ + "schema": 1, + "minecraft": "26.3", + "manifest_sha1": "4fe1aa1ef8da1cb95c5bad1fb98890ca56dd8ca3", + "platform": "Linux-7.0.0-31-generic-x86_64-with-glibc2.43", + "java": "openjdk 25.0.4.1 2026-08-18", + "rustc": "rustc 1.99.0 (b940084d7 2026-09-28)", + "commands": { + "traverse": 8448, + "trig-table": 1, + "rotation": 16000, + "vec": 7256, + "box": 7006, + "block-box": 100, + "grid": 201, + "query": 52500, + "many": 2500, + "motion": 12000, + "join": 5652, + "make-box": 600, + "optimize": 500, + "join-optimized": 500, + "step-motion": 17680, + "block-iterate": 2400, + "box-iterate": 2400, + "sweep": 9022, + "floor-height": 12000 + }, + "inputs_sha256": "95abe82bf9f328e8b51aafb84a3e97954073f743b963a3d2fa4892cc120f49f1", + "rust_output_sha256": "ebb938b5288e05a291b6e1039f286aa7565821f8de46afb1d853d8112c079dd5", + "sources_sha256": { + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaGeometryOracle.java": "48c233ec1a5684cbd5a9edb5d7972aa4647465045ef298dce14a91de45cc4809", + "tools/test_geometry_parity.py": "38ce169dc520535c217a01705510b71ef3ee81128376640e849f47bc999ef64d", + "tools/test_rust_parity.py": "29d3db08005873528894b45ca10dcd6278753650473b3eb574e53e06ede40ec6", + "Cargo.toml": "3f93319c1eb70dbd7ba25cd74ef343fbf35c52c7c4752f955605c58699cbff9d", + "Cargo.lock": "cb1e87d449114a63edd904c0559d631e8fa9feeb27efd6539aacdcfeae178876", + "crates/horizon-core/Cargo.toml": "e21b502c949da93cf67826592459b687a8cbf737ef92fee514e3ed2cc7cd27ad", + "crates/horizon-core/src/bin/density_parity.rs": "e5b1dd33b7d01306c73cf072629b4fb186e9ab87b672a00108999d1a72263fd0", + "crates/horizon-core/src/bin/float_log_parity.rs": "4a655fcf8822ee7668c4bd126bc84d0b118864a6fc7f5a6aeee667d8bf2590b1", + "crates/horizon-core/src/bin/geometry_parity.rs": "27f6c09fe5018ac3de8e70e0f0bbf78f9abb14f5e4783bcaf46e8ca87b9c6f8a", + "crates/horizon-core/src/bin/noise_parity.rs": "c135bfc708d853e7061e81487d2cfe10de64b2f65677d3b4837cbfe0b8341010", + "crates/horizon-core/src/bin/parity.rs": "f35d928c66f958de39fac5e7e836a657eed95f83599e84899f7ea7a5802ba481", + "crates/horizon-core/src/bin/tick_parity.rs": "a54c164fe4814034d369947a887f5273966f5a878ba849204b80d1c729526a8f", + "crates/horizon-core/src/biome/seed_hash.rs": "5afbb4921c750826b395a08bf06f382fc7f01b5759a93de02a2749c523e2a317", + "crates/horizon-core/src/biome.rs": "908efa8cd4aa0a7adf1cb5e1a222e3dfb640eed5e9172e0fe7f0d1287afae7e8", + "crates/horizon-core/src/carving/ellipsoid.rs": "09232a7588610e8a9176fd9c62d40afb1fb89f2ecab6d555536a1d847b142d86", + "crates/horizon-core/src/carving.rs": "0aa3093caa0437868a8c0ed52a6c6e1993bd51c03583c670a2837e749eae5426", + "crates/horizon-core/src/density/arithmetic.rs": "372faec96c923e2cf4aa6c66c1ac398e676853274557823850dbc8933dd15ab1", + "crates/horizon-core/src/density/beardifier.rs": "bb1052e27dae4a01954ca78d7d5babafef85f3b2c704ccaf1920cb85a098cb50", + "crates/horizon-core/src/density/cache.rs": "38d0b6c9dd04ffef979fdad3f29cfebf98d331c8c9d430be5f39aa34f6c30975", + "crates/horizon-core/src/density/end_islands.rs": "168b9384237bd2e41d0ae5a74e944da4dc74e493bdec31fb73184c9a49e3de55", + "crates/horizon-core/src/density/graph/compiler.rs": "ac67deeb16f16d0859aa20e5a165811a29aca0b910037ee6bf5098211f3a6ede", + "crates/horizon-core/src/density/graph/mod.rs": "b776e7da934cb03051a3053d56d461c71e9978e084922fe4194147aa580c07bf", + "crates/horizon-core/src/density/graph/seeded.rs": "6bcdcaa3dffcfa9df673bbbea35120057a16ba3d2b506c52709c36cf8976b74a", + "crates/horizon-core/src/density/graph/tests.rs": "6bfb8cbff462587dd147b0775ea01d370abbd97544b9bd596c792df1b5f7e634", + "crates/horizon-core/src/density/interpolation.rs": "8c890f52b6467f38a94c654986a6a484b8e0b296ab98c398e60a6ce465b5b010", + "crates/horizon-core/src/density/interval.rs": "b42629163baa6b599a233afe8596d1c370cd81d015cc6fc36a9663aa47b98424", + "crates/horizon-core/src/density/mod.rs": "ca0d77d3282e3746ddcbc92bee97dbf640b9a56214e6ac1537f51f9a5b63d6e7", + "crates/horizon-core/src/density/power.rs": "d5b7270a128d4264268cd772109ad16d71a8ec3ff2d3b63b84cb985296d54a91", + "crates/horizon-core/src/density/rounding.rs": "71840c5206ff8d218ac29bf6f66915d5212764ba270c675711a866ba5b55a7a6", + "crates/horizon-core/src/density/selection.rs": "0dd26af2e85004ec5e053039ad11c384c17c56ace9ab45eb3f5cb3503c0b0330", + "crates/horizon-core/src/density/slice.rs": "5d77605573c0deda47778f1f78f7fa3fbf1944d8f5efbcc65cf589181cadf80b", + "crates/horizon-core/src/density/spline.rs": "6bb2e40f940fc6544d6fb09cb0b8cac722be03bc663dbdfb0f61faae207400bc", + "crates/horizon-core/src/density/surface.rs": "159e0e69cda74f870e80ea64fe523c4397e64af4ccb861bb9fd07b2c3cb91b00", + "crates/horizon-core/src/density/terrain_noise.rs": "8d0059d25eb5d248cb97a4c5a2e670d61528928ea151495c004f25adb723fe3e", + "crates/horizon-core/src/density/tests.rs": "7817796ee40d0ae241bfbebec6bca190e0a8e7d5a1caa8ddf858c3eaa58b8858", + "crates/horizon-core/src/density/world_fields.rs": "c1ce305cb8046b384d90c564cafb24af7365d580389637910f3d8b0cc18eb583", + "crates/horizon-core/src/geometry/mod.rs": "b00bfa09225e5de0a9199a405fe0a4bec5017da833432e5915dbf1941b8fb098", + "crates/horizon-core/src/geometry/movement.rs": "bcfb452752940ce53ae6dc267a3c4eb29459046a063c1f884684ab4f4bd0068f", + "crates/horizon-core/src/geometry/shape/create.rs": "189812b91d5e0e3ad963afcd1a6e2831b31b8188df91a904ef27061e644806ad", + "crates/horizon-core/src/geometry/shape/face.rs": "f243bce81384040a95ce7984b02b5699206c596c537b2713097e86005b4d3a5c", + "crates/horizon-core/src/geometry/shape/join.rs": "f1b51887b7bf9482557e3ffa99e136f2e5db07ceeb05fdb116adf45e87129075", + "crates/horizon-core/src/geometry/shape.rs": "e8d88a763de1525f77a30b99591641e8a8b80946263acbde035a9bcc356df960", + "crates/horizon-core/src/geometry/sweep.rs": "abd6009c61555161ef2f18b431b2aa384b126c0871cae8b96a62358498a56a1d", + "crates/horizon-core/src/geometry/traversal.rs": "77a3da570a0b85582b669cf4d841cba4b06327006dda26d4a26df4e8ce05bae4", + "crates/horizon-core/src/geometry/trig.rs": "05cef9341a298a474221a0556a11ddf47650393ea7a97b4b2022a4da6628fe37", + "crates/horizon-core/src/lib.rs": "4255e16837fde42a52ba118f60581d197c571bb530b60d635e506184ebf4db0b", + "crates/horizon-core/src/noise/mod.rs": "1dab5a713abf702402e69ace1bf9e476bba544b0ede5a61c3c3afc60af0a03f3", + "crates/horizon-core/src/noise/normal.rs": "e9e7a46472a54a02c98c46da819842090567153b32fe0c84249009ef19af7aad", + "crates/horizon-core/src/noise/perlin.rs": "e73815447432eab7542f67366cb3f1b368d164e33f6c9cdbd045ac8e4db0932a", + "crates/horizon-core/src/noise/simplex.rs": "6c0dbc15b2b7510195dd28fceca01dcaac1847ccc4a84d299c351589c642fe7a", + "crates/horizon-core/src/noise/stack.rs": "7f6ef0e7d920139ef1a6ad3ec5640f92765715f86dcc5ec29f1a149984f45fa3", + "crates/horizon-core/src/noise/volume.rs": "3f05d2b1780acfdfee60037677d309937a5033b45ef428fc2d540942d4b56b43", + "crates/horizon-core/src/position/iter.rs": "32d2d8e74821cc4e49e3354202d35d3120e4415bfdda9375a73f2137ef651129", + "crates/horizon-core/src/position.rs": "e10101088e6902386b9b6d27773d44312f1ff72bebb19e57967a54945dde9dcd", + "crates/horizon-core/src/random/hash.rs": "0f88a127a1ba2705d3d6c0ebd009324d6ba86ffa2d27edf2d2a84765e690e4a3", + "crates/horizon-core/src/random/positional.rs": "35494745e5d4cf89e282c3ae0ee245e9f2640ddbbc03bc0055df742006a9c862", + "crates/horizon-core/src/random/worldgen.rs": "9f07ff33bcc038d34e27aa5465753bb21df18f2975e43cae201f709bc186945a", + "crates/horizon-core/src/random.rs": "ddb95d3a83e28ad605ff1f49f5df270cc543ca5ef1130e37d989dc74c8d861e6", + "crates/horizon-core/src/storage.rs": "f6c32201c64aefde06e57a2c767be46918df613548a322801546b133799cc33d", + "crates/horizon-core/src/text.rs": "e6553ddb5db5039e8dc4614b6a6dc9f35a26dc3d1673b68a04e72e7983b67abb", + "crates/horizon-core/src/ticks/generation.rs": "be1237e790693f633a61714ddae68c6506a777588a8a3ab5efbe53a35774dbd2", + "crates/horizon-core/src/ticks/heap.rs": "bf28afab8af77c3d243aa96cd8a1fb8d934140a4dbd07dbfdbf4e7908bb4b845", + "crates/horizon-core/src/ticks/index.rs": "1f1a6a568c2a30eafecb020ca4d5f5fc414860de85b8b381fc419a2e3e65c24a", + "crates/horizon-core/src/ticks/mod.rs": "01634630668172516b8b79d0907bad47f6e2c543a6d499c2fa4b201823b375cb" + }, + "references": [ + { + "side": "client", + "jar_sha256": "4508d006323f24fa02876310c192d739af56516eb259000ac50f0909a68c9a2d", + "output_sha256": "ebb938b5288e05a291b6e1039f286aa7565821f8de46afb1d853d8112c079dd5", + "matched_output_lines": 1320187 + }, + { + "side": "server", + "jar_sha256": "a362163eec5d1612d520772bc16e5b39c09e3b234fdc045f56bf544284ee8ae6", + "output_sha256": "ebb938b5288e05a291b6e1039f286aa7565821f8de46afb1d853d8112c079dd5", + "matched_output_lines": 1320187 + } + ], + "scope": "Selected Vec3/AABB operations, sine table entries, quantized trig, rotations and look directions; finite block-ray traversal; bounded inclusive/directional block iteration and finite swept-block visits with step indices; immutable cube/array voxel-grid bounds, column minima/maxima, greedy boxes, collide, ray hits, closest points and cell lookup; lazy floor-height selection; box quantization, optimized/unoptimized Boolean joins, alias identity and joinIsNotEmpty; Entity.collideWithShapes, candidate step heights and Entity.collide step-up decisions/query bounds with caller-controlled block/entity/border shape lists. No live entities, actual world shape selection, grounding/velocity side effects, fluids or block behavior." +} diff --git a/benchmarks/rust-world-movement-2026-10-07/scoped-parity.json b/benchmarks/rust-world-movement-2026-10-07/scoped-parity.json new file mode 100644 index 000000000..8d24c8618 --- /dev/null +++ b/benchmarks/rust-world-movement-2026-10-07/scoped-parity.json @@ -0,0 +1,228 @@ +{ + "schema": 1, + "minecraft": "26.3", + "manifest_sha1": "4fe1aa1ef8da1cb95c5bad1fb98890ca56dd8ca3", + "platform": "Linux-7.0.0-31-generic-x86_64-with-glibc2.43", + "java": "openjdk 25.0.4.1 2026-08-18", + "rustc": "rustc 1.99.0 (b940084d7 2026-09-28)", + "registry_states": 35723, + "block_definitions": 1286, + "definition_counts": { + "tagged_full": 1221, + "never": 42, + "closed_shulker": 17, + "always": 4, + "not_extended": 2 + }, + "native_chunk_storage": "ProtoChunk", + "rust_chunk_storage": "TerrainChunk", + "fixtures": 45163, + "sources_sha256": { + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java": "48ea6354fe17eeb1ccead6bd644dbb2a1823397b86173a025f2699b2bf8acb21", + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaHeightmapOracle.java": "145c943637ed177cc4ef8a85f2484da8afd164868e84a8463882feec1653a860", + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaCollisionOracle.java": "f2b4f440a5bbce4224a4b3cee494b0f7ddcafbf72db12592c94ef9fb94fbc8a6", + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaBlockStateCodecOracle.java": "5c217a8cb72094020082bd4846ed675a6399b9fa371be95a221bd92d227b2e09", + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaSuffocationOracle.java": "8dd870e65807bac4234085958830321061f0a3805dcf2b1219514107ba710503", + "mods/horizon/src/test/java/dev/horizonlab/parity/VanillaFaceSupportOracle.java": "9ce939a435842867786fed648951bbe77f6ab843f6df09af15f3deb1948c4877", + "tools/test_world_movement_parity.py": "c70470c10421ba93688aac821cdd45ac97f106162fd4b8a4e5823ab6eedb98bd", + "tools/test_rust_parity.py": "29d3db08005873528894b45ca10dcd6278753650473b3eb574e53e06ede40ec6", + "tools/test_worldgen_parity.py": "b40972ab2ad222aa6d77537cc36b434a217baa1f1b56bbaad945d6e12fe776af", + "tools/lab.py": "d00bf107fa01b6c579734a082c3ca4ade3018f0d6851d46844acf17574f66e64", + "Cargo.toml": "3f93319c1eb70dbd7ba25cd74ef343fbf35c52c7c4752f955605c58699cbff9d", + "Cargo.lock": "cb1e87d449114a63edd904c0559d631e8fa9feeb27efd6539aacdcfeae178876", + "crates/horizon-world/examples/registry_collision_scan_fixture.rs": "3bf73ec0bfd8d2a364882aa64080c4635314b094dcae571d6e824033abaaf6bd", + "crates/horizon-core/Cargo.toml": "e21b502c949da93cf67826592459b687a8cbf737ef92fee514e3ed2cc7cd27ad", + "crates/horizon-core/src/bin/density_parity.rs": "e5b1dd33b7d01306c73cf072629b4fb186e9ab87b672a00108999d1a72263fd0", + "crates/horizon-core/src/bin/float_log_parity.rs": "4a655fcf8822ee7668c4bd126bc84d0b118864a6fc7f5a6aeee667d8bf2590b1", + "crates/horizon-core/src/bin/geometry_parity.rs": "27f6c09fe5018ac3de8e70e0f0bbf78f9abb14f5e4783bcaf46e8ca87b9c6f8a", + "crates/horizon-core/src/bin/noise_parity.rs": "c135bfc708d853e7061e81487d2cfe10de64b2f65677d3b4837cbfe0b8341010", + "crates/horizon-core/src/bin/parity.rs": "f35d928c66f958de39fac5e7e836a657eed95f83599e84899f7ea7a5802ba481", + "crates/horizon-core/src/bin/tick_parity.rs": "a54c164fe4814034d369947a887f5273966f5a878ba849204b80d1c729526a8f", + "crates/horizon-core/src/biome/seed_hash.rs": "5afbb4921c750826b395a08bf06f382fc7f01b5759a93de02a2749c523e2a317", + "crates/horizon-core/src/biome.rs": "908efa8cd4aa0a7adf1cb5e1a222e3dfb640eed5e9172e0fe7f0d1287afae7e8", + "crates/horizon-core/src/carving/ellipsoid.rs": "09232a7588610e8a9176fd9c62d40afb1fb89f2ecab6d555536a1d847b142d86", + "crates/horizon-core/src/carving.rs": "0aa3093caa0437868a8c0ed52a6c6e1993bd51c03583c670a2837e749eae5426", + "crates/horizon-core/src/density/arithmetic.rs": "372faec96c923e2cf4aa6c66c1ac398e676853274557823850dbc8933dd15ab1", + "crates/horizon-core/src/density/beardifier.rs": "bb1052e27dae4a01954ca78d7d5babafef85f3b2c704ccaf1920cb85a098cb50", + "crates/horizon-core/src/density/cache.rs": "38d0b6c9dd04ffef979fdad3f29cfebf98d331c8c9d430be5f39aa34f6c30975", + "crates/horizon-core/src/density/end_islands.rs": "168b9384237bd2e41d0ae5a74e944da4dc74e493bdec31fb73184c9a49e3de55", + "crates/horizon-core/src/density/graph/compiler.rs": "ac67deeb16f16d0859aa20e5a165811a29aca0b910037ee6bf5098211f3a6ede", + "crates/horizon-core/src/density/graph/mod.rs": "b776e7da934cb03051a3053d56d461c71e9978e084922fe4194147aa580c07bf", + "crates/horizon-core/src/density/graph/seeded.rs": "6bcdcaa3dffcfa9df673bbbea35120057a16ba3d2b506c52709c36cf8976b74a", + "crates/horizon-core/src/density/graph/tests.rs": "6bfb8cbff462587dd147b0775ea01d370abbd97544b9bd596c792df1b5f7e634", + "crates/horizon-core/src/density/interpolation.rs": "8c890f52b6467f38a94c654986a6a484b8e0b296ab98c398e60a6ce465b5b010", + "crates/horizon-core/src/density/interval.rs": "b42629163baa6b599a233afe8596d1c370cd81d015cc6fc36a9663aa47b98424", + "crates/horizon-core/src/density/mod.rs": "ca0d77d3282e3746ddcbc92bee97dbf640b9a56214e6ac1537f51f9a5b63d6e7", + "crates/horizon-core/src/density/power.rs": "d5b7270a128d4264268cd772109ad16d71a8ec3ff2d3b63b84cb985296d54a91", + "crates/horizon-core/src/density/rounding.rs": "71840c5206ff8d218ac29bf6f66915d5212764ba270c675711a866ba5b55a7a6", + "crates/horizon-core/src/density/selection.rs": "0dd26af2e85004ec5e053039ad11c384c17c56ace9ab45eb3f5cb3503c0b0330", + "crates/horizon-core/src/density/slice.rs": "5d77605573c0deda47778f1f78f7fa3fbf1944d8f5efbcc65cf589181cadf80b", + "crates/horizon-core/src/density/spline.rs": "6bb2e40f940fc6544d6fb09cb0b8cac722be03bc663dbdfb0f61faae207400bc", + "crates/horizon-core/src/density/surface.rs": "159e0e69cda74f870e80ea64fe523c4397e64af4ccb861bb9fd07b2c3cb91b00", + "crates/horizon-core/src/density/terrain_noise.rs": "8d0059d25eb5d248cb97a4c5a2e670d61528928ea151495c004f25adb723fe3e", + "crates/horizon-core/src/density/tests.rs": "7817796ee40d0ae241bfbebec6bca190e0a8e7d5a1caa8ddf858c3eaa58b8858", + "crates/horizon-core/src/density/world_fields.rs": "c1ce305cb8046b384d90c564cafb24af7365d580389637910f3d8b0cc18eb583", + "crates/horizon-core/src/geometry/mod.rs": "b00bfa09225e5de0a9199a405fe0a4bec5017da833432e5915dbf1941b8fb098", + "crates/horizon-core/src/geometry/movement.rs": "bcfb452752940ce53ae6dc267a3c4eb29459046a063c1f884684ab4f4bd0068f", + "crates/horizon-core/src/geometry/shape/create.rs": "189812b91d5e0e3ad963afcd1a6e2831b31b8188df91a904ef27061e644806ad", + "crates/horizon-core/src/geometry/shape/face.rs": "f243bce81384040a95ce7984b02b5699206c596c537b2713097e86005b4d3a5c", + "crates/horizon-core/src/geometry/shape/join.rs": "f1b51887b7bf9482557e3ffa99e136f2e5db07ceeb05fdb116adf45e87129075", + "crates/horizon-core/src/geometry/shape.rs": "e8d88a763de1525f77a30b99591641e8a8b80946263acbde035a9bcc356df960", + "crates/horizon-core/src/geometry/sweep.rs": "abd6009c61555161ef2f18b431b2aa384b126c0871cae8b96a62358498a56a1d", + "crates/horizon-core/src/geometry/traversal.rs": "77a3da570a0b85582b669cf4d841cba4b06327006dda26d4a26df4e8ce05bae4", + "crates/horizon-core/src/geometry/trig.rs": "05cef9341a298a474221a0556a11ddf47650393ea7a97b4b2022a4da6628fe37", + "crates/horizon-core/src/lib.rs": "4255e16837fde42a52ba118f60581d197c571bb530b60d635e506184ebf4db0b", + "crates/horizon-core/src/noise/mod.rs": "1dab5a713abf702402e69ace1bf9e476bba544b0ede5a61c3c3afc60af0a03f3", + "crates/horizon-core/src/noise/normal.rs": "e9e7a46472a54a02c98c46da819842090567153b32fe0c84249009ef19af7aad", + "crates/horizon-core/src/noise/perlin.rs": "e73815447432eab7542f67366cb3f1b368d164e33f6c9cdbd045ac8e4db0932a", + "crates/horizon-core/src/noise/simplex.rs": "6c0dbc15b2b7510195dd28fceca01dcaac1847ccc4a84d299c351589c642fe7a", + "crates/horizon-core/src/noise/stack.rs": "7f6ef0e7d920139ef1a6ad3ec5640f92765715f86dcc5ec29f1a149984f45fa3", + "crates/horizon-core/src/noise/volume.rs": "3f05d2b1780acfdfee60037677d309937a5033b45ef428fc2d540942d4b56b43", + "crates/horizon-core/src/position/iter.rs": "32d2d8e74821cc4e49e3354202d35d3120e4415bfdda9375a73f2137ef651129", + "crates/horizon-core/src/position.rs": "e10101088e6902386b9b6d27773d44312f1ff72bebb19e57967a54945dde9dcd", + "crates/horizon-core/src/random/hash.rs": "0f88a127a1ba2705d3d6c0ebd009324d6ba86ffa2d27edf2d2a84765e690e4a3", + "crates/horizon-core/src/random/positional.rs": "35494745e5d4cf89e282c3ae0ee245e9f2640ddbbc03bc0055df742006a9c862", + "crates/horizon-core/src/random/worldgen.rs": "9f07ff33bcc038d34e27aa5465753bb21df18f2975e43cae201f709bc186945a", + "crates/horizon-core/src/random.rs": "ddb95d3a83e28ad605ff1f49f5df270cc543ca5ef1130e37d989dc74c8d861e6", + "crates/horizon-core/src/storage.rs": "f6c32201c64aefde06e57a2c767be46918df613548a322801546b133799cc33d", + "crates/horizon-core/src/text.rs": "e6553ddb5db5039e8dc4614b6a6dc9f35a26dc3d1673b68a04e72e7983b67abb", + "crates/horizon-core/src/ticks/generation.rs": "be1237e790693f633a61714ddae68c6506a777588a8a3ab5efbe53a35774dbd2", + "crates/horizon-core/src/ticks/heap.rs": "bf28afab8af77c3d243aa96cd8a1fb8d934140a4dbd07dbfdbf4e7908bb4b845", + "crates/horizon-core/src/ticks/index.rs": "1f1a6a568c2a30eafecb020ca4d5f5fc414860de85b8b381fc419a2e3e65c24a", + "crates/horizon-core/src/ticks/mod.rs": "01634630668172516b8b79d0907bad47f6e2c543a6d499c2fa4b201823b375cb", + "crates/horizon-world/Cargo.toml": "977338bf3e654193685b015d383493b9f59ff6f5d6210bec212cef8ac4a50bed", + "crates/horizon-world/src/bin/worldgen_parity.rs": "3143ceb9b56eecfd7667e5feb5f9f0cd13cfb8754b38d4ea338dbba97f2819da", + "crates/horizon-world/src/block_collision.rs": "39207247f2f6dd3ddc77640229044246f91b32054563f88a435f1bd92ad2092c", + "crates/horizon-world/src/block_collision_scan.rs": "20802862364c110ff85eeaf48606596a8468b83768dda46b412d337958790b41", + "crates/horizon-world/src/block_entities.rs": "a9deae92e6e5a1fcf4f0476c33ea4d170ddad6fd4b3303e1bb66d933973d5e06", + "crates/horizon-world/src/block_placement.rs": "524f4892d50bab77b7d89d19f7b048ffe746996f2ed7f376db2c6ab00ed75c24", + "crates/horizon-world/src/block_properties.rs": "b0bd8a983336c48e488a20caa77dd5c39b1a74bbd14ebc03b3b64556a1c864fc", + "crates/horizon-world/src/block_render.rs": "8df52ee11aef406a1571198a64048062a0ef6864e0058d9293a57f64b73c916a", + "crates/horizon-world/src/block_support.rs": "ade4fbd47284b450dabdd682dc86138b2ac05a0fd379525d7110648908245476", + "crates/horizon-world/src/block_survival.rs": "28ce64375e09819a4f13da9cfbe37c08b5ad0daf01b289c1c360b4567e50e811", + "crates/horizon-world/src/chunk.rs": "8843e6f48dbbc4245ce4e95564dfba3a4d7a051ba0b1577fb038c07adb0ff0f9", + "crates/horizon-world/src/chunk_status.rs": "dbb8583cfa775203c544d24d69e03720385428f15a267a561356c21f5025e9c7", + "crates/horizon-world/src/collision.rs": "a749794d5c27ccd6c0d964ad02f9dc31d49d9f4fe4b7366cd4bd8155e681b00b", + "crates/horizon-world/src/collision_context.rs": "2176c7034e07f547510a8327cdad9d3b63f26e4754032b76b7d5fe13166c333c", + "crates/horizon-world/src/compression.rs": "4db73e6ca9a0d552d415ce60e7e88b89c9cf2b7d060a669ff8328f518316e101", + "crates/horizon-world/src/dynamic_support.rs": "5996bc1c436fb6215d8fc3d0bb4de5dd9b966d842d432580d624195771697fb8", + "crates/horizon-world/src/entity_obstruction.rs": "a4b28a19bf83b23611c59d94535c488db37e4aee24b22c973c545910894a809f", + "crates/horizon-world/src/fluid.rs": "a0a1f34ba94d8b59dc975becee8952960764d67ae08cf2d6a8bcd40a614b15c4", + "crates/horizon-world/src/heightmap.rs": "a5edef082b5af40d814421ea17e129b3b06d70abee6434ed263e4bba58571698", + "crates/horizon-world/src/lib.rs": "befe4f7a8bf5399ccc2bbbfd2c8d6c016ecce28d53a699c42d021b83c80b7bb9", + "crates/horizon-world/src/liquid_collision.rs": "0f0a83b04e5a5bc9d98ed05fde4d6584ba69642e93522e726e4cfc325d6fcb1d", + "crates/horizon-world/src/main.rs": "fce57418b8c22a6a0a9044baa89ed3d9c243bc2e8413fea3ff0f32985daba021", + "crates/horizon-world/src/nbt.rs": "60262c3de8c8f68bc2da0370ccb17393d32b85f5f5022c6358599a7d32119ea6", + "crates/horizon-world/src/piston_shape.rs": "399c2337103b8e7e0eb5667227c5aa14f9549d6a467b7be7da3d0717f0263500", + "crates/horizon-world/src/powder_snow_collision.rs": "7289946a21478d11abfd2bdcdddff3d7f98e25bf6a68564fed45c3cc01ac2a36", + "crates/horizon-world/src/region.rs": "72b642e87fed37ed17f54d4c30f96c3b64d26c14bc0589c31ef40ff1616188fc", + "crates/horizon-world/src/registry/json.rs": "7a683afcd1742c5307756927d7f0aa779c7d7992af87d8d371dd98108728e235", + "crates/horizon-world/src/registry.rs": "f2e58b2b4d944ac8fc6226bd3352cefc3d2052d8473e02ccf7dc402b176df435", + "crates/horizon-world/src/registry_collision_scan.rs": "a5021a168adcedc37d77f533a8921c02f09c59f46a01737586aaa33c5908b8d0", + "crates/horizon-world/src/retrogen.rs": "6efd36a6293756688c1990a7965bd65609d7c5e2bf2a5f4f01d54932d2b9386b", + "crates/horizon-world/src/suffocation.rs": "bed219dd5bbab6263b98fbe3d0eb512cb96c52ae847210efe49514d05f22f11e", + "crates/horizon-world/src/tick_data.rs": "f8d04a69ea263f4168bce33f92e5b4ee2fe07d7caf50a1621c6b3ef6eb2479f3", + "crates/horizon-world/src/world_movement.rs": "8ac9e90fe899855036658afd862ff20c4dcd15d1bd3f92a763c4795fecf0549f", + "crates/horizon-world/src/worldgen/anchor.rs": "d156b8a0b147a274cdd143409b441f4f43edecde6e8ee14ef9cf0309f743143a", + "crates/horizon-world/src/worldgen/aquifer/config.rs": "fcd2cc3a520c1527c88f095a3b5d38487e7ebb1ccecc5f757f93d04a069add4f", + "crates/horizon-world/src/worldgen/aquifer/noise_based.rs": "74daaa389b5c3dfdc99214dfff256a9e172f83548d2326cbc941d9637cc53fb7", + "crates/horizon-world/src/worldgen/aquifer.rs": "cb4b66d87de3f9f79ae6ffe4badd6f0f44886cd42ad9de2771b8b56c4f1e28c7", + "crates/horizon-world/src/worldgen/bamboo.rs": "d9b47113c99be34256e58308bc6f40072ff25c579d6bf995182aa862c0006102", + "crates/horizon-world/src/worldgen/biome.rs": "3fe316b875aa32683759c337dc71f624910faf0812a2d6d83b8098d6d0bac7a0", + "crates/horizon-world/src/worldgen/biome_chunk.rs": "8fdfe6ebe3ffeca97611fd5991a5bc6b2783ea1c62f4d8ef3b2dd53c04a5dc1d", + "crates/horizon-world/src/worldgen/biome_predicate.rs": "bfc581bc40077cc74ffda43e990a55fe997adc04c7130f98e039c3305ca79aac", + "crates/horizon-world/src/worldgen/biome_source/codec.rs": "2b9e4f5d679eb444cb73174f511e3b9f32e9eb138248ab12cffc6cfd76adf3a8", + "crates/horizon-world/src/worldgen/biome_source/runtime.rs": "f0b02c1521178e4d0377c6ca62694604b6a773f1f234f070ff0cde4685911d45", + "crates/horizon-world/src/worldgen/biome_source.rs": "e181e1736f3e0b75f7091a24c88de3fd116e01b98424d02382aea7a503d1eb54", + "crates/horizon-world/src/worldgen/biome_temperature.rs": "cde4bbab5e260c4065b113376c423b8511ade93c5aa5fd976e245ee8a58b5ad1", + "crates/horizon-world/src/worldgen/biome_weather.rs": "96b1f9494559ed31d06257b83d604d00cc069ccc8c7b68094117e034b4a71bd7", + "crates/horizon-world/src/worldgen/block_blob.rs": "c608c57b3d77279646ecb89e50677dd8e452b0422ffd357ba755536c5589eb89", + "crates/horizon-world/src/worldgen/block_column.rs": "f72c21a9066ee0aa68c2fb79fba436d05afb14c6ef5a2cb012f1ed35fc17cd22", + "crates/horizon-world/src/worldgen/block_feature.rs": "36b4e46ee7f7f73bcb94d8bce8d99013e4b16234c9a03542eeb3186e88dd1c21", + "crates/horizon-world/src/worldgen/block_pile.rs": "623e369b77e0526ed2756485a6c0bb09683cd28ad8876dea907360ca6665b39d", + "crates/horizon-world/src/worldgen/block_predicate.rs": "074c692367e3f2191a1bb28d87b23402430a843c246bd30a4ea838ee3500280e", + "crates/horizon-world/src/worldgen/blue_ice.rs": "eedd77bdaff808330b864166d303378096daa5c7d235e925770b171c05109247", + "crates/horizon-world/src/worldgen/bonus_chest.rs": "05d0f63fbc7412f13ba1fa37a7238114b8f70bfff318beb2dece590482d49cc0", + "crates/horizon-world/src/worldgen/bulk_section.rs": "eecf61532d7793f853884c5a18a7f436a59835c7b13d3ec9075804511553c9ba", + "crates/horizon-world/src/worldgen/carver/canyon.rs": "509c4d5a9d689849e98e894ab14a9fbf82d10707d38e9cc688ded3c4778df3e2", + "crates/horizon-world/src/worldgen/carver/generation.rs": "a4498d0d1457536de3922a08e9c40ccce8d2ef9cc263801c15a412327513c098", + "crates/horizon-world/src/worldgen/carver.rs": "46b251e28225fe1250de38f49dec5dacda4e2c4ba1e556e21e6d1e14e2651fc3", + "crates/horizon-world/src/worldgen/carving.rs": "4e77d4e5c4a0ca55ca3563b9bdf6f379342e0bdf9d019d60f7bc57ce4afb5fbd", + "crates/horizon-world/src/worldgen/chorus_plant.rs": "29224c164ede919e280a65a68f155c873e2c8fd0aa7d7e244d8fa9e468760250", + "crates/horizon-world/src/worldgen/climate/codec.rs": "d567adeb5d837816fca69102db51d790f71aec1b51c09298230d24612e400a14", + "crates/horizon-world/src/worldgen/climate/index.rs": "c5ce61679a5f0e0f2f0af2a373424effa124d0cce8250609eff38b7034650756", + "crates/horizon-world/src/worldgen/climate.rs": "1b9ad44407f40aee4c1cd5357a5c9c443c1b105728f01cf5c644072f99f8357e", + "crates/horizon-world/src/worldgen/decoration.rs": "75a79b20b21e133816e729f16e758be6165d0db18a64bfbd5fd3618325a2adf3", + "crates/horizon-world/src/worldgen/delta.rs": "c2bf49ddf3231d28c109e68871429bc13d76a7bebe14eb33e84aa856bdd66145", + "crates/horizon-world/src/worldgen/density.rs": "65a98c156a290a6b374ef670d28cd5dfbe0aa93171824d1bbd96422536273f84", + "crates/horizon-world/src/worldgen/disk.rs": "6f8f9e059755af44c9bfa1b91eba54a7d13fad811dce31717c5502d7f6df33d7", + "crates/horizon-world/src/worldgen/end_gateway.rs": "f53fde77d6a36a525cd15d890003b2c129d0689a4cbfa2cf443a0c2e3acae040", + "crates/horizon-world/src/worldgen/end_podium.rs": "8f6d0d6d60ff0fde63de5781e867239db321f82cf12639f0537d410a3731ee1d", + "crates/horizon-world/src/worldgen/feature.rs": "40500af71ee6628dfb27518262d99f08d0383ae6c7b9397452feef0c213eadd9", + "crates/horizon-world/src/worldgen/feature_catalog.rs": "efc7b17b227e71622ef34108be9abd010f5675b68ea0409fcab82581d9aab88a", + "crates/horizon-world/src/worldgen/feature_graph.rs": "da132fca9fdafb0d89a917d5f4b68c60b70fb33cadf948a107da0e35d83dcd91", + "crates/horizon-world/src/worldgen/feature_region.rs": "df0ff142a461cafa9a3b42b949ad3376887f2be8d4ea5cc794a3ed2e977bb499", + "crates/horizon-world/src/worldgen/feature_sort.rs": "3488a093dfe1321aaa29d8a30cfb115d8e666a81bf195514e87b170de626835c", + "crates/horizon-world/src/worldgen/fluid_predicate.rs": "64197c9e63bebf1ce04bc280bfe980bb6c1b9aa887ca5cded904aeb0d9ae6c46", + "crates/horizon-world/src/worldgen/height_provider.rs": "368d4dc119854742a045c4a717679c921456da681fc5f71aa9b37102d6f33b47", + "crates/horizon-world/src/worldgen/material_condition/codec.rs": "09b909bc384472f76d163c8069ec6b507c7d5c6a028a36d5e0e3df20deff7b3b", + "crates/horizon-world/src/worldgen/material_condition/density.rs": "df9d0761e978e5010663ae8b44f2d6c1ecb4907331e333bdb6a2b487c1e107de", + "crates/horizon-world/src/worldgen/material_condition/library.rs": "a55534c5da97575a819af5a7dc0dbec9069993fa8b2619c6c9d5576946e683fa", + "crates/horizon-world/src/worldgen/material_condition/noise.rs": "ffb59cc6be2275d7a5621bf7d768527e74a8326ed7ad78618746711540921675", + "crates/horizon-world/src/worldgen/material_condition/rule.rs": "fed643352efbcb1f68f29b6241896617db889fc7c577a6247564e01922fec1fe", + "crates/horizon-world/src/worldgen/material_condition.rs": "d638dcb8cbcb5da20b3cb29602b0ae6a86c4fdf9d8c0fb725de8ec5fc108717e", + "crates/horizon-world/src/worldgen/material_extensions.rs": "ab806eb679d5116e1aebb64fca70e1499ae71f83c9507a8cb4c3201c2b1bf037", + "crates/horizon-world/src/worldgen/material_stage.rs": "698cbc786eff13c246e2bc2ea062401918cd4265899fbc3d53abc87e45a8e7a1", + "crates/horizon-world/src/worldgen/material_surface.rs": "5d37b90099df3d6da0845dab164e71469fb287019c2ee74bc6714f3b9d6d6d5b", + "crates/horizon-world/src/worldgen/ore_feature.rs": "83b89fd3be691c5412c0215b6abefdcaa44119a05aa41217e061970eb7e12ebd", + "crates/horizon-world/src/worldgen/placement/chain.rs": "9218399b4d3757f7bbc550d7729a7201f32a1c83a7030865e0c12aab8a80d116", + "crates/horizon-world/src/worldgen/placement/context.rs": "a278304795136677ad4b4933ea50c972b9729a1c671c03fa309c193e224b1fd6", + "crates/horizon-world/src/worldgen/placement/layer.rs": "a0f5ca776f33f9d4f72b8fdcd163426152e5e43cb4a7572fc1d4fc57bf965de1", + "crates/horizon-world/src/worldgen/placement.rs": "b0397e5818fae84358546193a95f84bcb0b5bffafce909e6fcb3386179ee8023", + "crates/horizon-world/src/worldgen/replace_blobs.rs": "bf3377d86d2570cd15288ba69dde64a2cf67c5bcbb9a31d0c23421964af74afa", + "crates/horizon-world/src/worldgen/router.rs": "2cee7cf15a0d2ada12be6b39d83e78177fd3033922e4f4cce87a64073cec2847", + "crates/horizon-world/src/worldgen/rule_test.rs": "d1662ec492489ebaa4b87e20f9a8c809dcf3a223a151211bd65ec241a63692fc", + "crates/horizon-world/src/worldgen/settings.rs": "a8fe87752e1982ef11cb67f8d80d8e3428b2c27db178044cb425ba803e689e59", + "crates/horizon-world/src/worldgen/simple_block.rs": "9ba1a88d5db4925f8c37366557887f776c805f9a6444781615b5dbaff52e92a4", + "crates/horizon-world/src/worldgen/snow_freeze.rs": "9040be3d5c7f8f0fd812d2df45e154bf8a9eeef038530b83fa4159d246eac35f", + "crates/horizon-world/src/worldgen/speleothem.rs": "c71651c1c97818a8a85863e14414d6139ea3bdeb897fa422043bcc1499d99aae", + "crates/horizon-world/src/worldgen/spike.rs": "eacf0d9d3d2bc3d4bcf62bc87555f90031138236a5bfef0eb5270204f7c2a4fc", + "crates/horizon-world/src/worldgen/spring.rs": "830849e9b89fcdf09e9b06fbefdcdebe3c8c3f82804f60b8bd5de04ba303cb62", + "crates/horizon-world/src/worldgen/state_provider/catalog.rs": "c8687e15a4887a9200c8d365857d801efaa8f90e669eee3e600a1db4905119eb", + "crates/horizon-world/src/worldgen/state_provider/noise.rs": "7ee369c2a032e5620cb9bdf9ee7adad1f70870fb0a27efb7b7c514d92f83491f", + "crates/horizon-world/src/worldgen/state_provider/properties.rs": "9909139aaca1dc4f743957257fadaa9d423d21fa401fa9abc050505f79365139", + "crates/horizon-world/src/worldgen/state_provider.rs": "be29ada818826a90afe01ab60916360fdfc4cbde5af15c9359cd56b1f1f7b156", + "crates/horizon-world/src/worldgen/tags.rs": "d35ded93fe6e95ea045cadcf4925e656dc34ef832b742179b9ad0cc49f902f31", + "crates/horizon-world/src/worldgen/terrain.rs": "fd1f2e0afc15daf66f484ea40a1f2b7013650bda0941b23c64c81ee9f79cb673", + "crates/horizon-world/src/worldgen/underwater_magma.rs": "7317e40af5ee5a9780f90ce358fa5d3e7f5b3d513b731df6ff97754d9c2a0154", + "crates/horizon-world/src/worldgen/value_provider.rs": "3358b563db8cb0bc8a9cfbbe2b8b3e70941cd2d37a0b519fbb6545f8d0dcbb69", + "crates/horizon-world/src/worldgen/vines.rs": "ee9b79b65012bd86a838241d2ef708680f7fe8eafc8aa656dae9cf2abf3c6418", + "crates/horizon-world/src/worldgen/weighted.rs": "839840aae25302933bbd97a81a2336330e2d03a0ad1684e1e16ac769ed408e6b", + "crates/horizon-world/src/worldgen/write_zone.rs": "8e17a179764d3f68c05882aef35f6810c28a0000f9a83e58bd6030660b76e64e", + "crates/horizon-world/src/worldgen.rs": "e8e9f099ee1fcec8eedce31805d676d3f89c18e84f494a147ffcbfee23d3d54f" + }, + "fixtures_sha256": { + ".local/rust-world-movement-parity/inputs.txt": "bbe9f6e31b141231e9726858c4490335c6c563f845bb25ce43afa5bf2486b3f0", + ".local/rust-world-movement-parity/facts.json": "5e89a805514cabfe46e082d651db406b9479781e1d97b65faa2ab9f6f871309b", + ".local/rust-world-movement-parity/definitions.json": "9cac3c650353104db1648050621057bfe104dec1f44b53d0b7875f7bc20e6eec", + ".local/rust-world-movement-parity/block-registry.nbt": "5042073c80753f9548cb8fdb5b1000f0e5a1220127a0cc3c6a75737e180bf9bb", + ".local/rust-world-movement-parity/cached-collision.nbt": "4a274cd720a1bda585b02f50f16e90246576679e1e173c214548c5cbf607ab2d", + ".local/rust-world-movement-parity/tags.json": "5e1301e5a9abf7e4de93af5dae3a157e852dbdb4ea345c2eb626305a605d4f98" + }, + "rust_output_sha256": "622f8c8bd0dc6ae6f8ce9606c1ecf15b163f75a6ee3241d43564d707f7d61497", + "references": [ + { + "side": "client", + "jar_sha256": "4508d006323f24fa02876310c192d739af56516eb259000ac50f0909a68c9a2d", + "output_sha256": "622f8c8bd0dc6ae6f8ce9606c1ecf15b163f75a6ee3241d43564d707f7d61497", + "matched_output_lines": 7062798 + }, + { + "side": "server", + "jar_sha256": "a362163eec5d1612d520772bc16e5b39c09e3b234fdc045f56bf544284ee8ae6", + "output_sha256": "622f8c8bd0dc6ae6f8ce9606c1ecf15b163f75a6ee3241d43564d707f7d61497", + "matched_output_lines": 7062798 + } + ], + "scope": "Actual native Entity.collide executes initial collision and step-up decisions over BlockCollisions, registered block shapes and resident ProtoChunk sections. Rust combines owned/fallible step resolution with registry-bound TerrainChunk scanning. All registered states are used as obstacles, plus step heights, falling/grounded motion, zero and underflow motion, partial blocks, fluids, dynamic blocks, ceilings, chunk boundaries and query failures. Entity collider lists and world-border proximity/shape are controlled inputs; query order and reuse, shape collection and resulting displacement are compared. Contexts are deliberately supplied empty/position/placement snapshots in both worlds. This does not establish entity broad-phase selection, actual world-border proximity, travel/gravity/velocity or grounded side effects, experimental minecarts or a playable game." +} diff --git a/crates/horizon-core/src/geometry/mod.rs b/crates/horizon-core/src/geometry/mod.rs index b41c36af9..8d65fec93 100644 --- a/crates/horizon-core/src/geometry/mod.rs +++ b/crates/horizon-core/src/geometry/mod.rs @@ -11,7 +11,7 @@ pub mod trig; use crate::position::BlockPos; pub use movement::{ block_floor_height, candidate_step_heights, entity_collision_bounds, resolve_shape_movement, - resolve_step_movement, + resolve_step_movement, try_resolve_step_movement, }; pub use shape::{ShapeError, ShapeOp, VoxelShape}; pub use sweep::sweep_intersected_blocks; diff --git a/crates/horizon-core/src/geometry/movement.rs b/crates/horizon-core/src/geometry/movement.rs index e89c77ba0..ec0843203 100644 --- a/crates/horizon-core/src/geometry/movement.rs +++ b/crates/horizon-core/src/geometry/movement.rs @@ -37,11 +37,27 @@ pub fn resolve_step_movement<'s>( on_ground: bool, mut collect: impl FnMut(Aabb) -> Vec<&'s VoxelShape>, ) -> Vec3 { + try_resolve_step_movement(movement, aabb, max_step, on_ground, |bounds| { + Ok::<_, std::convert::Infallible>(collect(bounds)) + }) + .unwrap_or_else(|never| match never {}) +} + +/// The same movement/step decision with fallible, owned or borrowed collider +/// collections. A provider failure stops before the next query and returns no +/// movement result. Existing world-query side effects are not rolled back. +pub fn try_resolve_step_movement, E>( + movement: Vec3, + aabb: Aabb, + max_step: f32, + on_ground: bool, + mut collect: impl FnMut(Aabb) -> Result, E>, +) -> Result { let resolved = if movement.length_squared() == 0.0 { movement } else { - let shapes = collect(aabb.expand_towards(movement)); - resolve_shape_movement(movement, aabb, &shapes) + let shapes = collect(aabb.expand_towards(movement))?; + resolve_borrowed_shape_movement(movement, aabb, &shapes) }; let landed = movement.y != resolved.y && movement.y < 0.0; if max_step > 0.0 @@ -57,23 +73,23 @@ pub fn resolve_step_movement<'s>( if !landed { query = query.expand_towards(Vec3::new(0.0, -(1.0e-5_f32 as f64), 0.0)); } - let shapes = collect(query); - for height in candidate_step_heights(step_box, &shapes, max_step, resolved.y as f32) { - let candidate = resolve_shape_movement( + let shapes = collect(query)?; + for height in borrowed_step_heights(step_box, &shapes, max_step, resolved.y as f32) { + let candidate = resolve_borrowed_shape_movement( Vec3::new(movement.x, height as f64, movement.z), step_box, &shapes, ); if candidate.horizontal_distance_squared() > resolved.horizontal_distance_squared() { - return candidate.subtract(Vec3::new( + return Ok(candidate.subtract(Vec3::new( 0.0, aabb.min(Axis::Y) - step_box.min(Axis::Y), 0.0, - )); + ))); } } } - resolved + Ok(resolved) } /// Resolve vanilla's Y-first, magnitude-dependent horizontal axis ordering. @@ -82,6 +98,13 @@ pub fn resolve_step_movement<'s>( /// This helper does not collect shapes, step up, set grounded flags, modify /// velocity, or apply inside-block effects. pub fn resolve_shape_movement(movement: Vec3, aabb: Aabb, shapes: &[&VoxelShape]) -> Vec3 { + resolve_borrowed_shape_movement(movement, aabb, shapes) +} +fn resolve_borrowed_shape_movement>( + movement: Vec3, + aabb: Aabb, + shapes: &[S], +) -> Vec3 { if shapes.is_empty() { return movement; } @@ -92,8 +115,12 @@ pub fn resolve_shape_movement(movement: Vec3, aabb: Aabb, shapes: &[&VoxelShape] continue; } let moved = aabb.move_by(Vec3::new(result[0], result[1], result[2])); - result[axis as usize] = - VoxelShape::collide_all(axis, moved, shapes.iter().copied(), amount); + result[axis as usize] = VoxelShape::collide_all( + axis, + moved, + shapes.iter().map(std::borrow::Borrow::borrow), + amount, + ); } Vec3::new(result[0], result[1], result[2]) } @@ -106,9 +133,19 @@ pub fn candidate_step_heights( shapes: &[&VoxelShape], max_step: f32, current_y: f32, +) -> Vec { + borrowed_step_heights(aabb, shapes, max_step, current_y) +} + +fn borrowed_step_heights>( + aabb: Aabb, + shapes: &[S], + max_step: f32, + current_y: f32, ) -> Vec { let mut heights = Vec::::with_capacity(4); for shape in shapes { + let shape = shape.borrow(); for coordinate in shape.coordinates(Axis::Y) { let height = (*coordinate - aabb.min(Axis::Y)) as f32; if height < 0.0 || height == current_y { @@ -206,3 +243,42 @@ mod tests { assert_eq!(block_floor_height(&empty, || &empty), f64::NEG_INFINITY); } } + +#[cfg(test)] +mod fallible_tests { + use super::*; + #[test] + fn owned_collision_queries_stop_at_first_failure() { + let bounds = Aabb::new(Vec3::new(-0.6, 0.0, 0.2), Vec3::new(-0.2, 1.8, 0.8)); + let ledge = VoxelShape::from_box(Aabb::new(Vec3::ZERO, Vec3::new(1.0, 0.5, 1.0))).unwrap(); + for fail in [0, 1] { + let mut queries = 0; + let result = + try_resolve_step_movement(Vec3::new(1.0, 0.0, 0.0), bounds, 0.6, true, |_| { + let call = queries; + queries += 1; + if call == fail { + Err(call) + } else { + Ok(vec![ledge.clone()]) + } + }); + assert_eq!(result, Err(fail)); + assert_eq!(queries, fail + 1); + } + let result = try_resolve_step_movement( + Vec3::new(-0.0, -0.0, -0.0), + bounds, + 0.6, + true, + |_| -> Result, ()> { + panic!("zero movement must skip shape collection") + }, + ) + .unwrap(); + assert_eq!( + [result.x.to_bits(), result.y.to_bits(), result.z.to_bits()], + [(-0.0f64).to_bits(); 3] + ); + } +} diff --git a/crates/horizon-world/examples/registry_collision_scan_fixture.rs b/crates/horizon-world/examples/registry_collision_scan_fixture.rs index fae91f595..71ff88f73 100644 --- a/crates/horizon-world/examples/registry_collision_scan_fixture.rs +++ b/crates/horizon-world/examples/registry_collision_scan_fixture.rs @@ -18,6 +18,7 @@ use horizon_world::{ registry::{BlockRegistry, BlockStateId}, registry_collision_scan::{CollisionChunks, RegistryCollisionWorld}, suffocation::{SuffocationDefinition, SuffocationRegistry}, + world_movement::{EntityMovementWorld, MovementRequest, resolve_world_movement}, worldgen::{ tags::TagDefinitions, terrain::{TerrainBlockStates, TerrainChunk}, @@ -185,11 +186,59 @@ impl TerrainBlockStates for Properties { Air(self.0[id.0 as usize]) } } +struct MovementShapes { + entities: Vec, + border: Option, +} struct World<'r> { + movement: Option, chunks: BTreeMap<(i32, i32), (TerrainChunk<'r, Properties>, Entities)>, global: Entities, trace: SharedTrace, } +fn query_bounds(trace: &SharedTrace, label: &str, b: Aabb) -> io::Result<()> { + let text = format!( + "{label} {:016x} {:016x} {:016x} {:016x} {:016x} {:016x}", + b.min(Axis::X).to_bits(), + b.min(Axis::Y).to_bits(), + b.min(Axis::Z).to_bits(), + b.max(Axis::X).to_bits(), + b.max(Axis::Y).to_bits(), + b.max(Axis::Z).to_bits() + ); + trace.borrow_mut().query(text) +} +fn box_shape(v: &Value) -> io::Result { + VoxelShape::from_box(Aabb::new( + Vec3::new(number(&v[0]), number(&v[1]), number(&v[2])), + Vec3::new(number(&v[3]), number(&v[4]), number(&v[5])), + )) + .map_err(io::Error::other) +} +impl EntityMovementWorld for World<'_> { + type Error = io::Error; + fn entity_collisions( + &mut self, + _: EntityIdentity, + bounds: Aabb, + ) -> io::Result> { + query_bounds(&self.trace, "entities", bounds)?; + Ok(self.movement.as_ref().unwrap().entities.clone()) + } + fn movement_border( + &mut self, + _: EntityIdentity, + bounds: Aabb, + ) -> io::Result> { + self.trace.borrow_mut().query("border".to_owned())?; + query_bounds(&self.trace, "border-test", bounds)?; + let border = &self.movement.as_ref().unwrap().border; + if border.is_some() { + self.trace.borrow_mut().query("border-shape".to_owned())?; + } + Ok(border.clone()) + } +} impl DynamicSupportWorld for World<'_> { type Error = io::Error; fn shulker_is_closed(&mut self, p: [i32; 3]) -> io::Result> { @@ -355,7 +404,26 @@ fn main() -> Result<(), Box> { .0 .set_block_worldgen(x, y, z, BlockStateId(b[3].as_u64().unwrap() as u32))?; } + let movement = f + .get("movement") + .map(|m| -> io::Result<_> { + Ok(MovementShapes { + entities: m["entities"] + .as_array() + .unwrap() + .iter() + .map(box_shape) + .collect::>()?, + border: if m["border"].is_null() { + None + } else { + Some(box_shape(&m["border"])?) + }, + }) + }) + .transpose()?; let mut world = World { + movement, chunks, global: Entities { mode: f["entities"][0].as_u64().unwrap(), @@ -376,6 +444,29 @@ fn main() -> Result<(), Box> { Vec3::new(number(&v[0]), number(&v[1]), number(&v[2])), Vec3::new(number(&v[3]), number(&v[4]), number(&v[5])), ); + if let Some(m) = f.get("movement") { + let v = &m["delta"]; + let result = resolve_world_movement( + &mut bound, + MovementRequest { + entity: EntityIdentity(1), + context, + bounds, + movement: Vec3::new(number(&v[0]), number(&v[1]), number(&v[2])), + max_step: number(&m["step"]) as f32, + on_ground: m["grounded"].as_bool().unwrap(), + candidate_budget: 1_000_000, + }, + ); + let mut t = trace.borrow_mut(); + match result { + Ok(v) => values(&mut t.out, "movement", [v.x, v.y, v.z])?, + Err(_) => writeln!(t.out, "error")?, + } + let calls = t.calls; + writeln!(t.out, "done movement {calls}")?; + continue; + } let mut scan = BlockCollisionScan::new( &mut bound, context, diff --git a/crates/horizon-world/src/lib.rs b/crates/horizon-world/src/lib.rs index a6705b6d6..5a3122110 100644 --- a/crates/horizon-world/src/lib.rs +++ b/crates/horizon-world/src/lib.rs @@ -28,6 +28,7 @@ pub mod registry_collision_scan; pub mod retrogen; pub mod suffocation; pub mod tick_data; +pub mod world_movement; pub mod worldgen; pub const DATA_VERSION: i32 = 5023; diff --git a/crates/horizon-world/src/registry_collision_scan.rs b/crates/horizon-world/src/registry_collision_scan.rs index df0067bce..f0f0f14a7 100644 --- a/crates/horizon-world/src/registry_collision_scan.rs +++ b/crates/horizon-world/src/registry_collision_scan.rs @@ -100,3 +100,27 @@ where ) } } + +impl crate::world_movement::EntityMovementWorld + for RegistryCollisionWorld<'_, '_, W> +{ + type Error = CollisionQueryError; + fn entity_collisions( + &mut self, + entity: crate::entity_obstruction::EntityIdentity, + bounds: horizon_core::geometry::Aabb, + ) -> Result, Self::Error> { + self.world + .entity_collisions(entity, bounds) + .map_err(CollisionQueryError::Context) + } + fn movement_border( + &mut self, + entity: crate::entity_obstruction::EntityIdentity, + bounds: horizon_core::geometry::Aabb, + ) -> Result, Self::Error> { + self.world + .movement_border(entity, bounds) + .map_err(CollisionQueryError::Context) + } +} diff --git a/crates/horizon-world/src/world_movement.rs b/crates/horizon-world/src/world_movement.rs new file mode 100644 index 000000000..5b6f0761a --- /dev/null +++ b/crates/horizon-world/src/world_movement.rs @@ -0,0 +1,81 @@ +//! Entity.collide collection order and step resolution over a collision world. +//! Travel, velocity, grounded flags and inside-block effects remain caller work. +use crate::{ + block_collision_scan::{BlockCollisionScan, BlockCollisionWorld, CollisionScanError}, + collision_context::CollisionContext, + entity_obstruction::EntityIdentity, +}; +use horizon_core::geometry::{ + Aabb, Vec3, VoxelShape, entity_collision_bounds, try_resolve_step_movement, +}; + +pub trait EntityMovementWorld { + type Error; + /// Return native-selected entity shapes in query order. Selection occurs + /// once, even for zero movement, and the list is reused during stepping. + fn entity_collisions( + &mut self, + entity: EntityIdentity, + bounds: Aabb, + ) -> Result, Self::Error>; + /// Obtain the border, check isInsideCloseToBorder and fetch its shape only + /// when applicable. Called before block iteration for each collision query. + fn movement_border( + &mut self, + entity: EntityIdentity, + bounds: Aabb, + ) -> Result, Self::Error>; +} + +pub struct MovementRequest<'a> { + pub entity: EntityIdentity, + /// Captured context for this entity. Experimental minecart exclusions need + /// their separate context layer; ordinary captured contexts are supported. + pub context: CollisionContext<'a>, + pub bounds: Aabb, + pub movement: Vec3, + pub max_step: f32, + pub on_ground: bool, + /// Per block scan, including skipped cursor cells. + pub candidate_budget: usize, +} + +pub fn resolve_world_movement( + world: &mut W, + request: MovementRequest<'_>, +) -> Result> +where + W: BlockCollisionWorld + EntityMovementWorld, +{ + let entities = world + .entity_collisions( + request.entity, + entity_collision_bounds(request.movement, request.bounds, request.max_step), + ) + .map_err(CollisionScanError::World)?; + try_resolve_step_movement( + request.movement, + request.bounds, + request.max_step, + request.on_ground, + |bounds| { + let mut shapes = entities.clone(); + if let Some(border) = world + .movement_border(request.entity, bounds) + .map_err(CollisionScanError::World)? + { + shapes.push(border); + } + for hit in BlockCollisionScan::new( + world, + request.context, + bounds, + false, + request.candidate_budget, + )? { + shapes.push(hit?.shape); + } + Ok(shapes) + }, + ) +} diff --git a/docs/collision-geometry.md b/docs/collision-geometry.md index 089db96f9..8a246caa6 100644 --- a/docs/collision-geometry.md +++ b/docs/collision-geometry.md @@ -453,3 +453,29 @@ records **3,046,929 matching output lines per JAR**. Six collision import/bindin tests pass, including legacy-metadata rejection; workspace Clippy passes. Live chunk loading, entity lifecycle, movement and the playable client remain separate integration work. + + +`resolve_world_movement` now joins registry-backed block scanning to the native +step-up decision. It selects entity colliders once, including for zero/underflow +movement, then collects applicable border and block shapes in native order for +the initial and optional step query. `try_resolve_step_movement` accepts owned or +borrowed collider lists and propagates provider failures without returning a +partial displacement. The shared implementation avoids allocating reference +lists for owned shapes; existing borrowed callers retain the same API. + +`python3 tools/test_world_movement_parity.py` runs actual `Entity.collide` over +registered blocks and resident Java sections, comparing the Rust world collector +and step solver. Every registered state appears as an obstacle; additional cases +cover step heights, grounded/falling motion, ceilings, partial/dynamic blocks, +chunk boundaries, zero/underflow motion and failures during collection. The +[world movement report](../benchmarks/rust-world-movement-2026-10-07/scoped-parity.json) +records **7,062,798 matching lines per JAR**. Entity collider lists, border +proximity/shapes and collision contexts are controlled fixture inputs. Actual +entity selection, border state, travel/gravity/velocity, grounded side effects +and playable integration remain pending. + +The [geometry regression](../benchmarks/rust-world-movement-2026-10-07/geometry-regression.json) +passes again with **1,320,187 lines per JAR**, including the existing native step +fixtures. All six movement unit tests and workspace Clippy pass. New tests cover +owned-query failures during both initial and step collection and signed zero +preservation when collection is skipped. diff --git a/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java index e15f71c45..73f8ca9b0 100644 --- a/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java +++ b/mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java @@ -28,6 +28,27 @@ public final class VanillaRegistryCollisionScanOracle { @Override public BlockEntity getBlockEntity(BlockPos p){trace.query("entity chunk "+p.getX()+" "+p.getY()+" "+p.getZ());return entity;} void write(BlockPos p,int id){getSection(getSectionIndex(p.getY())).setBlockState(p.getX()&15,p.getY()&15,p.getZ()&15,Block.stateById(id),false);} } + static String boxText(String label,AABB b){return label+String.format(" %016x %016x %016x %016x %016x %016x",Double.doubleToLongBits(b.minX),Double.doubleToLongBits(b.minY),Double.doubleToLongBits(b.minZ),Double.doubleToLongBits(b.maxX),Double.doubleToLongBits(b.maxY),Double.doubleToLongBits(b.maxZ));} + static VoxelShape boxShape(JsonElement input){var v=input.getAsJsonArray();return Shapes.box(number(v.get(0)),number(v.get(1)),number(v.get(2)),number(v.get(3)),number(v.get(4)),number(v.get(5)));} + static final class StepBorder extends net.minecraft.world.level.border.WorldBorder { + Trace trace;VoxelShape shape; + @Override public boolean isInsideCloseToBorder(net.minecraft.world.entity.Entity entity,AABB bounds){trace.query(boxText("border-test",bounds));return shape!=null;} + @Override public VoxelShape getCollisionShape(){trace.query("border-shape");return shape;} + } + static final class StepLevel extends net.minecraft.server.level.ServerLevel { + Trace trace;StepBorder border;List entities;CollisionGetter world;CollisionContext context; + private StepLevel(){super(null,null,null,null,null,null,false,0L,List.of(),false);} + @Override public net.minecraft.world.level.border.WorldBorder getWorldBorder(){trace.query("border");return border;} + @Override public List getEntityCollisions(net.minecraft.world.entity.Entity entity,AABB bounds){trace.query(boxText("entities",bounds));return entities;} + @Override public Iterable getBlockCollisions(net.minecraft.world.entity.Entity entity,AABB bounds){return ()->new BlockCollisions(world,context,bounds,false,(p,shape)->shape);} + } + static final class StepEntity extends net.minecraft.world.entity.decoration.ArmorStand { + float step;boolean grounded; + private StepEntity(){super(null,null);} + @Override public float maxUpStep(){return step;} + @Override public boolean onGround(){return grounded;} + void configure(StepLevel level,AABB bounds,float step,boolean grounded){setLevel(level);setBoundingBox(bounds);this.step=step;this.grounded=grounded;} + } static long key(int x,int z){return (long)x<<32|Integer.toUnsignedLong(z);} static double number(JsonElement v){return Double.longBitsToDouble(Long.parseUnsignedLong(v.getAsString(),16));} public static void main(String[] args)throws Exception { @@ -44,6 +65,7 @@ public final class VanillaRegistryCollisionScanOracle { for(var status:animation.getType().getEnumConstants())if(((Enum)status).name().equals(i==1?"CLOSED":"OPENED"))animation.set(entities[i],status); progress.setFloat(entities[i],i==1?0:0.5f);previous.setFloat(entities[i],i==1?0:0.5f); } + var collide=net.minecraft.world.entity.Entity.class.getDeclaredMethod("collide",Vec3.class);collide.setAccessible(true); var emit=VanillaFaceSupportOracle.class.getDeclaredMethod("emit",PrintWriter.class,VoxelShape.class);emit.setAccessible(true); try(var out=new PrintWriter(Files.newBufferedWriter(dir.resolve(args[0]+".txt")));var lines=Files.lines(dir.resolve("inputs.txt"))){ for(var line:(Iterable)lines::iterator){ @@ -58,6 +80,15 @@ public final class VanillaRegistryCollisionScanOracle { }); int mode=f.get("context").getAsInt();var context=mode==0?CollisionContext.empty():mode==1?CollisionContext.emptyWithFluidCollisions():mode==2?CollisionContext.positionContext(number(f.get("y"))):CollisionContext.placementContext(null); var v=f.getAsJsonArray("box");var bounds=new AABB(number(v.get(0)),number(v.get(1)),number(v.get(2)),number(v.get(3)),number(v.get(4)),number(v.get(5))); + if(f.has("movement")){ + var m=f.getAsJsonObject("movement");var level=(StepLevel)allocate.invoke(unsafe,StepLevel.class);level.trace=trace;level.world=world;level.context=context; + level.entities=new ArrayList<>();for(var shape:m.getAsJsonArray("entities"))level.entities.add(boxShape(shape)); + level.border=new StepBorder();level.border.trace=trace;level.border.shape=m.get("border").isJsonNull()?null:boxShape(m.get("border")); + var entity=(StepEntity)allocate.invoke(unsafe,StepEntity.class);entity.configure(level,bounds,(float)number(m.get("step")),m.get("grounded").getAsBoolean());var delta=m.getAsJsonArray("delta"); + try{var result=(Vec3)collide.invoke(entity,new Vec3(number(delta.get(0)),number(delta.get(1)),number(delta.get(2))));out.printf("movement %016x %016x %016x%n",Double.doubleToLongBits(result.x),Double.doubleToLongBits(result.y),Double.doubleToLongBits(result.z));} + catch(InvocationTargetException error){if(error.getCause() instanceof Stop)out.println("error");else throw error;} + out.println("done movement "+trace.calls);continue; + } var scan=new BlockCollisions(world,context,bounds,f.get("suffocating").getAsBoolean(),(p,s)->{out.println("hit "+p.getX()+" "+p.getY()+" "+p.getZ());return s;});int hits=0; try{while(hitsd',float(v)).hex() + def row(state,delta=(1,-0.08,0),step=0.6,grounded=True,context=2,offset=0,fail=-1,extra=(),entities=(),border=None): + blocks=[[x+offset,-1,z,facts['defaults']['minecraft:stone']] for x in range(-2,4) for z in range(-2,3)] + blocks.append([offset,0,0,state]);blocks.extend(extra) + return dict(chunks=[[x,z] for x in range((offset>>4)-1,(offset>>4)+2) for z in range(-1,2)], + blocks=blocks,context=context,y=bits(0),entities=[0,0],fail=fail,limit=100000,suffocating=False, + box=list(map(bits,[-0.6+offset,0,0.2,-0.2+offset,1.8,0.8])), + movement=dict(delta=list(map(bits,delta)),step=bits(step),grounded=grounded, + entities=[list(map(bits,b)) for b in entities],border=None if border is None else list(map(bits,border)))) + states=facts['states'] + for state in range(len(states)): + yield row(state,context=state%4) + defaults=facts['defaults'] + obstacles=[i for i,s in enumerate(states) if s['id'] in ['minecraft:oak_stairs','minecraft:stone_slab', + 'minecraft:snow','minecraft:scaffolding','minecraft:powder_snow','minecraft:water', + 'minecraft:shulker_box','minecraft:moving_piston','minecraft:piston','minecraft:soul_sand', + 'minecraft:mud','minecraft:farmland','minecraft:bamboo','minecraft:pointed_dripstone']] + for state in obstacles: + for step in [0,0.5,0.6,1.0,1.5]: + for dy in [0,-0.08,-0.5,0.25]: + yield row(state,delta=(1,dy,0),step=step) + for delta in [(0,0,0),(-0.0,-0.0,-0.0),(1e-200,0,0),(1e-8,-1e-8,0),(1,0,0),(0,0,1),(1,-0.08,1)]: + for state in [defaults['minecraft:stone_slab'],defaults['minecraft:oak_stairs']]: + for fail in [-1,0,1,2,3,8,50,100,150,250]:yield row(state,delta=delta,fail=fail) + rng=random.Random(0x4d4f56454d454e54) + for index in range(5000): + offset=rng.choice([-16,0,15]);state=rng.choice(obstacles) + delta=[rng.choice([-1.25,-0.5,0,0.5,1.0,1.8]),rng.choice([-0.75,-0.08,0,0.25]),rng.choice([-1.0,-0.2,0,0.2,1.0])] + entities=[] + for _ in range(rng.randrange(4)): + x=offset+rng.uniform(-1,2);z=rng.uniform(-1,2);y=rng.choice([-1,0,0.5,1.0,2.0]);entities.append([x,y,z,x+0.6,y+rng.choice([0.5,1.0,1.8]),z+0.6]) + border=[offset+0.8,-2,-2,offset+1.2,4,3] if index%4==0 else None + extra=[[offset,2,0,defaults['minecraft:stone']]] if index%3==0 else [] + f=row(state,delta,step=rng.choice([0,0.5,0.6,1.0,1.5]),grounded=bool(index%2),context=index%4, + offset=offset,fail=rng.choice([-1,-1,-1,0,1,2,3,8,50,100,150,250]),extra=extra,entities=entities,border=border) + f['entities']=[rng.randrange(3),rng.randrange(3)] + yield f + + +def main(): + lock, jars, libraries = base.verify_artifacts() + build = lab.LOCAL/'rust-world-movement-parity';build.mkdir(exist_ok=True) + report_path = build/'report.json';report_path.unlink(missing_ok=True) + oracle = lab.ROOT/'mods/horizon/src/test/java/dev/horizonlab/parity/VanillaRegistryCollisionScanOracle.java' + helpers = [oracle.with_name(name+'.java') for name in + ['VanillaHeightmapOracle', 'VanillaCollisionOracle', 'VanillaBlockStateCodecOracle', 'VanillaSuffocationOracle', 'VanillaFaceSupportOracle']] + sources = [oracle, *helpers, Path(__file__), lab.ROOT/'tools/test_rust_parity.py', + lab.ROOT/'tools/test_worldgen_parity.py', lab.ROOT/'tools/lab.py', + lab.ROOT/'Cargo.toml', lab.ROOT/'Cargo.lock', + lab.ROOT/'crates/horizon-world/examples/registry_collision_scan_fixture.rs'] + for crate in ['horizon-core', 'horizon-world']: + sources += [lab.ROOT/'crates'/crate/'Cargo.toml', + *sorted((lab.ROOT/'crates'/crate/'src').rglob('*.rs'))] + tested = base.source_hashes(sources) + tags = worldgen.tag_resources(jars['server']) + if tags != worldgen.tag_resources(jars['client']):raise AssertionError('Client/server block tags differ') + lab.write_json(build/'tags.json', tags) + classes = build/'classes';classes.mkdir(exist_ok=True) + dependencies = os.pathsep.join(map(str, libraries)) + def run(command, name): + with (build/(name+'.log')).open('w') as log: + subprocess.run(list(map(str, command)), cwd=lab.ROOT, check=True, timeout=3600, + stdout=log, stderr=subprocess.STDOUT) + run(['javac', '--release', lock['minecraft']['java_major'], '-proc:none', '-cp', + str(jars['server'])+os.pathsep+dependencies, '-d', classes, oracle, *helpers], 'compile-java') + def java(side, mode): + run(['java', '-Xmx768M', '-cp', os.pathsep.join([str(classes), str(jars[side]), dependencies]), + 'dev.horizonlab.parity.VanillaRegistryCollisionScanOracle', mode, build], side+'-'+mode) + java('server', 'export') + facts = json.loads((build/'facts.json').read_text()) + if len(facts['states']) != 35723:raise AssertionError('Incomplete pinned registry') + definitions = json.loads((build/'definitions.json').read_text()) + count = 0 + with (build/'inputs.txt').open('w') as output: + for fixture in corpus(facts): + output.write(json.dumps(fixture, separators=(',', ':'))+'\n');count += 1 + fixture_paths = [build/name for name in ['inputs.txt', 'facts.json', 'definitions.json', + 'block-registry.nbt', 'cached-collision.nbt', 'tags.json']] + fixtures = base.source_hashes(fixture_paths) + run(['cargo', 'build', '--locked', '--release', '-p', 'horizon-world', '--example', 'registry_collision_scan_fixture'], 'compile-rust') + metadata = json.loads(subprocess.check_output(['cargo', 'metadata', '--locked', '--no-deps', '--format-version', '1'], cwd=lab.ROOT)) + binary = Path(metadata['target_directory'])/'release/examples'/('registry_collision_scan_fixture.exe' if os.name=='nt' else 'registry_collision_scan_fixture') + run([binary, build], 'rust');references = [] + for side, jar in jars.items(): + java(side, side) + matched = base.compare(build/(side+'.txt'), build/'rust.txt') + references.append({'side':side, 'jar_sha256':lab.digest(jar, 'sha256'), + 'output_sha256':lab.digest(build/(side+'.txt'), 'sha256'), 'matched_output_lines':matched}) + print(f'{side}: {matched:,} world movement lines match', flush=True) + base.ensure_sources_unchanged(sources, tested);base.ensure_sources_unchanged(fixture_paths, fixtures) + report = {'schema':1, 'minecraft':lock['minecraft']['version'], 'manifest_sha1':lock['minecraft']['manifest_sha1'], + 'platform':platform.platform(), 'java':subprocess.check_output(['java', '--version'], text=True).splitlines()[0], + 'rustc':subprocess.check_output(['rustc', '--version'], text=True).strip(), + 'registry_states':len(facts['states']), 'block_definitions':len(definitions), + 'definition_counts':dict(collections.Counter(definitions.values())), + 'native_chunk_storage':'ProtoChunk', 'rust_chunk_storage':'TerrainChunk', 'fixtures':count, 'sources_sha256':tested, 'fixtures_sha256':fixtures, + 'rust_output_sha256':lab.digest(build/'rust.txt', 'sha256'), 'references':references, + 'scope':'Actual native Entity.collide executes initial collision and step-up decisions over BlockCollisions, registered block shapes and resident ProtoChunk sections. Rust combines owned/fallible step resolution with registry-bound TerrainChunk scanning. All registered states are used as obstacles, plus step heights, falling/grounded motion, zero and underflow motion, partial blocks, fluids, dynamic blocks, ceilings, chunk boundaries and query failures. Entity collider lists and world-border proximity/shape are controlled inputs; query order and reuse, shape collection and resulting displacement are compared. Contexts are deliberately supplied empty/position/placement snapshots in both worlds. This does not establish entity broad-phase selection, actual world-border proximity, travel/gravity/velocity or grounded side effects, experimental minecarts or a playable game.'} + lab.write_json(report_path, report);print(f'Scoped world movement parity passed: {report_path}', flush=True) + + +if __name__ == '__main__':main()