Slide slowly down the sides of honey blocks
This commit is contained in:
@@ -4544,6 +4544,32 @@ impl Game<'_> {
|
||||
MotionEvent::Fall(event) => self.landing_block_updates(&event),
|
||||
MotionEvent::Snowflake { position, velocity } => self.snowflake(position, velocity),
|
||||
MotionEvent::EnterBlock { state } => self.trigger_enter_block(state),
|
||||
MotionEvent::HoneySlide {
|
||||
pos,
|
||||
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],
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
MotionEvent::InsidePortal { pos } => self.player_inside_nether_portal(pos),
|
||||
MotionEvent::CauldronExtinguish { pos } => self.cauldron_extinguish(pos),
|
||||
MotionEvent::InsideWitherRose => self.wither_rose_contact(),
|
||||
|
||||
@@ -203,6 +203,14 @@ pub enum MotionEvent {
|
||||
bubble: bool,
|
||||
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.
|
||||
HoneySlide {
|
||||
pos: BlockPos,
|
||||
sound: bool,
|
||||
particles: bool,
|
||||
},
|
||||
/// Entity event 67 (`LivingEntity.makeDrownParticles`): eight bubbles
|
||||
/// around a drowning player.
|
||||
Drown,
|
||||
@@ -1386,6 +1394,7 @@ 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));
|
||||
@@ -1403,6 +1412,48 @@ impl MotionWorld<'_, '_, '_> {
|
||||
}
|
||||
Ok(iterations + 1)
|
||||
}
|
||||
/// `HoneyBlock.entityInside`: a falling player touching a side of the block
|
||||
/// slides down it (`isSlidingDown`, `doSlideMovement`, `maybeDoSlideEffects`).
|
||||
fn honey_block_inside(&mut self, pos: BlockPos) -> Result<()> {
|
||||
let old_delta_y = |dy: f64| dy / f64::from(0.98_f32) + 0.08;
|
||||
let new_delta_y = |dy: f64| (dy - 0.08) * f64::from(0.98_f32);
|
||||
let position = self.player.position;
|
||||
let velocity = self.player.velocity;
|
||||
if self.player.ground.on_ground
|
||||
|| position.y > f64::from(pos.y) + 0.9375 - 1.0e-7
|
||||
|| old_delta_y(velocity.y) >= -0.08
|
||||
{
|
||||
return Ok(());
|
||||
}
|
||||
let dx = (f64::from(pos.x) + 0.5 - position.x).abs();
|
||||
let dz = (f64::from(pos.z) + 0.5 - position.z).abs();
|
||||
let overlap = 0.4375 + f64::from(self.player.dimensions.width / 2.0);
|
||||
if !(dx + 1.0e-7 > overlap || dz + 1.0e-7 > overlap) {
|
||||
return Ok(());
|
||||
}
|
||||
// doSlideMovement
|
||||
let old = old_delta_y(velocity.y);
|
||||
if old < -0.13 {
|
||||
let factor = -0.05 / old;
|
||||
self.player.velocity =
|
||||
Vec3::new(velocity.x * factor, new_delta_y(-0.05), velocity.z * factor);
|
||||
} else {
|
||||
self.player.velocity = Vec3::new(velocity.x, new_delta_y(-0.05), velocity.z);
|
||||
}
|
||||
self.player.fall_distance = 0.0;
|
||||
// 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;
|
||||
if sound || particles {
|
||||
self.player.events.push(MotionEvent::HoneySlide {
|
||||
pos,
|
||||
sound,
|
||||
particles,
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
/// `Player.makeStuckInBlock`: the next move is scaled by `multiplier`
|
||||
/// (and the fall forgotten) unless flying; the impulse context resets
|
||||
/// either way.
|
||||
|
||||
Reference in New Issue
Block a user