From 19896fb6f122decc2a876fcc1b28108bbba7ef91 Mon Sep 17 00:00:00 2001 From: Ludovic Marie <136255825+ludovic111@users.noreply.github.com> Date: Mon, 12 Oct 2026 23:59:20 +0200 Subject: [PATCH] Support saves from 1.16.5 (DataVersion 2571 on): replaceitem for pre-1.17 scenes --- crates/horizon-world/src/datafix/mod.rs | 2 +- tools/datafix_scene.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/crates/horizon-world/src/datafix/mod.rs b/crates/horizon-world/src/datafix/mod.rs index b787a22c5..ab3cf4a7b 100644 --- a/crates/horizon-world/src/datafix/mod.rs +++ b/crates/horizon-world/src/datafix/mod.rs @@ -29,7 +29,7 @@ use schema::{Key, Ty, key, walk}; pub const CURRENT: i32 = crate::DATA_VERSION; /// Data saved before this DataVersion (1.17 is 2724) needs fixes that are not /// ported (2717 and everything before). -pub const OLDEST_SUPPORTED: i32 = 2724; +pub const OLDEST_SUPPORTED: i32 = 2571; /// `Identifier.tryParse` validity, as `NamespacedSchema.ensureNamespaced` uses it. pub fn identifier(id: &str) -> Option<(String, String)> { diff --git a/tools/datafix_scene.py b/tools/datafix_scene.py index 384c33ae5..0f1861487 100644 --- a/tools/datafix_scene.py +++ b/tools/datafix_scene.py @@ -367,10 +367,14 @@ def player_commands(e, name, version=None): """Give the joined bot a varied inventory and ender chest.""" out = [] stacks = items(e, version) + if version is not None and version < 2700: # `/item` arrived in 1.17 + replace = lambda slot, item: f'replaceitem entity {name} {slot} {item}' + else: + replace = lambda slot, item: f'item replace entity {name} {slot} with {item}' for i, stack in enumerate(stacks[:30]): - out.append(f'item replace entity {name} container.{i} with {give_form(e, stack)}') - out.append(f'item replace entity {name} enderchest.0 with {give_form(e, stacks[0])}') - out.append(f'item replace entity {name} armor.head with minecraft:iron_helmet') + out.append(replace(f'container.{i}', give_form(e, stack))) + out.append(replace('enderchest.0', give_form(e, stacks[0]))) + out.append(replace('armor.head', 'minecraft:iron_helmet')) out.append(f'xp set {name} 5 levels') return out