diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 0f898f8bf..51fe3797c 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -3666,6 +3666,11 @@ impl Game<'_> { ) || self.book.is_some()) } fn capture(&mut self, capture: bool) { + // A guest's action (`as_guest`) opens and closes screens on the + // guest's own client: the window's pointer stays the host's (#687). + if self.lan_acting.is_some() { + return; + } // MouseHandler.grabMouse never captures an inactive window. if capture && !self.focused { return; diff --git a/crates/horizon-client/src/game/agent.rs b/crates/horizon-client/src/game/agent.rs index 48b24bbb3..2798f5706 100644 --- a/crates/horizon-client/src/game/agent.rs +++ b/crates/horizon-client/src/game/agent.rs @@ -469,6 +469,9 @@ impl Game<'_> { "time": { "day_time": self.world.day_time, "day": self.world.day_time.div_euclid(24000), "time_of_day": self.world.day_time.rem_euclid(24000) }, "weather": { "raining": self.world.weather.raining, "thundering": self.world.weather.thundering }, "paused": self.pause, + // Mouse movement turns the camera (`apply_mouse_look`): the real + // pointer is grabbed, or an agent's `mouse-move` stands in for it. + "pointer_grabbed": self.captured || self.agent_pointer, "player": player, "selected": self.selected + 1, "held": self.held().map(|s| self.stack_value(s)), diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index 1d3433cf0..0e90a6280 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -140,13 +140,20 @@ impl Game<'_> { total: g.xp_total, }, ); - let sneak = self.keys.contains(&KeyCode::ShiftLeft); + // The host's held keys stay theirs: the guest holds only sneak, and a + // screen the guest opens (`keys.clear()`) leaves the host walking. + let host_keys = std::mem::take(&mut self.keys); if g.sneaking { self.keys.insert(KeyCode::ShiftLeft); - } else { - self.keys.remove(&KeyCode::ShiftLeft); } + // The window's screens are the host's: a sign, book, command block or + // mount menu the guest's action opens is not drawn over the host's + // world (#687). The guest's client opens its own. let screen = std::mem::replace(&mut self.screen, Screen::Playing); + let host_sign = self.sign_edit.take(); + let host_book = self.book.take(); + let host_command_block = self.command_block_screen.take(); + let host_mount_menu = std::mem::take(&mut self.mount_menu); // The host's crafting grid stays theirs; a crafting table the guest // opens shows as the 3x3 size. let craft_size = std::mem::replace(&mut self.craft_size, 2); @@ -205,11 +212,11 @@ impl Game<'_> { play.swing = std::mem::replace(&mut self.swing, swing); self.container = container; self.screen = screen; - if sneak { - self.keys.insert(KeyCode::ShiftLeft); - } else { - self.keys.remove(&KeyCode::ShiftLeft); - } + self.sign_edit = host_sign; + self.book = host_book; + self.command_block_screen = host_command_block; + self.mount_menu = host_mount_menu; + self.keys = host_keys; let g = &mut host.hub.guests[i]; std::mem::swap(&mut self.ender_items, &mut g.ender_items); std::mem::swap(&mut self.adv.progress, &mut g.advancements); diff --git a/tools/lan_e2e.py b/tools/lan_e2e.py index 667fdda2d..d76cf922c 100755 --- a/tools/lan_e2e.py +++ b/tools/lan_e2e.py @@ -10,8 +10,10 @@ address. The script then checks, from both sides, what a guest's game used to ge - armour: each side draws the other player in that player's own armour; - nametags: each side draws the other player's name above them; - chest: a chest the guest opens opens on the guest's screen, its lid opens on both sides and - closes on both when the guest closes it; -- crafting: the guest crafts planks in the inventory's 2x2 grid and opens a crafting table; + closes on both when the guest closes it; the host keeps playing with its mouse look (#687); +- crafting: the guest crafts planks in the inventory's 2x2 grid and opens a crafting table, which + leaves the host's screen and mouse look alone; +- sign: a sign the guest places doesn't open a sign editor on the host; - damage: a guest in survival takes fall damage; - mobs: with the host in creative, a zombie and a skeleton go for the guest and hurt them; - hazards: a guest in survival gets hungry sprint-jumping and is hurt by lava, a block at the eyes, @@ -48,7 +50,7 @@ from agent_control_e2e import Cli, Failed, game_env # noqa: E402 ROOT = Path(__file__).resolve().parents[1] GUEST_NAME = 'Guest' -CHECKS = ['tab', 'self', 'armour', 'nametags', 'walls', 'chest', 'crafting', 'damage', 'mobs', 'hazards', 'pvp', 'containers', 'feedback', 'trials'] +CHECKS = ['tab', 'self', 'armour', 'nametags', 'walls', 'chest', 'crafting', 'sign', 'damage', 'mobs', 'hazards', 'pvp', 'containers', 'feedback', 'trials'] class Game: @@ -180,6 +182,19 @@ def check_nametags(host, guest, out): return {'host': h, 'guest': g} +def grab(game): + """Mouse look on, as a player's grabbed pointer: an agent's mouse-move stands in for it.""" + game.raw('mouse-move', 1, 0) + game.raw('mouse-move', -1, 0) + + +def host_unaffected(host, what): + """What a guest opens is the guest's: the host keeps its world on screen and its mouse look (#687).""" + state = host('state') + assert state.get('screen') == 'playing', f'{what} opened the {state.get("screen")} screen on the host' + assert state.get('pointer_grabbed'), f"{what} released the host's pointer" + + def lid(game, pos): return game.raw('block', *pos).get('lid', 0.0) @@ -189,9 +204,11 @@ def check_chest(host, guest, out): chest = (x, y, z + 2) guest('command', command=f'setblock {chest[0]} {chest[1]} {chest[2]} minecraft:chest') guest.wait(10) + grab(host) guest.raw('interact', *chest) screen = guest.raw('wait-for', 'screen', 'container', '--timeout', 10) guest.wait(20) + host_unaffected(host, "the guest's chest") opened = {'guest': lid(guest, chest), 'host': lid(host, chest)} host.raw('look-at', chest[0] + 0.5, chest[1] + 0.5, chest[2] + 0.5) host.wait(2) @@ -231,8 +248,10 @@ def check_crafting(host, guest, out): table = (x, y, z - 2) guest('command', command=f'setblock {table[0]} {table[1]} {table[2]} minecraft:crafting_table') guest.wait(10) + grab(host) guest.raw('interact', *table) guest.raw('wait-for', 'screen', 'inventory', '--timeout', 10) + host_unaffected(host, "the guest's crafting table") size = guest('screen').get('craft_size') assert size == 3, f'the crafting table opened a {size}x{size} grid' # Two planks one above the other in the 3x3 grid: four sticks. @@ -252,6 +271,23 @@ def check_crafting(host, guest, out): return {'planks': planks, 'table': counts} +def check_sign(host, guest, out): + x, y, z = (int(v // 1) for v in pos_of(guest)) + spot = (x + 2, y, z) + guest('command', command=f'setblock {spot[0]} {spot[1] - 1} {spot[2]} minecraft:stone') + guest('command', command=f'setblock {spot[0]} {spot[1]} {spot[2]} minecraft:air') + guest('command', command='give @s minecraft:oak_sign 1') + guest.wait(10) + grab(host) + guest.raw('place', *spot, '--item', 'minecraft:oak_sign') + guest.wait(20) + placed = host.raw('block', *spot).get('block') + host.shot(out, 'sign') + assert placed and 'sign' in placed, f'the guest placed {placed}' + host_unaffected(host, "the guest's sign") + return placed + + def check_damage(host, guest, out): guest('command', command='gamemode survival') guest.wait(10) @@ -623,7 +659,7 @@ def check_trials(host, guest, out): CHECK_FNS = {'tab': check_tab, 'self': check_self, 'armour': check_armour, 'nametags': check_nametags, - 'chest': check_chest, 'crafting': check_crafting, 'damage': check_damage, + 'chest': check_chest, 'crafting': check_crafting, 'sign': check_sign, 'damage': check_damage, 'mobs': check_mobs, 'hazards': check_hazards, 'pvp': check_pvp, 'containers': check_containers, 'feedback': check_feedback, 'trials': check_trials, 'walls': check_walls}