diff options
| author | mat <git@matdoes.dev> | 2023-06-12 14:38:40 -0500 |
|---|---|---|
| committer | mat <git@matdoes.dev> | 2023-06-12 14:38:40 -0500 |
| commit | 5f8e5be4dcbcb425d87ae2a1dee5ba5ef4484c10 (patch) | |
| tree | df134f8abfd0723a19998ac07e8be806619f41bc /azalea-inventory/src | |
| parent | bc7e0ab53739f59f68f860ba75973908ffc5b560 (diff) | |
| parent | 49f951688e4ab117ee2719a9db573bd731c4748a (diff) | |
| download | azalea-drasl-5f8e5be4dcbcb425d87ae2a1dee5ba5ef4484c10.tar.xz | |
Merge branch '1.20'
Diffstat (limited to 'azalea-inventory/src')
| -rw-r--r-- | azalea-inventory/src/lib.rs | 5 | ||||
| -rw-r--r-- | azalea-inventory/src/operations.rs | 17 |
2 files changed, 3 insertions, 19 deletions
diff --git a/azalea-inventory/src/lib.rs b/azalea-inventory/src/lib.rs index 518c7a1d..29d06fd9 100644 --- a/azalea-inventory/src/lib.rs +++ b/azalea-inventory/src/lib.rs @@ -144,11 +144,6 @@ declare_menus! { ShulkerBox { contents: 27, }, - LegacySmithing { - input: 1, - additional: 1, - result: 1, - }, Smithing { template: 1, base: 1, diff --git a/azalea-inventory/src/operations.rs b/azalea-inventory/src/operations.rs index 1379b8a9..8d81b18e 100644 --- a/azalea-inventory/src/operations.rs +++ b/azalea-inventory/src/operations.rs @@ -8,9 +8,9 @@ use crate::{ EnchantmentMenuLocation, FurnaceMenuLocation, Generic3x3MenuLocation, Generic9x1MenuLocation, Generic9x2MenuLocation, Generic9x3MenuLocation, Generic9x4MenuLocation, Generic9x5MenuLocation, Generic9x6MenuLocation, GrindstoneMenuLocation, HopperMenuLocation, ItemSlot, ItemSlotData, - LecternMenuLocation, LegacySmithingMenuLocation, LoomMenuLocation, Menu, MenuLocation, - MerchantMenuLocation, Player, PlayerMenuLocation, ShulkerBoxMenuLocation, SmithingMenuLocation, - SmokerMenuLocation, StonecutterMenuLocation, + LecternMenuLocation, LoomMenuLocation, Menu, MenuLocation, MerchantMenuLocation, Player, + PlayerMenuLocation, ShulkerBoxMenuLocation, SmithingMenuLocation, SmokerMenuLocation, + StonecutterMenuLocation, }; #[derive(Debug, Clone)] @@ -527,17 +527,6 @@ impl Menu { self.try_move_item_to_slots(slot_index, self.player_slots_range()); } }, - MenuLocation::LegacySmithing(l) => match l { - LegacySmithingMenuLocation::Player => { - self.try_move_item_to_slots_or_toggle_hotbar( - slot_index, - Menu::LEGACY_SMITHING_INPUT_SLOT..=Menu::LEGACY_SMITHING_ADDITIONAL_SLOT, - ); - } - _ => { - self.try_move_item_to_slots(slot_index, self.player_slots_range()); - } - }, MenuLocation::Smithing(l) => match l { SmithingMenuLocation::Player => { self.try_move_item_to_slots_or_toggle_hotbar( |