Slide on honey for the server's player and show the slide effects to multiplayer clients
This commit is contained in:
@@ -2097,6 +2097,33 @@ impl Game<'_> {
|
||||
}
|
||||
/// `TerrainParticle` at `pos`: the model's particle sprite and tint source
|
||||
/// 0's `colorAsTerrainParticle` (white when the block has none).
|
||||
/// `HoneyBlock.showSlideParticles` (entity event 53): five honey block
|
||||
/// particles at the entity.
|
||||
fn honey_slide_particles(&mut self, at: [f64; 3]) {
|
||||
use horizon_client::particles::{ParticleOptions, ParticleType};
|
||||
let Some(honey) = self
|
||||
.pack
|
||||
.assets
|
||||
.registry
|
||||
.default_state("minecraft:honey_block")
|
||||
else {
|
||||
return;
|
||||
};
|
||||
let block = [
|
||||
at[0].floor() as i32,
|
||||
at[1].floor() as i32,
|
||||
at[2].floor() as i32,
|
||||
];
|
||||
if let Some((sprite, tint)) = self.particle_sprite(honey, block) {
|
||||
for _ in 0..5 {
|
||||
self.particles.add(
|
||||
&ParticleOptions::block(ParticleType::Block, sprite.clone(), tint),
|
||||
at,
|
||||
[0.0; 3],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
fn particle_sprite(&self, state: BlockStateId, pos: [i32; 3]) -> Option<(String, u32)> {
|
||||
let sprite = Self::block_particle_sprite(&self.pack, state)?;
|
||||
let chunks = &self.world.chunks;
|
||||
@@ -4545,28 +4572,18 @@ impl Game<'_> {
|
||||
MotionEvent::Snowflake { position, velocity } => self.snowflake(position, velocity),
|
||||
MotionEvent::EnterBlock { state } => self.trigger_enter_block(state),
|
||||
MotionEvent::HoneySlide {
|
||||
pos,
|
||||
sound,
|
||||
particles,
|
||||
sound, particles, ..
|
||||
} => {
|
||||
if sound {
|
||||
self.audio
|
||||
.play("minecraft:block.honey_block.slide", Some(feet), 1.0, 1.0);
|
||||
}
|
||||
// HoneyBlock.showSlideParticles: five block particles.
|
||||
if particles
|
||||
&& let Some((sprite, tint)) = self.particle_sprite(
|
||||
self.world.block(pos.x, pos.y, pos.z),
|
||||
[pos.x, pos.y, pos.z],
|
||||
)
|
||||
{
|
||||
use horizon_client::particles::{ParticleOptions, ParticleType};
|
||||
for _ in 0..5 {
|
||||
self.particles.add(
|
||||
&ParticleOptions::block(ParticleType::Block, sprite.clone(), tint),
|
||||
feet,
|
||||
[0.0; 3],
|
||||
);
|
||||
if particles {
|
||||
self.honey_slide_particles(feet);
|
||||
// The server's event 53 reaches the guests too.
|
||||
let id = self.lan.as_ref().map(|h| h.host_entity);
|
||||
if let Some(id) = id {
|
||||
self.lan_entity_event(id, 53, feet);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2311,6 +2311,27 @@ impl Game<'_> {
|
||||
match event {
|
||||
MotionEvent::HurtSound(sound) => self.player_hurt_sound(sound, at),
|
||||
MotionEvent::Fall(event) => self.landing_block_updates(&event),
|
||||
// HoneyBlock.maybeDoSlideEffects: the sound reaches the
|
||||
// others (Player.playSound excludes the player, whose client
|
||||
// plays it), the entity event 53 everyone around.
|
||||
MotionEvent::HoneySlide {
|
||||
sound, particles, ..
|
||||
} => {
|
||||
let Some((id, at)) = host.hub.guest(conn).map(|g| (g.entity_id, g.position))
|
||||
else {
|
||||
continue;
|
||||
};
|
||||
if sound {
|
||||
let name = "minecraft:block.honey_block.slide";
|
||||
let source = horizon_client::settings::sound_source(name) as i32;
|
||||
self.audio.play_unshared(name, Some(at), 1.0, 1.0);
|
||||
host.hub.sound(name, at, 1.0, 1.0, source, Some(conn));
|
||||
}
|
||||
if particles {
|
||||
self.honey_slide_particles(at);
|
||||
host.hub.entity_event(id, 53, at);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2133,6 +2133,23 @@ impl Game<'_> {
|
||||
if p.event == super::totem::TOTEM_EVENT {
|
||||
self.remote_totem(p.id);
|
||||
}
|
||||
// Entity event 53: the honey slide particles of a player
|
||||
// sliding down a honey block (HoneyBlock.showSlideParticles).
|
||||
if p.event == 53 {
|
||||
let at = if self.remote.as_ref().is_some_and(|r| r.entity_id == p.id) {
|
||||
self.player
|
||||
.as_ref()
|
||||
.map(|q| [q.position.x, q.position.y, q.position.z])
|
||||
} else {
|
||||
self.mobs
|
||||
.iter()
|
||||
.find(|m| m.id == p.id as u32)
|
||||
.map(|m| [m.position.x, m.position.y, m.position.z])
|
||||
};
|
||||
if let Some(at) = at {
|
||||
self.honey_slide_particles(at);
|
||||
}
|
||||
}
|
||||
}
|
||||
C::Animate(p) => self.remote_animate(p.id, p.action),
|
||||
// ClientPacketListener.handleSwingAnimation: the entity swings
|
||||
@@ -3326,6 +3343,13 @@ impl Game<'_> {
|
||||
horizon_client::motion::MotionEvent::InsidePortal { .. } => {
|
||||
self.client_inside_nether_portal();
|
||||
}
|
||||
// HoneyBlock.maybeDoSlideEffects on the client's own level:
|
||||
// the slide sound, heard here (LocalPlayer.playSound); the
|
||||
// particles come from the server's event 53.
|
||||
horizon_client::motion::MotionEvent::HoneySlide { sound: true, .. } => {
|
||||
self.audio
|
||||
.play("minecraft:block.honey_block.slide", Some(feet), 1.0, 1.0);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -204,8 +204,8 @@ pub enum MotionEvent {
|
||||
position: Vec3,
|
||||
},
|
||||
/// `HoneyBlock.maybeDoSlideEffects` for a player sliding down the side of
|
||||
/// the honey block at `pos`: its slide sound, and the client's five
|
||||
/// block particles (entity event 53) at the player.
|
||||
/// the honey block at `pos`: its slide sound, and the server's entity
|
||||
/// event 53 (the five block particles at the player).
|
||||
HoneySlide {
|
||||
pos: BlockPos,
|
||||
sound: bool,
|
||||
@@ -1381,6 +1381,9 @@ impl MotionWorld<'_, '_, '_> {
|
||||
"minecraft:sweet_berry_bush" if damage_only => {
|
||||
self.sweet_berry_bush_damage(state)?;
|
||||
}
|
||||
// HoneyBlock.entityInside: a server's player slides too, so
|
||||
// its fall distance resets (its client moves it).
|
||||
"minecraft:honey_block" => self.honey_block_inside(p)?,
|
||||
// PowderSnowBlock.entityInside's FREEZE.
|
||||
"minecraft:powder_snow" if damage_only => entered.push((step, p)),
|
||||
_ => {}
|
||||
@@ -1394,7 +1397,6 @@ impl MotionWorld<'_, '_, '_> {
|
||||
entered.push((step, p));
|
||||
}
|
||||
"minecraft:cobweb" => self.web_inside(),
|
||||
"minecraft:honey_block" => self.honey_block_inside(p)?,
|
||||
"minecraft:sweet_berry_bush" => self.sweet_berry_bush_inside(state)?,
|
||||
"minecraft:bubble_column" => {
|
||||
let precise = moved_far || deflated.intersects(Aabb::block(p));
|
||||
@@ -1444,7 +1446,9 @@ impl MotionWorld<'_, '_, '_> {
|
||||
// maybeDoSlideEffects: the sound, then the server's event 53.
|
||||
let random = &mut self.scene.random;
|
||||
let sound = random.next_int_bound(5).map_err(|e| format!("{e:?}"))? == 0;
|
||||
let particles = random.next_int_bound(5).map_err(|e| format!("{e:?}"))? == 0;
|
||||
// Only the server broadcasts event 53 (`!level.isClientSide()`).
|
||||
let particles = !self.player.client_side
|
||||
&& random.next_int_bound(5).map_err(|e| format!("{e:?}"))? == 0;
|
||||
if sound || particles {
|
||||
self.player.events.push(MotionEvent::HoneySlide {
|
||||
pos,
|
||||
|
||||
Reference in New Issue
Block a user