Creative search tab: number keys over a slot move its item to the hotbar
CreativeModeInventoryScreen.keyPressed on the search tab tries the hotbar keys on the hovered slot before the search box: a digit or keypad key bound to key.hotbar.N swaps when the cursor is over a slot holding an item, or any slot that is not a display slot, and the cursor stack is empty (checkHotbarKeyPressed). Over an empty display slot, outside every slot or with a stack held, the key still types. Horizon sent every key to the search box (#1460). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -425,6 +425,29 @@ fn split_id(id: &str) -> (String, String) {
|
||||
None => ("minecraft".to_owned(), id.to_owned()),
|
||||
}
|
||||
}
|
||||
/// The slot under the cursor, for the search tab's keys.
|
||||
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
|
||||
pub enum Hover {
|
||||
Nothing,
|
||||
/// A display slot (`isCreativeSlot`), showing an item or past the end.
|
||||
Display {
|
||||
filled: bool,
|
||||
},
|
||||
/// Any other slot: the hotbar row, or the inventory tab's slots.
|
||||
Slot,
|
||||
}
|
||||
|
||||
/// `CreativeModeInventoryScreen.keyPressed` on the search tab: whether a
|
||||
/// key is a hotbar swap on the hovered slot instead of text for the search
|
||||
/// box. `numeric` is `getNumericKeyValue().isPresent()` (the digit and keypad
|
||||
/// keys); `hotbar_key` is a `keyHotbarSlots` key. Over an empty display slot
|
||||
/// the key types (`doQuickSwap` is false), and `checkHotbarKeyPressed` needs
|
||||
/// a hovered slot and an empty cursor.
|
||||
pub fn search_key_swaps(numeric: bool, hotbar_key: bool, hover: Hover, carrying: bool) -> bool {
|
||||
let quick_swap = hover != Hover::Display { filled: false };
|
||||
quick_swap && numeric && hotbar_key && !carrying && hover != Hover::Nothing
|
||||
}
|
||||
|
||||
/// What a click on an item tab's display slot does besides changing the
|
||||
/// carried stack.
|
||||
#[derive(Clone, PartialEq, Debug)]
|
||||
@@ -529,6 +552,22 @@ mod tests {
|
||||
(carried, effect)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn search_tab_number_keys_swap_over_a_slot_before_typing() {
|
||||
let filled = Hover::Display { filled: true };
|
||||
let empty = Hover::Display { filled: false };
|
||||
// Over an item, the hotbar row or another slot: the hotbar swap.
|
||||
assert!(search_key_swaps(true, true, filled, false));
|
||||
assert!(search_key_swaps(true, true, Hover::Slot, false));
|
||||
// Over an empty display slot, nothing or with a carried stack: text.
|
||||
assert!(!search_key_swaps(true, true, empty, false));
|
||||
assert!(!search_key_swaps(true, true, Hover::Nothing, false));
|
||||
assert!(!search_key_swaps(true, true, filled, true));
|
||||
// Letters always type; so do the digits no hotbar key is bound to.
|
||||
assert!(!search_key_swaps(false, false, filled, false));
|
||||
assert!(!search_key_swaps(true, false, filled, false));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn display_slot_clicks_follow_slot_clicked() {
|
||||
use crate::menu::Input::*;
|
||||
|
||||
@@ -5955,6 +5955,37 @@ impl Game<'_> {
|
||||
}
|
||||
true
|
||||
}
|
||||
/// `CreativeModeInventoryScreen.keyPressed` on the search tab: a hotbar
|
||||
/// key over a slot swaps before the search box sees it.
|
||||
fn search_tab_hotbar_key(&mut self, code: KeyCode) -> bool {
|
||||
use horizon_client::creative::{Hover, search_key_swaps};
|
||||
let hotbar_key = HOTBAR_DIGITS.contains(&code);
|
||||
let numeric = hotbar_key || NUMERIC_KEYS.contains(&code);
|
||||
if !numeric {
|
||||
return false;
|
||||
}
|
||||
let Some(size) = self
|
||||
.renderer
|
||||
.as_ref()
|
||||
.map(|r| [r.config.width, r.config.height])
|
||||
else {
|
||||
return false;
|
||||
};
|
||||
let batch = HudBatch::new(size);
|
||||
let hover = match self.slot_at(&batch, self.cursor.0, self.cursor.1) {
|
||||
None => Hover::Nothing,
|
||||
Some(slot) if slot >= Creative::DISPLAY => {
|
||||
let first = self.creative_screen.first_row(&self.pack.names);
|
||||
let shown = self.creative_screen.items(&self.pack.names).len();
|
||||
Hover::Display {
|
||||
filled: first * 9 + slot - Creative::DISPLAY < shown,
|
||||
}
|
||||
}
|
||||
Some(_) => Hover::Slot,
|
||||
};
|
||||
search_key_swaps(numeric, hotbar_key, hover, self.carried.is_some())
|
||||
&& self.inventory_hotkey(code)
|
||||
}
|
||||
/// Number keys, F and Q over a slot of the open menu: SWAP with a hotbar
|
||||
/// slot or the off hand, THROW one or the whole stack.
|
||||
fn inventory_hotkey(&mut self, key: KeyCode) -> bool {
|
||||
@@ -5970,19 +6001,7 @@ impl Game<'_> {
|
||||
let Some(slot) = self.slot_at(&batch, self.cursor.0, self.cursor.1) else {
|
||||
return false;
|
||||
};
|
||||
let digit = [
|
||||
KeyCode::Digit1,
|
||||
KeyCode::Digit2,
|
||||
KeyCode::Digit3,
|
||||
KeyCode::Digit4,
|
||||
KeyCode::Digit5,
|
||||
KeyCode::Digit6,
|
||||
KeyCode::Digit7,
|
||||
KeyCode::Digit8,
|
||||
KeyCode::Digit9,
|
||||
]
|
||||
.iter()
|
||||
.position(|k| *k == key);
|
||||
let digit = HOTBAR_DIGITS.iter().position(|k| *k == key);
|
||||
let done = match (digit, key) {
|
||||
(Some(n), _) => self.menu_click(Some(slot), n as i32, Input::Swap),
|
||||
(None, KeyCode::KeyF) => self.menu_click(Some(slot), 40, Input::Swap),
|
||||
@@ -10267,6 +10286,11 @@ impl Game<'_> {
|
||||
if (self.screen == Screen::Inventory
|
||||
|| (self.screen == Screen::Creative && !self.creative_screen.tab().search))
|
||||
&& self.inventory_hotkey(key) => {}
|
||||
// The search tab's number keys (scripted presses; the window's
|
||||
// keys reach search_tab_hotbar_key before the search box).
|
||||
_ if self.screen == Screen::Creative
|
||||
&& self.creative_screen.tab().search
|
||||
&& self.search_tab_hotbar_key(key) => {}
|
||||
KeyCode::KeyT if self.screen == Screen::Inventory => self.recipe_focus_search(),
|
||||
KeyCode::KeyT if self.screen == Screen::Playing => self.open_chat(""),
|
||||
// key.advancements.
|
||||
@@ -11138,7 +11162,11 @@ impl ApplicationHandler for Game<'_> {
|
||||
&& event.state == ElementState::Pressed
|
||||
&& !matches!(event.physical_key, PhysicalKey::Code(KeyCode::Escape)) =>
|
||||
{
|
||||
if let Some(shortcut) = self.edit_shortcut(&event) {
|
||||
if let PhysicalKey::Code(key) = event.physical_key
|
||||
&& self.search_tab_hotbar_key(key)
|
||||
{
|
||||
// The hovered slot took the key (`ignoreTextInput`).
|
||||
} else if let Some(shortcut) = self.edit_shortcut(&event) {
|
||||
self.creative_search_shortcut(shortcut);
|
||||
} else {
|
||||
let backspace = event.physical_key == PhysicalKey::Code(KeyCode::Backspace);
|
||||
@@ -12065,6 +12093,33 @@ impl Game<'_> {
|
||||
}
|
||||
}
|
||||
|
||||
/// `key.hotbar.1` to `key.hotbar.9` in a menu.
|
||||
const HOTBAR_DIGITS: [KeyCode; 9] = [
|
||||
KeyCode::Digit1,
|
||||
KeyCode::Digit2,
|
||||
KeyCode::Digit3,
|
||||
KeyCode::Digit4,
|
||||
KeyCode::Digit5,
|
||||
KeyCode::Digit6,
|
||||
KeyCode::Digit7,
|
||||
KeyCode::Digit8,
|
||||
KeyCode::Digit9,
|
||||
];
|
||||
/// The other keys `InputConstants.Key.getNumericKeyValue` gives a digit.
|
||||
const NUMERIC_KEYS: [KeyCode; 11] = [
|
||||
KeyCode::Digit0,
|
||||
KeyCode::Numpad0,
|
||||
KeyCode::Numpad1,
|
||||
KeyCode::Numpad2,
|
||||
KeyCode::Numpad3,
|
||||
KeyCode::Numpad4,
|
||||
KeyCode::Numpad5,
|
||||
KeyCode::Numpad6,
|
||||
KeyCode::Numpad7,
|
||||
KeyCode::Numpad8,
|
||||
KeyCode::Numpad9,
|
||||
];
|
||||
|
||||
const STAGES: u32 = 10;
|
||||
const STAGE_LINES: [&str; 10] = [
|
||||
"Loading menu",
|
||||
|
||||
Reference in New Issue
Block a user