diff --git a/crates/horizon-client/src/block_entity_render.rs b/crates/horizon-client/src/block_entity_render.rs index ecad13fb1..280dd9d21 100644 --- a/crates/horizon-client/src/block_entity_render.rs +++ b/crates/horizon-client/src/block_entity_render.rs @@ -97,6 +97,16 @@ pub fn diffuse(normal: Vec3, lights: (Vec3, Vec3)) -> f32 { pub fn vertex_light(packed: u8) -> u32 { (u32::from(packed >> 4) * 16) | ((u32::from(packed & 15) * 16) << 8) } +/// `ChestRenderer.xmasTextures`: `SpecialDates.isExtendedChristmas` (24 to 26 +/// December in the local time zone), read once when the renderer is created. +fn extended_christmas() -> bool { + use chrono::Datelike; + static XMAS: std::sync::OnceLock = std::sync::OnceLock::new(); + *XMAS.get_or_init(|| { + let now = chrono::Local::now(); + now.month() == 12 && (24..=26).contains(&now.day()) + }) +} fn pack_color(rgb: u32, alpha: u32, brightness: f32) -> u32 { let c = |shift: u32| (((rgb >> shift) & 255) as f32 * brightness) as u32; alpha << 24 | c(0) << 16 | c(8) << 8 | c(16) @@ -1173,11 +1183,25 @@ impl BlockEntityRenderer { } } Kind::Chest { + block, texture, part, y_rot, .. } => { + // ChestRenderer.getChestMaterial: normal and trapped chests use the christmas + // sprites on 24-26 December. Copper and ender chests keep theirs. + let texture = if matches!(block.as_str(), "chest" | "trapped_chest") + && extended_christmas() + { + match part { + ChestPart::Single => "entity/chest/christmas", + ChestPart::Left => "entity/chest/christmas_left", + ChestPart::Right => "entity/chest/christmas_right", + } + } else { + *texture + }; let model = match part { ChestPart::Single => "chest", ChestPart::Left => "double_chest_left", diff --git a/crates/horizon-client/src/game/beacon.rs b/crates/horizon-client/src/game/beacon.rs index 6de017c33..710b743ac 100644 --- a/crates/horizon-client/src/game/beacon.rs +++ b/crates/horizon-client/src/game/beacon.rs @@ -563,13 +563,21 @@ impl Game<'_> { }; let time = (self.world.game_time.rem_euclid(40)) as f32 + alpha as f32; let scoping = self.scoping(); + let view = f64::from(self.settings.render_distance * 16); for (k, e) in &self.world.block_entities { let BlockEntity::Beacon(b) = e else { continue }; + // `getBeamSections` is empty while Levels is 0. if b.levels == 0 || b.sections.is_empty() { continue; } let base = glam::DVec3::new(f64::from(k.0) + 0.5, f64::from(k.1), f64::from(k.2) + 0.5); - let distance = (base - camera).truncate().length() as f32; + // `BeaconRenderer.shouldRender`: horizontal distance under render distance × 16. + let offset = base - camera; + let horizontal = glam::DVec2::new(offset.x, offset.z).length(); + if horizontal >= view { + continue; + } + let distance = horizontal as f32; let scale = if scoping { 1.0 } else { diff --git a/crates/horizon-client/src/game/frames.rs b/crates/horizon-client/src/game/frames.rs index 4b7465bd0..99e82cf6d 100644 --- a/crates/horizon-client/src/game/frames.rs +++ b/crates/horizon-client/src/game/frames.rs @@ -429,7 +429,9 @@ impl Game<'_> { if let Some(id) = map { // ItemFrameRenderer: the map fills the face, in 90-degree steps. let depth = if f.invisible { 0.5 } else { 0.4375 }; - let item_light = if f.glow { 240 | 240 << 8 } else { packed }; + // A glow frame's map is 15728850 = 0xF000D2 (sky coordinate 240, + // block coordinate 210), not full bright. + let item_light = if f.glow { 240 | 210 << 8 } else { packed }; let m = pose * glam::DMat4::from_translation(glam::DVec3::new(0.0, 0.0, depth)) * glam::DMat4::from_rotation_z( diff --git a/crates/horizon-client/src/game/item_draw.rs b/crates/horizon-client/src/game/item_draw.rs index be0ca56fb..354e837b1 100644 --- a/crates/horizon-client/src/game/item_draw.rs +++ b/crates/horizon-client/src/game/item_draw.rs @@ -82,11 +82,11 @@ fn civil(days: i64) -> (i64, u32, u32) { (yoe + era * 400 + i64::from(m <= 2), m, d) } /// `DateTimeFormatter.ofPattern(pattern).format(now)` for the month, day, -/// year and time letters item models use (UTC: no time zone database). +/// year and time letters item models use, in the system time zone +/// (`LocalTime` without a `time_zone`). pub(super) fn local_time(pattern: &str) -> String { - let secs = std::time::SystemTime::now() - .duration_since(std::time::UNIX_EPOCH) - .map_or(0, |d| d.as_secs() as i64); + let now = chrono::Local::now(); + let secs = now.timestamp() + i64::from(now.offset().local_minus_utc()); let (y, mo, d) = civil(secs.div_euclid(86_400)); let s = secs.rem_euclid(86_400); let (h, mi, se) = (s / 3600, s / 60 % 60, s % 60);