Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1.21.5 #198

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ resolver = "2"
# --- Workspace Settings ---

[workspace.package]
version = "0.11.0+mc1.21.4"
version = "0.11.0+mc25w03a"
edition = "2021"
license = "MIT"
repository = "https://github.com/azalea-rs/azalea"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ A collection of Rust crates for making Minecraft bots, clients, and tools.

<!-- The line below is automatically read and updated by the migrate script, so don't change it manually. -->

_Currently supported Minecraft version: `1.21.4`._
_Currently supported Minecraft version: `25w03a`._

> [!WARNING]
> Azalea is still unfinished, though most crates are in a useable state
Expand Down
38 changes: 36 additions & 2 deletions azalea-block/src/generated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,11 @@ make_block_states! {
"south" => South(bool),
"up" => Up(bool),
"west" => West(bool),
"active" => Active(bool),
"creaking_heart_state" => CreakingHeartState {
Uprooted,
Dormant,
Awake,
},
"natural" => Natural(bool),
"half" => TopBottom {
Top,
Expand Down Expand Up @@ -1714,6 +1718,12 @@ make_block_states! {
NorthUp,
SouthUp,
},
"test_block_mode" => TestBlockMode {
Start,
Log,
Fail,
Accept,
},
"level" => ComposterLevel {
_0,
_1,
Expand Down Expand Up @@ -1958,6 +1968,18 @@ make_block_states! {
_3,
_4,
},
"flower_amount" => WildflowersFlowerAmount {
_1,
_2,
_3,
_4,
},
"segment_amount" => LeafLitterSegmentAmount {
_1,
_2,
_3,
_4,
},
"tilt" => Tilt {
None,
Unstable,
Expand Down Expand Up @@ -2438,8 +2460,8 @@ make_block_states! {
soul_fire => BlockBehavior::new(), {},
spawner => BlockBehavior::new().requires_correct_tool_for_drops().strength(5.0, 5.0), {},
creaking_heart => BlockBehavior::new(), {
"active": Active(false),
"axis": Axis::Y,
"creaking_heart_state": CreakingHeartState::Uprooted,
"natural": Natural(false),
},
oak_stairs => BlockBehavior::new().strength(2.0, 3.0), {
Expand Down Expand Up @@ -4776,6 +4798,10 @@ make_block_states! {
jigsaw => BlockBehavior::new().requires_correct_tool_for_drops().strength(-1.0, 3600000.0), {
"orientation": Orientation::NorthUp,
},
test_block => BlockBehavior::new(), {
"test_block_mode": TestBlockMode::Start,
},
test_instance_block => BlockBehavior::new(), {},
composter => BlockBehavior::new().strength(0.6, 0.6), {
"level": ComposterLevel::_0,
},
Expand Down Expand Up @@ -5419,6 +5445,14 @@ make_block_states! {
"facing": FacingCardinal::North,
"flower_amount": PinkPetalsFlowerAmount::_1,
},
wildflowers => BlockBehavior::new(), {
"facing": FacingCardinal::North,
"flower_amount": WildflowersFlowerAmount::_1,
},
leaf_litter => BlockBehavior::new(), {
"facing": FacingCardinal::North,
"segment_amount": LeafLitterSegmentAmount::_1,
},
moss_block => BlockBehavior::new().strength(0.1, 0.1), {},
big_dripleaf => BlockBehavior::new().strength(0.1, 0.1), {
"facing": FacingCardinal::North,
Expand Down
2 changes: 1 addition & 1 deletion azalea-client/src/packet_handling/game.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1167,7 +1167,6 @@ pub fn process_packet_events(ecs: &mut World) {
ClientboundGamePacket::UpdateMobEffect(p) => {
debug!("Got update mob effect packet {p:?}");
}
ClientboundGamePacket::AddExperienceOrb(_) => {}
ClientboundGamePacket::AwardStats(_) => {}
ClientboundGamePacket::BlockChangedAck(_) => {}
ClientboundGamePacket::BlockDestruction(_) => {}
Expand Down Expand Up @@ -1567,6 +1566,7 @@ pub fn process_packet_events(ecs: &mut World) {
ClientboundGamePacket::RecipeBookAdd(_) => {}
ClientboundGamePacket::RecipeBookRemove(_) => {}
ClientboundGamePacket::RecipeBookSettings(_) => {}
ClientboundGamePacket::TestInstanceBlockStatus(_) => {}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions azalea-core/src/position.rs
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,18 @@ impl BlockPos {
}
}

/// Similar to [`BlockPos`] but it's serialized as 3 varints instead of one
/// 64-bit integer, so it can represent a bigger range of numbers.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, AzBuf)]
pub struct Vec3i {
#[var]
pub x: i32,
#[var]
pub y: i32,
#[var]
pub z: i32,
}

/// Chunk coordinates are used to represent where a chunk is in the world. You
/// can convert the x and z to block coordinates by multiplying them by 16.
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
Expand Down
3 changes: 2 additions & 1 deletion azalea-entity/src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub enum EntityDataValue {
BlockPos(BlockPos),
OptionalBlockPos(Option<BlockPos>),
Direction(Direction),
OptionalUuid(Option<Uuid>),
OptionalLivingEntityReference(Option<Uuid>),
BlockState(azalea_block::BlockState),
/// If this is air, that means it's absent,
OptionalBlockState(azalea_block::BlockState),
Expand All @@ -84,6 +84,7 @@ pub enum EntityDataValue {
CatVariant(azalea_registry::CatVariant),
WolfVariant(azalea_registry::WolfVariant),
FrogVariant(azalea_registry::FrogVariant),
PigVariant(azalea_registry::PigVariant),
OptionalGlobalPos(Option<GlobalPos>),
PaintingVariant(azalea_registry::PaintingVariant),
SnifferState(SnifferStateKind),
Expand Down
Loading
Loading