Fix double-chest inventory and hotbar clicks
Co-Authored-By: OpenCode (GPT-6.1-Sol) <noreply@openai.com>
This commit is contained in:
@@ -1582,6 +1582,12 @@ impl Game<'_> {
|
||||
}
|
||||
}
|
||||
}
|
||||
/// Find a game slot in the menu's complete, contiguous slot mapping.
|
||||
fn menu_slot_index(menu: &str, internal: usize) -> Option<usize> {
|
||||
(0..)
|
||||
.map_while(|slot| Self::menu_slot(menu, slot))
|
||||
.position(|slot| slot == internal)
|
||||
}
|
||||
/// The workstation screen of a menu type a server opens.
|
||||
pub(super) fn remote_station_kind(menu: &str) -> Option<super::stations::Kind> {
|
||||
use super::stations::Kind;
|
||||
@@ -4522,12 +4528,10 @@ impl Game<'_> {
|
||||
for &(slot, button, input) in ops {
|
||||
let slot = match slot {
|
||||
None => -999,
|
||||
Some(internal) => {
|
||||
match (0..64).find(|&s| Self::menu_slot(&menu, s) == Some(internal)) {
|
||||
Some(s) => s as i16,
|
||||
None => return false,
|
||||
}
|
||||
}
|
||||
Some(internal) => match Self::menu_slot_index(&menu, internal) {
|
||||
Some(s) => s as i16,
|
||||
None => return false,
|
||||
},
|
||||
};
|
||||
clicks.push((slot, button, input));
|
||||
}
|
||||
@@ -4596,7 +4600,7 @@ impl Game<'_> {
|
||||
/// such slot.
|
||||
pub(super) fn remote_slot_click(&mut self, internal: usize, button: i8, input: i32) -> bool {
|
||||
let (container, menu) = self.remote_menu();
|
||||
let slot = (0..64).find(|&s| Self::menu_slot(&menu, s) == Some(internal));
|
||||
let slot = Self::menu_slot_index(&menu, internal);
|
||||
let Some(slot) = slot else { return false };
|
||||
let carried = self.to_network(&self.carried).map(|s| Hashed::of(&s));
|
||||
let state = self.remote.as_ref().map_or(0, |r| r.state_id);
|
||||
@@ -5455,4 +5459,28 @@ mod tests {
|
||||
}
|
||||
assert_eq!(Game::menu_slot("inventory", 46), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn remote_clicks_find_slots_past_the_old_large_chest_cutoff() {
|
||||
for (menu, internal, index) in [
|
||||
("minecraft:generic_9x6", 18, 63),
|
||||
("minecraft:generic_9x6", 19, 64),
|
||||
("minecraft:generic_9x6", 0, 81),
|
||||
("minecraft:generic_9x6", 8, 89),
|
||||
("minecraft:generic_9x6", 353, 53),
|
||||
("minecraft:generic_9x5", 8, 80),
|
||||
("minecraft:generic_9x4", 8, 71),
|
||||
("minecraft:generic_9x3", 8, 62),
|
||||
("inventory", 504, 45),
|
||||
] {
|
||||
assert_eq!(
|
||||
Game::menu_slot_index(menu, internal),
|
||||
Some(index),
|
||||
"{menu}, game slot {internal}"
|
||||
);
|
||||
}
|
||||
assert_eq!(Game::menu_slot_index("minecraft:generic_9x6", 354), None);
|
||||
assert_eq!(Game::menu_slot_index("minecraft:generic_9x6", 504), None);
|
||||
assert_eq!(Game::menu_slot_index("unknown", 0), None);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5496,5 +5496,77 @@ CHECKS += ['villagers']
|
||||
CHECK_FNS.update(villagers=check_villagers)
|
||||
|
||||
|
||||
def check_large_chest(host, guest, out):
|
||||
"""Every player slot can be picked up or shift-clicked into a double chest (#1505, #1589).
|
||||
Reopening checks the authoritative contents, with a single chest as the control."""
|
||||
seen = {}
|
||||
for game in (host, guest):
|
||||
game('command', command='gamemode survival')
|
||||
x, y, z = (int(v // 1) for v in pos_of(game))
|
||||
chest, other = (x, y, z + 2), (x + 1, y, z + 2)
|
||||
try:
|
||||
for double in (False, True):
|
||||
size = 54 if double else 27
|
||||
# Double chest indices 54..89 include the old cutoff at 63/64 and every hotbar slot.
|
||||
sources = list(range(9, 36)) + list(range(9)) if double else [19, 0, 8]
|
||||
for shift in (False, True):
|
||||
back_to_game(game)
|
||||
for at in (chest, other):
|
||||
game('command', command=f'setblock {at[0]} {at[1]} {at[2]} minecraft:air')
|
||||
game('command', command='kill @e[type=minecraft:item,distance=..8]')
|
||||
game('command', command='clear @s')
|
||||
block = 'minecraft:chest[facing=north,type=left]' if double else 'minecraft:chest'
|
||||
game('command', command=f'setblock {x} {y} {z + 2} {block}')
|
||||
if double:
|
||||
game('command', command=f'setblock {x + 1} {y} {z + 2} minecraft:chest[facing=north,type=right]')
|
||||
for slot in sources:
|
||||
name = f'hotbar.{slot}' if slot < 9 else f'inventory.{slot - 9}'
|
||||
game('command', command=f'item replace entity @s {name} with minecraft:diamond')
|
||||
game.wait(10)
|
||||
game.raw('interact', *chest)
|
||||
game.raw('wait-for', 'screen', 'container', '--timeout', 10)
|
||||
game.wait(10)
|
||||
assert container_items(game)[1] == size, f'{game.name}: expected {size} chest slots'
|
||||
label = f'{"double" if double else "single"}-chest-{"shift" if shift else "pickup"}'
|
||||
for target, slot in enumerate(sources):
|
||||
if shift:
|
||||
game.raw('key', 'shift', 'down')
|
||||
try:
|
||||
mouse(game, slot)
|
||||
finally:
|
||||
if shift:
|
||||
game.raw('key', 'shift', 'up')
|
||||
if not shift:
|
||||
held = game('inventory').get('carried') or {}
|
||||
if held.get('item') != 'minecraft:diamond' or held.get('count') != 1:
|
||||
game.shot(out, f'{label}-slot-{slot}-failed')
|
||||
raise AssertionError(f'{game.name} {label}: slot {slot} picked up {held}')
|
||||
mouse(game, 300 + target)
|
||||
game.raw('key', 'esc', 'tap')
|
||||
game.wait(10)
|
||||
game.raw('interact', *chest)
|
||||
game.raw('wait-for', 'screen', 'container', '--timeout', 10)
|
||||
game.wait(10)
|
||||
contents = [s for s in game('screen')['slots'] if 300 <= s['slot'] < 300 + size and s.get('item')]
|
||||
inv = game('inventory')
|
||||
stored = sum(s['count'] for s in contents if s['item'] == 'minecraft:diamond')
|
||||
assert stored == len(sources) and not inv['counts'].get('minecraft:diamond') and not inv.get('carried'), \
|
||||
f'{game.name} {label}: chest {contents}, inventory {inv}'
|
||||
game.shot(out, label)
|
||||
seen[f'{game.name}-{label}'] = stored
|
||||
game.raw('key', 'esc', 'tap')
|
||||
finally:
|
||||
back_to_game(game)
|
||||
for at in (chest, other):
|
||||
game('command', command=f'setblock {at[0]} {at[1]} {at[2]} minecraft:air')
|
||||
game('command', command='kill @e[type=minecraft:item,distance=..8]')
|
||||
game('command', command='clear @s')
|
||||
return seen
|
||||
|
||||
|
||||
CHECKS += ['large_chest']
|
||||
CHECK_FNS.update(large_chest=check_large_chest)
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user