aboutsummaryrefslogtreecommitdiff
path: root/azalea-protocol/src/common
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2026-02-19 03:19:05 +0800
committermat <git@matdoes.dev>2026-02-19 03:19:05 +0800
commit3053238279fccfefc35fc5fe9ff3b0be0185e4fb (patch)
tree5d9619a90b892d50b7d44f10a20dcc42b9afa4c9 /azalea-protocol/src/common
parent8d718a627349bdf1e531fba318abc634a3bec9da (diff)
downloadazalea-drasl-3053238279fccfefc35fc5fe9ff3b0be0185e4fb.tar.xz
fix incorrect protocol impls for ClientboundPlayerInfoUpdate and recipe packets
Diffstat (limited to 'azalea-protocol/src/common')
-rw-r--r--azalea-protocol/src/common/recipe.rs16
1 files changed, 8 insertions, 8 deletions
diff --git a/azalea-protocol/src/common/recipe.rs b/azalea-protocol/src/common/recipe.rs
index 9a59cc4b..e0e10ecc 100644
--- a/azalea-protocol/src/common/recipe.rs
+++ b/azalea-protocol/src/common/recipe.rs
@@ -1,8 +1,8 @@
use azalea_buf::AzBuf;
use azalea_inventory::ItemStack;
-use azalea_registry::{HolderSet, builtin::ItemKind, identifier::Identifier};
+use azalea_registry::{HolderSet, builtin::ItemKind, data::TrimPattern, identifier::Identifier};
-/// [`azalea_registry::RecipeDisplay`]
+/// [`azalea_registry::builtin::RecipeDisplay`]
#[derive(AzBuf, Clone, Debug, PartialEq)]
pub enum RecipeDisplayData {
Shapeless(ShapelessCraftingRecipeDisplay),
@@ -58,21 +58,21 @@ pub struct Ingredient {
pub allowed: HolderSet<ItemKind, Identifier>,
}
-/// [`azalea_registry::SlotDisplay`]
+/// [`azalea_registry::builtin::SlotDisplay`]
#[derive(AzBuf, Clone, Debug, PartialEq)]
pub enum SlotDisplayData {
Empty,
AnyFuel,
- ItemKind(ItemStackDisplay),
+ Item(ItemSlotDisplay),
ItemStack(ItemStackSlotDisplay),
- Tag(Identifier),
+ Tag(TagSlotDisplay),
SmithingTrim(Box<SmithingTrimDemoSlotDisplay>),
WithRemainder(Box<WithRemainderSlotDisplay>),
Composite(CompositeSlotDisplay),
}
#[derive(AzBuf, Clone, Debug, PartialEq)]
-pub struct ItemStackDisplay {
+pub struct ItemSlotDisplay {
pub item: ItemKind,
}
#[derive(AzBuf, Clone, Debug, PartialEq)]
@@ -81,13 +81,13 @@ pub struct ItemStackSlotDisplay {
}
#[derive(AzBuf, Clone, Debug, PartialEq)]
pub struct TagSlotDisplay {
- pub tag: ItemKind,
+ pub tag: Identifier,
}
#[derive(AzBuf, Clone, Debug, PartialEq)]
pub struct SmithingTrimDemoSlotDisplay {
pub base: SlotDisplayData,
pub material: SlotDisplayData,
- pub pattern: SlotDisplayData,
+ pub pattern: TrimPattern,
}
#[derive(AzBuf, Clone, Debug, PartialEq)]
pub struct WithRemainderSlotDisplay {