diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2023-05-03 20:57:27 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-03 20:57:27 -0500 |
| commit | 634cb8d72c6608512aedba19e5cd669104bc35ea (patch) | |
| tree | f8e76ce9eb43403d29cc0cbcf9a4f51522419dc2 /azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs | |
| parent | 1fb4418f2c9cbd004c64c2f23d2d0352ee12c0e5 (diff) | |
| download | azalea-drasl-634cb8d72c6608512aedba19e5cd669104bc35ea.tar.xz | |
Inventory (#48)
* start adding azalea-inventory
* design more of how inventories are defined
* start working on az-inv-macros
* inventory macro works
* start adding inventory codegen
* update some deps
* add inventory codegen
* manually write inventory menus
* put the inventories in Client
* start on containersetcontent
* inventory menu should hopefully work
* checks in containersetcontent
* format a comment
* move some variant matches
* inventory.rs
* inventory stuff
* more inventory stuff
* inventory/container tracking works
* start adding interact function
* sequence number
* start adding HitResultComponent
* implement traverse_blocks
* start adding clip
* add clip function
* update_hit_result_component
* start trying to fix
* fix
* make some stuff simpler
* clippy
* lever
* chest
* container handle
* fix ambiguity
* fix some doc tests
* move some container stuff from az-client to azalea
* clicking container
* start implementing simulate_click
* keep working on simulate click
* implement more of simulate_click
this is really boring
* inventory fixes
* start implementing shift clicking
* fix panic in azalea-chat i hope
* shift clicking implemented
* more inventory stuff
* fix items not showing in containers sometimes
* fix test
* fix all warnings
* remove a println
---------
Co-authored-by: mat <git@matdoes.dev>
Diffstat (limited to 'azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs')
| -rwxr-xr-x | azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs index 318adb7f..94fe31c1 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs @@ -1,7 +1,8 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; -use azalea_core::{ResourceLocation, Slot}; +use azalea_core::ResourceLocation; +use azalea_inventory::ItemSlot; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::RecipeSerializer; @@ -26,7 +27,7 @@ pub struct ShapelessRecipe { pub group: String, pub category: CraftingBookCategory, pub ingredients: Vec<Ingredient>, - pub result: Slot, + pub result: ItemSlot, } #[derive(Clone, Debug)] pub struct ShapedRecipe { @@ -35,7 +36,7 @@ pub struct ShapedRecipe { pub group: String, pub category: CraftingBookCategory, pub ingredients: Vec<Ingredient>, - pub result: Slot, + pub result: ItemSlot, pub show_notification: bool, } @@ -71,7 +72,7 @@ impl McBufReadable for ShapedRecipe { for _ in 0..width * height { ingredients.push(Ingredient::read_from(buf)?); } - let result = Slot::read_from(buf)?; + let result = ItemSlot::read_from(buf)?; let show_notification = bool::read_from(buf)?; Ok(ShapedRecipe { @@ -91,7 +92,7 @@ pub struct CookingRecipe { pub group: String, pub category: CraftingBookCategory, pub ingredient: Ingredient, - pub result: Slot, + pub result: ItemSlot, pub experience: f32, #[var] pub cooking_time: u32, @@ -100,13 +101,13 @@ pub struct CookingRecipe { pub struct StoneCutterRecipe { pub group: String, pub ingredient: Ingredient, - pub result: Slot, + pub result: ItemSlot, } #[derive(Clone, Debug, McBuf)] pub struct SmithingRecipe { pub base: Ingredient, pub addition: Ingredient, - pub result: Slot, + pub result: ItemSlot, } #[derive(Clone, Debug, McBuf)] @@ -119,7 +120,7 @@ pub struct SmithingTransformRecipe { pub template: Ingredient, pub base: Ingredient, pub addition: Ingredient, - pub result: Slot, + pub result: ItemSlot, } #[derive(Clone, Debug, McBuf)] @@ -159,7 +160,7 @@ pub enum RecipeData { #[derive(Clone, Debug, McBuf)] pub struct Ingredient { - pub allowed: Vec<Slot>, + pub allowed: Vec<ItemSlot>, } impl McBufWritable for Recipe { |
