Merge remote-tracking branch 'origin/main' into cg15/1955

# Conflicts:
#	tools/lan_e2e.py
This commit is contained in:
Ludovic Marie
2026-10-26 04:24:12 +01:00
216 changed files with 18138 additions and 3770 deletions
+17
View File
@@ -182,6 +182,23 @@ def player_state():
cmd('/item modify entity @s weapon.mainhand {type:"minecraft:set_count",count:1}'),
cmd('/clear @s'),
cmd('/clear @s'),
# Inventory.clearOrCountMatchingItems visits the off hand as well as
# the main inventory, and consumes limited clears in inventory-slot order.
cmd('/item replace entity @s weapon.offhand with minecraft:shield'),
cmd('/clear @s minecraft:shield 0'),
cmd('/clear @s minecraft:shield 1'),
cmd('/clear @s minecraft:shield 0'),
cmd('/item replace entity @s weapon.offhand with minecraft:stone 5'),
cmd('/clear @s minecraft:stone 2'),
cmd('/clear @s minecraft:stone 0'),
cmd('/clear @s'),
cmd('/clear @s minecraft:stone 0'),
cmd('/item replace entity @s armor.head with minecraft:iron_helmet'),
cmd('/item replace entity @s armor.feet with minecraft:iron_boots'),
cmd('/clear @s * 1'),
cmd('/clear @s minecraft:iron_boots 0'),
cmd('/clear @s minecraft:iron_helmet 0'),
cmd('/clear @s'),
cmd('/attribute @s minecraft:max_health get'),
cmd('/attribute @s minecraft:max_health base get'),
cmd('/attribute @s minecraft:max_health base set 30'),