diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2024-11-27 19:31:40 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-27 19:31:40 -0600 |
| commit | 08958c2278b15ebeac8a964f392ebb792e479b61 (patch) | |
| tree | 4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea-client/src/attack.rs | |
| parent | 139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff) | |
| download | azalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz | |
Refactor azalea-protocol (#190)
* start updating to 1.21.4
* fix block codegen and stop using block data from burger
* rename packet related modules and structs to be simpler
* ItemSlot -> ItemStack for more consistency with mojmap
* .get() -> .into_packet()
* simplify declare_state_packets by removing packet ids
* rename read_from and write_into to azalea_read and azalea_write
* rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite
* McBuf -> AzBuf
* remove most uses of into_variant
* update codegen and use resourcelocation names for packets
* implement #[limit(i)] attribute for AzBuf derive macro
* fixes for 1.21.4
* fix examples
* update some physics code and fix ChatType
* remove unused imports in codegen
* re-add some things to migrate.py and update +mc version numbers automatically
* downgrade to 1.21.3 lol
Diffstat (limited to 'azalea-client/src/attack.rs')
| -rw-r--r-- | azalea-client/src/attack.rs | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/azalea-client/src/attack.rs b/azalea-client/src/attack.rs index a28f800d..b1b36b69 100644 --- a/azalea-client/src/attack.rs +++ b/azalea-client/src/attack.rs @@ -4,9 +4,7 @@ use azalea_entity::{ update_bounding_box, Attributes, Physics, }; use azalea_physics::PhysicsSet; -use azalea_protocol::packets::game::serverbound_interact_packet::{ - self, ServerboundInteractPacket, -}; +use azalea_protocol::packets::game::s_interact::{self, ServerboundInteract}; use azalea_world::MinecraftEntityId; use bevy_app::{App, Plugin, Update}; use bevy_ecs::prelude::*; @@ -85,15 +83,14 @@ pub fn handle_attack_event( swing_arm_event.send(SwingArmEvent { entity: event.entity, }); - send_packet_events.send(SendPacketEvent { - entity: event.entity, - packet: ServerboundInteractPacket { + send_packet_events.send(SendPacketEvent::new( + event.entity, + ServerboundInteract { entity_id: *event.target, - action: serverbound_interact_packet::ActionType::Attack, + action: s_interact::ActionType::Attack, using_secondary_action: **sneaking, - } - .get(), - }); + }, + )); // we can't attack if we're in spectator mode but it still sends the attack // packet |