diff --git a/crates/horizon-client/examples/arrow_probe.rs b/crates/horizon-client/examples/arrow_probe.rs index 20c0883e3..63ff2df32 100644 --- a/crates/horizon-client/examples/arrow_probe.rs +++ b/crates/horizon-client/examples/arrow_probe.rs @@ -58,11 +58,12 @@ fn main() -> Result<()> { let root = PathBuf::from(&args[0]); let dir = PathBuf::from(&args[1]); let assets = Assets::load(&root)?; - let mut scene = World::test_scene(&assets, 1)?; + let render = assets.reload(&root)?; + let mut scene = World::test_scene(&assets, &render, 1)?; fs::write( dir.join("scene.json"), serde_json::to_vec( - &serde_json::json!({"radius":1,"resident_chunks":scene.chunks.len(),"model_gallery":assets.model_gallery}), + &serde_json::json!({"radius":1,"resident_chunks":scene.chunks.len(),"model_gallery":render.model_gallery}), )?, )?; if args[2] == "--describe" { diff --git a/crates/horizon-client/examples/auto_jump_probe.rs b/crates/horizon-client/examples/auto_jump_probe.rs index e4a9848e8..d8dee95df 100644 --- a/crates/horizon-client/examples/auto_jump_probe.rs +++ b/crates/horizon-client/examples/auto_jump_probe.rs @@ -31,13 +31,14 @@ fn main() -> Result<()> { }; let root = PathBuf::from(root); let assets = Assets::load(&root)?; - let mut scene = World::test_scene(&assets, 1)?; + let render = assets.reload(&root)?; + let mut scene = World::test_scene(&assets, &render, 1)?; let binding = collisions::load(&root, assets.registry)?; let resources = MotionResources::load(&root, &assets)?; fs::write( scene_json, serde_json::to_vec(&serde_json::json!({ - "radius": 1, "resident_chunks": scene.chunks.len(), "model_gallery": assets.model_gallery, + "radius": 1, "resident_chunks": scene.chunks.len(), "model_gallery": render.model_gallery, }))?, )?; let mut out = BufWriter::new(fs::File::create(output)?); diff --git a/crates/horizon-client/examples/block_particles_fixture.rs b/crates/horizon-client/examples/block_particles_fixture.rs index e9c207a7e..63ef242b7 100644 --- a/crates/horizon-client/examples/block_particles_fixture.rs +++ b/crates/horizon-client/examples/block_particles_fixture.rs @@ -12,9 +12,11 @@ fn main() -> Result<(), Box> { let args: Vec<_> = std::env::args().collect(); let root = Path::new(&args[1]); let assets = Assets::load(root)?; + let render = assets.reload(root)?; let facts = BlockFacts::load(root, assets.registry)?; let tables = MeshTables::new( &assets, + &render, &facts, models::load_visibility(root, assets.registry)?, )?; diff --git a/crates/horizon-client/examples/breaking_fixture.rs b/crates/horizon-client/examples/breaking_fixture.rs index ec8f7a68b..2016fd613 100644 --- a/crates/horizon-client/examples/breaking_fixture.rs +++ b/crates/horizon-client/examples/breaking_fixture.rs @@ -18,9 +18,11 @@ fn main() -> Result<(), Box> { let args: Vec<_> = std::env::args().collect(); let root = Path::new(&args[1]); let assets = Assets::load(root)?; + let render = assets.reload(root)?; let facts = BlockFacts::load(root, assets.registry)?; let tables = MeshTables::new( &assets, + &render, &facts, models::load_visibility(root, assets.registry)?, )?; @@ -33,7 +35,7 @@ fn main() -> Result<(), Box> { let mut vertices = Vec::new(); let mut translucent = false; if facts.get(state).render_shape == RenderShape::Model { - let models = assets + let models = render .model_catalog .collect(state, BlockPos::new(p[0], p[1], p[2]))?; let offset = tables.offset(state, p[0], p[2]).unwrap_or([0.0; 3]); diff --git a/crates/horizon-client/examples/chunk_bench.rs b/crates/horizon-client/examples/chunk_bench.rs index 6ad2cbd99..be619245f 100644 --- a/crates/horizon-client/examples/chunk_bench.rs +++ b/crates/horizon-client/examples/chunk_bench.rs @@ -31,10 +31,12 @@ fn main() -> Result<()> { }; let (seed, size) = (flag("--seed", 12345), flag("--size", 8) as i32); let assets = Assets::load(&root)?; + let render = assets.reload(&root)?; let facts = BlockFacts::load(&root, assets.registry)?; let biomes = Biomes::load(&root)?; let tables = MeshTables::new( &assets, + &render, &facts, models::load_visibility(&root, assets.registry)?, )?; @@ -132,6 +134,7 @@ fn main() -> Result<()> { let mut mesher = Mesher { nether_shading: false, assets: &assets, + render: &render, tables: &tables, biomes: &biomes, visibility: tables.visibility.clone(), diff --git a/crates/horizon-client/examples/model_library_bench.rs b/crates/horizon-client/examples/model_library_bench.rs index d3aba51e0..2089e39e1 100644 --- a/crates/horizon-client/examples/model_library_bench.rs +++ b/crates/horizon-client/examples/model_library_bench.rs @@ -56,10 +56,11 @@ fn main() -> horizon_client::Result<()> { let initial = LIVE.load(Relaxed); let start = Instant::now(); let assets = Assets::load(root)?; + let render = assets.reload(root)?; let block_ms = start.elapsed().as_secs_f64() * 1000.; let block_retained = LIVE.load(Relaxed) - initial; let start_items = Instant::now(); - let items = ItemRenderer::load_with_library(root, assets.model_library.clone())?; + let items = ItemRenderer::load_with_library(root, render.model_library.clone())?; let item_ms = start_items.elapsed().as_secs_f64() * 1000.; let total_ms = start.elapsed().as_secs_f64() * 1000.; let retained = LIVE.load(Relaxed) - initial; @@ -74,7 +75,7 @@ fn main() -> horizon_client::Result<()> { horizon_core::position::BlockPos::new(0, 0, 0), horizon_core::position::BlockPos::new(-17, 65, 31), ] { - if let Ok(selected) = assets.model_catalog.collect(id, pos) { + if let Ok(selected) = render.model_catalog.collect(id, pos) { for (variant, model) in selected { format!("{variant:?}").hash(&mut hash); model.ambient_occlusion.hash(&mut hash); diff --git a/crates/horizon-client/examples/resource_memory.rs b/crates/horizon-client/examples/resource_memory.rs index 1eb6c45b7..0408b138b 100644 --- a/crates/horizon-client/examples/resource_memory.rs +++ b/crates/horizon-client/examples/resource_memory.rs @@ -94,12 +94,13 @@ fn main() -> Result<()> { drop(registry); step("registry dropped"); let assets = Assets::load(&root)?; + let render = assets.reload(&root)?; step("assets"); println!( " sprites: {} layers of {}px, {:.0} MB of pixels", - assets.texture_layers, - assets.sprite_size, - assets.pixels.len() as f64 / MB + render.texture_layers, + render.sprite_size, + render.pixels.len() as f64 / MB ); // The game decodes gameplay facts once for both tables (BlockFacts::load_pair). let (facts, behaviours) = BlockFacts::load_pair(&root, assets.registry)?; @@ -114,6 +115,7 @@ fn main() -> Result<()> { step("light tables"); let tables = MeshTables::new( &assets, + &render, &facts, models::load_visibility(&root, assets.registry)?, )?; diff --git a/crates/horizon-client/examples/scene_collision_probe.rs b/crates/horizon-client/examples/scene_collision_probe.rs index c1a1e77ad..ec20eee74 100644 --- a/crates/horizon-client/examples/scene_collision_probe.rs +++ b/crates/horizon-client/examples/scene_collision_probe.rs @@ -40,7 +40,8 @@ fn main() -> Result<()> { return Err("radius must be 1..16".into()); } let assets = assets::Assets::load(&resources)?; - let world = world::World::test_scene(&assets, radius)?; + let render = assets.reload(&resources)?; + let world = world::World::test_scene(&assets, &render, radius)?; let binding = collisions::load(&resources, assets.registry)?; let mut scene = collisions::SceneCollisions { world: &world, @@ -50,7 +51,7 @@ fn main() -> Result<()> { fs::write( dir.join("scene.json"), serde_json::to_vec(&serde_json::json!({ - "radius":radius,"resident_chunks":world.chunks.len(),"model_gallery":assets.model_gallery, + "radius":radius,"resident_chunks":world.chunks.len(),"model_gallery":render.model_gallery, }))?, )?; let mut output = std::io::BufWriter::new(fs::File::create(dir.join("rust.txt"))?); diff --git a/crates/horizon-client/examples/scene_motion_probe.rs b/crates/horizon-client/examples/scene_motion_probe.rs index 6caa51463..f4ff07ebf 100644 --- a/crates/horizon-client/examples/scene_motion_probe.rs +++ b/crates/horizon-client/examples/scene_motion_probe.rs @@ -243,13 +243,14 @@ fn main() -> Result<()> { let root = PathBuf::from(&args[0]); let dir = PathBuf::from(&args[1]); let assets = Assets::load(&root)?; - let mut scene = World::test_scene(&assets, 1)?; + let render = assets.reload(&root)?; + let mut scene = World::test_scene(&assets, &render, 1)?; let binding = collisions::load(&root, assets.registry)?; let resources = MotionResources::load(&root, &assets)?; fs::write( dir.join("scene.json"), serde_json::to_vec( - &serde_json::json!({"radius":1,"resident_chunks":scene.chunks.len(),"model_gallery":assets.model_gallery}), + &serde_json::json!({"radius":1,"resident_chunks":scene.chunks.len(),"model_gallery":render.model_gallery}), )?, )?; if args[2] == "--describe" { diff --git a/crates/horizon-client/examples/section_mesh_fixture.rs b/crates/horizon-client/examples/section_mesh_fixture.rs index 3f0caaf12..13f1a0f1a 100644 --- a/crates/horizon-client/examples/section_mesh_fixture.rs +++ b/crates/horizon-client/examples/section_mesh_fixture.rs @@ -3,7 +3,7 @@ //! the oracle's canonical form (vanilla ARGB colours and packed light coords). #![forbid(unsafe_code)] use horizon_client::{ - assets::Assets, + assets::{Assets, RenderAssets}, biome::{BiomeInfo, Biomes, GrassModifier}, blocks::BlockFacts, chunk::{Chunk, Light, MIN_Y, index}, @@ -48,6 +48,7 @@ fn chunk_index(x: i32, z: i32) -> Result { fn scene( row: &Value, assets: &Assets, + render: &RenderAssets, tables: &MeshTables, biomes: &mut Biomes, pristine: &[BiomeInfo], @@ -127,6 +128,7 @@ fn scene( let mut mesher = Mesher { nether_shading: row["nether"].as_bool().unwrap_or(false), assets, + render, tables, biomes: &*biomes, visibility: tables.visibility.clone(), @@ -177,11 +179,12 @@ fn main() -> Result<()> { } let root = PathBuf::from(&args[0]); let assets = Assets::load(&root)?; + let render = assets.reload(&root)?; let facts = BlockFacts::load(&root, assets.registry)?; let mut biomes = Biomes::load(&root)?; let visibility = models::load_visibility(&root, assets.registry)?; - let tables = MeshTables::new(&assets, &facts, visibility)?; - let names: BTreeMap = assets + let tables = MeshTables::new(&assets, &render, &facts, visibility)?; + let names: BTreeMap = render .sprite_layers .iter() .map(|(name, layer)| (*layer, name.as_str())) @@ -215,6 +218,7 @@ fn main() -> Result<()> { let result = scene( &row, &assets, + &render, &tables, &mut biomes, &pristine, diff --git a/crates/horizon-client/examples/streaming_bench.rs b/crates/horizon-client/examples/streaming_bench.rs index f99c594bb..9f8e99899 100644 --- a/crates/horizon-client/examples/streaming_bench.rs +++ b/crates/horizon-client/examples/streaming_bench.rs @@ -144,10 +144,12 @@ fn main() -> Result<()> { let hz = flag("--hz", 240.0); let assets = Arc::new(Assets::load(&root)?); + let render = Arc::new(assets.reload(&root)?); let facts = BlockFacts::load(&root, assets.registry)?; let biomes = Arc::new(Biomes::load(&root)?); let tables = Arc::new(MeshTables::new( &assets, + &render, &facts, models::load_visibility(&root, assets.registry)?, )?); @@ -160,6 +162,7 @@ fn main() -> Result<()> { )?); let context = Arc::new(WorkerContext { assets, + render: render.clone(), tables, biomes, light, diff --git a/crates/horizon-client/src/assets.rs b/crates/horizon-client/src/assets.rs index c42f0aaf7..3e7c6e909 100644 --- a/crates/horizon-client/src/assets.rs +++ b/crates/horizon-client/src/assets.rs @@ -48,11 +48,20 @@ impl TerrainBlockStates for Properties { self.0[id.0 as usize] } } +/// The block registry and the facts read from `facts.json` and the block tags: +/// everything world generation and collisions need, with none of the block +/// models or baked sprites. pub struct Assets { /// Leaked once per process: shared by world generation threads. pub registry: &'static BlockRegistry, pub properties: Properties, pub material_states: [BlockStateId; 6], + /// Block names in `#minecraft:blocks_fluid_flow` (fluid flow vectors). + pub blocks_fluid_flow: BTreeSet, +} +/// The block models and their baked sprites, read from the pack at `root` over +/// an existing block registry: everything the mesher and renderer need. +pub struct RenderAssets { pub sprite_size: u32, pub sprite_minimum_size: u32, pub pixels: Vec, @@ -67,8 +76,6 @@ pub struct Assets { pub translucent_layers: Vec, /// Each layer's `MipmapGenerator` settings. pub sprite_mips: Vec, - /// Block names in `#minecraft:blocks_fluid_flow` (fluid flow vectors). - pub blocks_fluid_flow: BTreeSet, } fn invalid(message: &str) -> io::Error { io::Error::new(io::ErrorKind::InvalidData, message) @@ -152,33 +159,23 @@ impl Assets { // past vanilla's 16-bit global palette. crate::chunk::set_block_states(registry.len()); let registry: &'static BlockRegistry = Box::leak(Box::new(registry)); - Self::with_models( - root, + Ok(Self { registry, properties, material_states, blocks_fluid_flow, - ) + }) } - /// The same blocks with the models and sprites of another resource root + /// The models and sprites of another resource root over these blocks /// (resource packs changed): the registry and block facts come from the /// game data, which resource packs do not touch. - pub fn reload(&self, root: &Path) -> Result { - Self::with_models( - root, - self.registry, - self.properties.clone(), - self.material_states, - self.blocks_fluid_flow.clone(), - ) + pub fn reload(&self, root: &Path) -> Result { + RenderAssets::load(root, self) } - fn with_models( - root: &Path, - registry: &'static BlockRegistry, - properties: Properties, - material_states: [BlockStateId; 6], - blocks_fluid_flow: BTreeSet, - ) -> Result { +} +impl RenderAssets { + pub fn load(root: &Path, assets: &Assets) -> Result { + let registry = assets.registry; let mut sprites = crate::sprites::Sprites::default(); for name in MATERIALS { sprites.insert(root, &format!("minecraft:block/{name}"))?; @@ -202,9 +199,6 @@ impl Assets { } sprites.finish(); Ok(Self { - registry, - properties, - material_states, sprite_size: sprites.size, sprite_minimum_size: sprites.minimum_size, texture_layers: u32::try_from(sprites.count())?, @@ -217,7 +211,6 @@ impl Assets { sprite_layers: sprites.layers, translucent_layers: sprites.translucent, sprite_mips: sprites.mips, - blocks_fluid_flow, }) } } diff --git a/crates/horizon-client/src/entities.rs b/crates/horizon-client/src/entities.rs index 5c905ac54..b9c8ee896 100644 --- a/crates/horizon-client/src/entities.rs +++ b/crates/horizon-client/src/entities.rs @@ -602,9 +602,10 @@ mod fire_environment_tests { return; } let assets = crate::assets::Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let facts = BlockFacts::load(&root, assets.registry).unwrap(); let items = crate::items::Items::load(&root, assets.registry, &facts).unwrap(); - let mut world = World::test_scene(&assets, 3).unwrap(); + let mut world = World::test_scene(&assets, &render, 3).unwrap(); let at = Vec3::new(20.5, 4.0, 20.5); world .set( diff --git a/crates/horizon-client/src/fog.rs b/crates/horizon-client/src/fog.rs index 83f1a8bf5..4e29aeae9 100644 --- a/crates/horizon-client/src/fog.rs +++ b/crates/horizon-client/src/fog.rs @@ -32,6 +32,7 @@ pub struct FogData { } /// Per-biome water fog end multipliers (`visual/water_fog_end_distance`). +#[derive(Default)] pub struct FogTables { water_fog_end: Vec, } diff --git a/crates/horizon-client/src/game.rs b/crates/horizon-client/src/game.rs index 2911c49bf..7cda9671e 100644 --- a/crates/horizon-client/src/game.rs +++ b/crates/horizon-client/src/game.rs @@ -127,6 +127,7 @@ mod sign_edit; mod sniffers; mod spawner; mod spill; +mod startup_menu; mod station_control; mod stations; mod stats; @@ -152,7 +153,7 @@ mod wither; mod zombie_villagers; use horizon_client::{ Result, - assets::Assets, + assets::{Assets, RenderAssets}, audio::Audio, biome::Biomes, blocks::{BlockFacts, Fluid}, @@ -749,12 +750,23 @@ struct FallingBlock { /// recipes, biomes, mobs, collision and motion. Read-only and `Send + Sync`, /// so the client and an integrated server thread can share one copy. pub struct Resources { + core: WorldCore, + rest: std::sync::OnceLock, +} + +struct WorldCore { facts: BlockFacts, + biomes: Arc, + environment: Environment, + collision: BlockCollisionRegistry<'static>, + motion: MotionResources, + threads: usize, +} + +struct WorldRest { items: Items, recipes: Recipes, transformers: horizon_client::block_transform::Transformers, - biomes: Arc, - environment: Environment, mob_types: HashMap>, mob_data: horizon_client::mobs::MobData, providers: Providers, @@ -766,14 +778,105 @@ pub struct Resources { nether_environment: Environment, end_environment: Environment, behaviours: Behaviours, - collision: BlockCollisionRegistry<'static>, - motion: MotionResources, - threads: usize, player_arm: Option, player_type: Option>, - /// Enchantments, workstation recipes and brewing (game/stations.rs). stations: horizon_client::stations::StationData, } + +impl Resources { + fn rest(&self) -> &WorldRest { + self.rest + .get() + .expect("world resources joined before entry") + } + fn facts(&self) -> &BlockFacts { + &self.core.facts + } + fn items(&self) -> &Items { + &self.rest().items + } + fn recipes(&self) -> &Recipes { + &self.rest().recipes + } + fn transformers(&self) -> &horizon_client::block_transform::Transformers { + &self.rest().transformers + } + fn biomes(&self) -> &Arc { + &self.core.biomes + } + fn environment(&self) -> &Environment { + &self.core.environment + } + fn mob_types(&self) -> &HashMap> { + &self.rest().mob_types + } + fn mob_data(&self) -> &horizon_client::mobs::MobData { + &self.rest().mob_data + } + fn providers(&self) -> &Providers { + &self.rest().providers + } + fn block_entity_render(&self) -> &horizon_client::block_entity_render::BlockEntityRenderer { + &self.rest().block_entity_render + } + fn animate(&self) -> &horizon_client::animate_tick::AnimateTables { + &self.rest().animate + } + fn fog(&self) -> &horizon_client::fog::FogTables { + &self.rest().fog + } + fn music(&self) -> &horizon_client::music::MusicTables { + &self.rest().music + } + fn ambient(&self) -> &horizon_client::ambience::AmbientTables { + &self.rest().ambient + } + fn nether_environment(&self) -> &Environment { + &self.rest().nether_environment + } + fn end_environment(&self) -> &Environment { + &self.rest().end_environment + } + fn behaviours(&self) -> &Behaviours { + &self.rest().behaviours + } + fn collision(&self) -> &BlockCollisionRegistry<'static> { + &self.core.collision + } + fn motion(&self) -> &MotionResources { + &self.core.motion + } + fn threads(&self) -> usize { + self.core.threads + } + fn player_arm(&self) -> &Option { + &self.rest().player_arm + } + fn player_type(&self) -> &Option> { + &self.rest().player_type + } + fn stations(&self) -> &horizon_client::stations::StationData { + &self.rest().stations + } +} + +/// Everything the title and menus draw: the GUI atlas with its font and the +/// title panorama. Kept apart from the world bundle so the title can appear +/// before the block sprites, models and gameplay tables are ready. +pub struct UiResources { + /// The GUI, font, particle, map and skin atlas. + pub atlas: HudAtlas, + /// The title screen's panorama faces. + pub panorama: Arc, +} +impl UiResources { + pub fn load(root: &std::path::Path) -> Result { + Ok(Self { + atlas: HudAtlas::build(root)?, + panorama: Arc::new(horizon_client::gfx::panorama::Faces::load(root)), + }) + } +} /// What a resource pack reload replaces (`Minecraft.reloadResourcePacks`): /// block models and sprites with their meshing tables, item models, /// translations and the textures read on the CPU. Each game holds its own; @@ -781,9 +884,9 @@ pub struct Resources { #[derive(Clone)] pub struct PackResources { assets: Arc, + render: Arc, context: Arc, layer_names: Arc>, - panorama: Arc, /// Item definitions, baked item models and special renderers. item_renderer: Arc, names: Arc, @@ -793,23 +896,25 @@ pub struct PackResources { forcefield: Arc<(u32, u32, Vec)>, } impl PackResources { - /// Everything a pack overlay at `root` provides, over `assets` loaded from it. + /// Everything a pack overlay at `root` provides, over `assets` and `render` + /// loaded from it. fn load( root: &std::path::Path, assets: Arc, + render: Arc, facts: &BlockFacts, biomes: Arc, light: Arc, ) -> Result { let visibility = models::load_visibility(root, assets.registry)?; - let tables = Arc::new(MeshTables::new(&assets, facts, visibility)?); + let tables = Arc::new(MeshTables::new(&assets, &render, facts, visibility)?); let item_renderer = horizon_client::item_render::ItemRenderer::load_with_library( root, - assets.model_library.clone(), + render.model_library.clone(), )?; Ok(Self { layer_names: Arc::new( - assets + render .sprite_layers .iter() .map(|(name, layer)| (*layer, name.trim_start_matches("minecraft:").to_owned())) @@ -817,12 +922,13 @@ impl PackResources { ), context: Arc::new(WorkerContext { assets: assets.clone(), + render: render.clone(), tables, biomes, light, }), assets, - panorama: Arc::new(horizon_client::gfx::panorama::Faces::load(root)), + render, item_renderer: Arc::new(item_renderer), names: Arc::new(Names::load(root)), clouds: Arc::new(load_clouds(root)), @@ -855,12 +961,16 @@ fn select_creative_tab( struct Game<'a> { /// Shared with an integrated server; `collision` and `motion` borrow from it. res: Arc, + rest_loader: Option, + pending_entry: Option, + pending_pack_reload: bool, + world_renderer_ready: bool, collision: &'a BlockCollisionRegistry<'a>, motion: &'a MotionResources, /// This game's resource packs (`reload_packs` replaces them). pack: PackResources, - /// The GUI, font, particle, map and skin atlas. - atlas: HudAtlas, + /// The title and menu bundle (GUI atlas, font and panorama). + gui: UiResources, /// `FogRenderer`'s evolving state. fog: horizon_client::fog::FogState, screen_fx: horizon_client::screen_effects::ScreenEffects, @@ -1364,7 +1474,7 @@ impl Game<'_> { /// A block's outline boxes in world space (`getShape` plus the random offset). fn outline_boxes(&self, pos: [i32; 3]) -> Vec<[f64; 6]> { let state = self.world.block(pos[0], pos[1], pos[2]); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); let o = if f.outline_offset { self.pack .context @@ -1426,8 +1536,8 @@ impl Game<'_> { let mut t = 0.0; while t <= reach { let state = self.world.block(pos[0], pos[1], pos[2]); - let f = self.res.facts.get(state); - if !self.res.facts.is_air(state) + let f = self.res.facts().get(state); + if !self.res.facts().is_air(state) && !(f.fluid != Fluid::None && !f.waterlogged && &*f.name != "minecraft:kelp" @@ -1529,7 +1639,11 @@ impl Game<'_> { } /// Inventory.add: returns the stack that did not fit. fn give(&mut self, mut stack: ItemStack) -> Option { - let max = self.res.items.get(&stack.item).map_or(64, |i| i.max_stack); + let max = self + .res + .items() + .get(&stack.item) + .map_or(64, |i| i.max_stack); // Prefer the selected slot, then the hotbar, then the main inventory. let order: Vec = std::iter::once(self.selected) .chain((0..36).filter(|&i| i != self.selected)) @@ -1565,7 +1679,7 @@ impl Game<'_> { fn particle_sprite(&self, state: BlockStateId) -> Option<(String, u32)> { let models = self .pack - .assets + .render .model_catalog .collect(state, horizon_core::position::BlockPos::new(0, 0, 0)) .ok()?; @@ -1580,7 +1694,7 @@ impl Game<'_> { .or_else(|| models.iter().find_map(|(_, model)| model.particle))?; let name = self.pack.layer_names.get(&layer)?.clone(); let tint = if face.is_some_and(|face| face.quad.tint_index >= 0) { - let n = &self.res.facts.get(state).name; + let n = &self.res.facts().get(state).name; if n.contains("leaves") || n.contains("vine") { 0x48B518 } else { @@ -1592,7 +1706,7 @@ impl Game<'_> { Some((name, tint)) } fn particle_shape(&self, pos: [i32; 3], state: BlockStateId) -> Vec<[f64; 6]> { - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); let offset = if f.outline_offset { self.pack .context @@ -1670,14 +1784,14 @@ impl Game<'_> { ) -> Vec { let registry = self.pack.assets.registry; let dynamic = self.pending.dynamic(pos); - match self.res.items.block_loot_sequence(registry, state) { + match self.res.items().block_loot_sequence(registry, state) { Some(sequence) => { let random = self.rand_sequences.get(&sequence, self.level.seed); self.res - .items + .items() .block_drops_with(registry, state, held, &dynamic, random) } - None => self.res.items.block_drops_with( + None => self.res.items().block_drops_with( registry, state, held, @@ -1747,14 +1861,14 @@ impl Game<'_> { ) { return true; } - if !item.tick(&self.world, &self.res.facts, self.collision) { + if !item.tick(&self.world, self.res.facts(), self.collision) { return false; } let environment = item.environment_tick( &self.world, - &self.res.facts, + self.res.facts(), self.pack.assets.registry, - &self.res.items, + self.res.items(), ); // shortcut: age is the fresh-drop clock; use entity ticks for saved/frozen-age phase parity. if environment.should_play_lava_hurt_sound(item.age) { @@ -1893,7 +2007,7 @@ impl Game<'_> { let mut level = GameLevel { cart_boxes, world: &mut self.world, - facts: &self.res.facts, + facts: self.res.facts(), collision: self.collision, events: &mut self.level_events, dimension, @@ -1902,10 +2016,10 @@ impl Game<'_> { thundering: thunder > 0.9, player_box, player_collision, - biomes: &self.res.biomes, + biomes: self.res.biomes(), seed: self.level.seed, - behaviours: &self.res.behaviours, - items: &self.res.items, + behaviours: self.res.behaviours(), + items: self.res.items(), loot: horizon_client::structure_blocks::loot_data(&self.options.resources), registry: self.pack.assets.registry, rules, @@ -1913,7 +2027,7 @@ impl Game<'_> { pending: &mut self.pending, spill: &mut self.spill, }; - let result = f(&self.res.behaviours, &mut level, &mut self.block_ticks); + let result = f(self.res.behaviours(), &mut level, &mut self.block_ticks); self.flush_spill(); result } @@ -1967,7 +2081,7 @@ impl Game<'_> { ); let simulation = self.settings.render_distance.min(8); let mut ticking = Vec::new(); - let facts = &self.res.facts; + let facts = self.res.facts(); for (&(x, z), chunk) in &self.world.chunks { if (x - pcx).abs() > simulation || (z - pcz).abs() > simulation || !chunk.lit { continue; @@ -2069,10 +2183,10 @@ impl Game<'_> { let state = BlockStateId(data as u32); let p = [pos.x, pos.y, pos.z]; self.destroy_particles(p, state); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { continue; } - let sounds = self.res.facts.get(state).sounds.clone(); + let sounds = self.res.facts().get(state).sounds.clone(); let c = [ f64::from(pos.x) + 0.5, f64::from(pos.y) + 0.5, @@ -2189,7 +2303,7 @@ impl Game<'_> { no_gravity: false, drop_item: true, fall_distance: 0.0, - damage: if self.res.facts.get(state).name.ends_with("anvil") { + damage: if self.res.facts().get(state).name.ends_with("anvil") { horizon_client::falling_block::Damage::anvil() } else { Default::default() @@ -2302,7 +2416,7 @@ impl Game<'_> { fn open_menu(&mut self, pos: [i32; 3]) { let name = self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1], pos[2])) .name .clone(); @@ -2500,7 +2614,7 @@ impl Game<'_> { self.falling = falling; for (state, at) in dropped { // Entity.spawnAtLocation: an item entity where the block was. - let item = self.res.facts.get(state).item.clone(); + let item = self.res.facts().get(state).item.clone(); if &*item != "minecraft:air" { let r = &mut self.world.random; let v = [ @@ -2543,11 +2657,11 @@ impl Game<'_> { }; let breaks = self .res - .items + .items() .item_tags .get("minecraft:breaks_decorated_pots") .is_some_and(|t| t.contains(&*held.item)); - let enchantments = &self.res.stations.enchantments; + let enchantments = &self.res.stations().enchantments; let kept = held .enchantments() .iter() @@ -2573,14 +2687,14 @@ impl Game<'_> { }; let Some((per_block, max)) = self .res - .items + .items() .get(&stack.item) .and_then(|i| Some((i.tool_damage_per_block?, i.max_damage))) else { return; }; let wears = if &*stack.item == "minecraft:shears" { - !self.res.items.block_in_tag("minecraft:fire", name) + !self.res.items().block_in_tag("minecraft:fire", name) } else { hardness != 0.0 }; @@ -2602,7 +2716,7 @@ impl Game<'_> { self.pad_rumble(horizon_client::gamepad::Rumble::BlockBroken); // ServerPlayerGameMode.destroyBlock. let state = self.world.block(pos[0], pos[1], pos[2]); - let facts = self.res.facts.get(state).clone(); + let facts = self.res.facts().get(state).clone(); let state = self.crack_mined_pot(pos, state); // Block.playerWillDestroy: mining their gold angers all nearby piglins. if self.guarded_by_piglins(&facts.name) { @@ -2637,7 +2751,10 @@ impl Game<'_> { let held = self.held().cloned(); self.mine_block_with_held(&facts.name, facts.hardness); let harvest = !facts.requires_tool - || self.res.items.correct_for_drops(held.as_ref(), &facts.name); + || self + .res + .items() + .correct_for_drops(held.as_ref(), &facts.name); if harvest { // Block.playerDestroy: the mined statistic, the exhaustion and the drops. self.stats.add("mined", &facts.name, 1); @@ -2808,7 +2925,7 @@ impl Game<'_> { let Some(stack) = self.held().cloned() else { return Ok(false); }; - let Some(info) = self.res.items.get(&stack.item).cloned() else { + let Some(info) = self.res.items().get(&stack.item).cloned() else { return Ok(false); }; if block_hit.is_some() && (self.use_bone_meal(&stack)? || self.ignite_tnt(&stack)?) { @@ -2919,7 +3036,7 @@ impl Game<'_> { return Ok(true); }; let target = [pos.x, pos.y, pos.z]; - if let Some(entity) = BlockEntity::for_block(&self.res.facts.get(state).name) { + if let Some(entity) = BlockEntity::for_block(&self.res.facts().get(state).name) { let key = (target[0], target[1], target[2]); self.world.block_entities.insert(key, entity); let game_master = self.can_use_game_master_blocks(); @@ -3078,7 +3195,7 @@ impl Game<'_> { self.using = None; return; } - let Some(info) = self.res.items.get(&stack.item).cloned() else { + let Some(info) = self.res.items().get(&stack.item).cloned() else { self.using = None; return; }; @@ -3167,13 +3284,13 @@ impl Game<'_> { }); } let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - let facts = self.res.facts.get(state); + let facts = self.res.facts().get(state); if facts.hardness < 0.0 { return Ok(()); } // Player.getDestroySpeed / BlockBehaviour.getDestroyProgress. let held = self.held(); - let mut speed = self.res.items.mining_speed(held, &facts.name); + let mut speed = self.res.items().mining_speed(held, &facts.name); speed = self.modify_destroy_speed(speed); let player = self.player.as_ref().ok_or("no player")?; if !player.ground.on_ground { @@ -3182,7 +3299,7 @@ impl Game<'_> { let eye = self.eye_position().unwrap_or_default(); if self .res - .facts + .facts() .get(self.world.block( eye[0].floor() as i32, eye[1].floor() as i32, @@ -3193,7 +3310,7 @@ impl Game<'_> { { speed *= self.submerged_mining_speed(); } - let harvest = !facts.requires_tool || self.res.items.correct_for_drops(held, &facts.name); + let harvest = !facts.requires_tool || self.res.items().correct_for_drops(held, &facts.name); let progress = if facts.hardness == 0.0 { 1.0 } else { @@ -3233,11 +3350,11 @@ impl Game<'_> { if self.dim == Dim::Nether { // Below the bedrock ceiling: a solid floor with two air blocks above. for y in (32..120).rev() { - let floor = self.res.facts.get(self.world.block(x, y - 1, z)); + let floor = self.res.facts().get(self.world.block(x, y - 1, z)); if floor.full_collision && floor.fluid == Fluid::None - && self.res.facts.is_air(self.world.block(x, y, z)) - && self.res.facts.is_air(self.world.block(x, y + 1, z)) + && self.res.facts().is_air(self.world.block(x, y, z)) + && self.res.facts().is_air(self.world.block(x, y + 1, z)) { return Some(y); } @@ -3247,8 +3364,8 @@ impl Game<'_> { let mut y = MIN_Y + HEIGHT - 1; while y > MIN_Y { let s = self.world.block(x, y, z); - if !self.res.facts.is_air(s) { - let f = self.res.facts.get(s); + if !self.res.facts().is_air(s) { + let f = self.res.facts().get(s); let ok = f.full_collision && f.fluid == Fluid::None && !f.name.contains("leaves") @@ -3351,7 +3468,7 @@ impl Game<'_> { // LivingEntity.canGlideUsing: a glider in its slot that will not break next. player.glider = self.armor[1].as_ref().is_some_and(|s| { self.res - .items + .items() .get(&s.item) .is_some_and(|i| i.glider && (i.max_damage == 0 || s.damage + 1 < i.max_damage)) }); @@ -3475,7 +3592,7 @@ impl Game<'_> { // LivingEntity.canGlideUsing: a glider in its slot that will not break next. player.glider = self.armor[1].as_ref().is_some_and(|s| { self.res - .items + .items() .get(&s.item) .is_some_and(|i| i.glider && (i.max_damage == 0 || s.damage + 1 < i.max_damage)) }); @@ -3489,7 +3606,7 @@ impl Game<'_> { self.inventory.get(slot)?.as_ref() } }) - .and_then(|s| self.res.items.get(&s.item)) + .and_then(|s| self.res.items().get(&s.item)) .map(|i| i.use_speed); // PowderSnowBlock.canEntityWalkOnPowderSnow and LivingEntity.canFreeze. player.leather_boots = self.armor[3] @@ -3497,7 +3614,7 @@ impl Game<'_> { .is_some_and(|s| &*s.item == "minecraft:leather_boots"); let immune = self .res - .items + .items() .item_tags .get("minecraft:freeze_immune_wearables"); player.freeze_immune = self @@ -3554,7 +3671,7 @@ impl Game<'_> { MotionEvent::Emission { state, in_water, .. } if !crouching => { - let sounds = self.res.facts.get(state).sounds.clone(); + let sounds = self.res.facts().get(state).sounds.clone(); // Entity.playStepSound: the block's step sound at 0.15 volume, // muffled under the swim sound in water. let (volume, pitch) = if in_water { @@ -3993,7 +4110,7 @@ impl Game<'_> { let (stack, capped) = match drag.and_then(|d| d.slots.get(&slot)) { Some(None) => return, Some(Some((count, capped))) => { - batch.fill(&self.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128)); + batch.fill(&self.gui.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128)); let carried = self .carried .clone() @@ -4072,7 +4189,7 @@ impl Game<'_> { // moved to (x, y). Horizon tracks no item cooldowns to shade yet. let max_damage = self .res - .items + .items() .get(&stack.item) .map_or(0, |info| info.max_damage as i32); let decorations = hud_overlays::ItemDecorations { @@ -4088,10 +4205,10 @@ impl Game<'_> { 0, 0, &decorations, - &self.atlas.font, + &self.gui.atlas.font, )); draws.push(hud_layout::GuiDraw::Pop); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } fn hud(&mut self, size: [u32; 2]) -> HudBatch { let mut batch = self.hud_layers(size); @@ -4099,7 +4216,7 @@ impl Game<'_> { // and the toasts, so it is over everything, menus included. self.draw_debug_overlay(&mut batch, size); self.frame_graph - .draw(self.settings.horizon.overlay, &mut batch, &self.atlas); + .draw(self.settings.horizon.overlay, &mut batch, &self.gui.atlas); self.draw_pad_cursor(&mut batch); batch } @@ -4120,12 +4237,12 @@ impl Game<'_> { if horizon_client::ui_theme::horizon() { let fade = self.backdrop_fade(); let mut ui = - horizon_client::ui_theme::Ui::new(&self.atlas, &mut batch, self.cursor); + horizon_client::ui_theme::Ui::new(&self.gui.atlas, &mut batch, self.cursor); title.draw_horizon(&mut ui, fade); ui.finish(); } else { title.draw( - &self.atlas, + &self.gui.atlas, &mut batch, self.cursor, self.settings.file.bool("hideSplashTexts"), @@ -4133,7 +4250,7 @@ impl Game<'_> { } return batch; } - let atlas_ptr: *const HudAtlas = &self.atlas; + let atlas_ptr: *const HudAtlas = &self.gui.atlas; let _ = atlas_ptr; if self.remote_overlay(&mut batch) { return batch; @@ -4164,7 +4281,7 @@ impl Game<'_> { hud_layout::full_attack_indicator(a, delay, self.crosshair_living()) }); let draws = hud_layout::crosshair(wi, hi, attack, full); - hud_layout::paint(&mut batch, &self.atlas, &draws); + hud_layout::paint(&mut batch, &self.gui.atlas, &draws); } if !spectator { let inputs = hud_layout::HotbarInputs { @@ -4176,7 +4293,7 @@ impl Game<'_> { attack: (indicator == 2).then_some(strength), }; let draws = hud_layout::hotbar(wi, hi, &inputs); - hud_layout::paint(&mut batch, &self.atlas, &draws); + hud_layout::paint(&mut batch, &self.gui.atlas, &draws); for d in &draws { if let hud_layout::GuiDraw::Item { slot, x, y, .. } = *d { let stack = if slot == 40 { @@ -4206,7 +4323,7 @@ impl Game<'_> { && !spectator && let Some(p) = &mut self.player { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let width = |s: &str| HudBatch::text_width(atlas, s) as i32; let draws = hud_layout::experience( wi, @@ -4230,7 +4347,7 @@ impl Game<'_> { let eye = p.position.y + f64::from(p.dimensions.eye_height); let under_water = self .res - .facts + .facts() .get(self.world.block( p.position.x.floor() as i32, eye.floor() as i32, @@ -4269,13 +4386,13 @@ impl Game<'_> { } // Hud.extractSleepOverlay: over all health/food bars, under titles and chat. let draws = hud_overlays::sleep_overlay(wi, hi, self.sleep_timer as i32); - hud_layout::paint(&mut batch, &self.atlas, &draws); + hud_layout::paint(&mut batch, &self.gui.atlas, &draws); if show_hud { self.draw_titles(&mut batch); self.draw_scoreboard(&mut batch); self.draw_subtitles(&mut batch); } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; if show_hud && let Some((text, at)) = &self.message && at.elapsed() < Duration::from_secs(3) @@ -4292,9 +4409,9 @@ impl Game<'_> { // PauseScreen(false): only its title, at the top. Screen::Paused => { let title = self.translate("menu.paused", "Game Paused"); - let tw = HudBatch::text_width(&self.atlas, &title); + let tw = HudBatch::text_width(&self.gui.atlas, &title); batch.text( - &self.atlas, + &self.gui.atlas, &title, ((batch.width / 2.0).floor() - (tw / 2.0).floor()).floor(), 10.0, @@ -4493,7 +4610,7 @@ impl Game<'_> { /// `RecipeCraftingHolder.awardUsedRecipes`: a crafted recipe becomes known /// (special ones never do). fn award_crafted(&mut self, recipes: &[String]) { - let index = &self.res.stations.recipe_index; + let index = &self.res.stations().recipe_index; let (_, unlocked) = self.level.recipe_book.add_recipes(index, recipes); self.recipe_unlocked(&unlocked); } @@ -4502,7 +4619,7 @@ impl Game<'_> { let grid: Vec> = (0..n * n).map(|i| self.craft_grid[i].clone()).collect(); let scale = |id: i32| self.maps.data.get(&id).map(|m| m.scale); self.res - .recipes + .recipes() .find_with(&grid, n, &scale) .map(|(name, result)| (name.to_owned(), result)) } @@ -4512,7 +4629,7 @@ impl Game<'_> { let (sx, sy) = self.slot_position(i); if i == 504 && self.offhand.is_none() { batch.sprite( - &self.atlas, + &self.gui.atlas, "gui/sprites/container/slot/shield", ox + sx, oy + sy, @@ -4521,7 +4638,7 @@ impl Game<'_> { if (500..504).contains(&i) && self.armor[i - 500].is_none() { let icon = ["helmet", "chestplate", "leggings", "boots"][i - 500]; batch.sprite( - &self.atlas, + &self.gui.atlas, &format!("gui/sprites/container/slot/{icon}"), ox + sx, oy + sy, @@ -4537,7 +4654,7 @@ impl Game<'_> { } let (ox, oy) = self.inventory_origin(batch); { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.fill( atlas, 0.0, @@ -4661,7 +4778,7 @@ impl Game<'_> { if let Some(slot) = self.slot_at(batch, self.cursor.0, self.cursor.1) { let (sx, sy) = self.slot_position(slot); batch.fill( - &self.atlas, + &self.gui.atlas, ox + sx, oy + sy, 16.0, @@ -4702,7 +4819,7 @@ impl Game<'_> { ); let name = self .res - .facts + .facts() .get(self.world.block(key.0, key.1, key.2)) .name .clone(); @@ -4775,7 +4892,7 @@ impl Game<'_> { let items = self.creative_screen.items(&self.pack.names); let first = self.creative_screen.first_row(&self.pack.names); let shown = items.get(first * 9 + slot - Creative::DISPLAY); - let catalog = &self.res.items; + let catalog = self.res.items(); let max = |s: &ItemStack| catalog.get(&s.item).map_or(64, |i| i.max_stack); match click_display(&mut self.carried, shown, max, button, input) { DisplayClick::Hotbar(i, stack) => self.inventory[i] = Some(stack), @@ -4935,7 +5052,7 @@ impl Game<'_> { Some(BlockEntity::Chest(_)) => { let shulker = self.container.is_some_and(|k| { let id = self.world.block(k.0, k.1, k.2); - storage::is_shulker_box(&self.res.facts.get(id).name) + storage::is_shulker_box(&self.res.facts().get(id).name) }); let kind = match size { 5 => Kind::Hopper, @@ -5028,15 +5145,15 @@ impl Game<'_> { next_id: std::cell::Cell::new(next_map), }; let trade_env = horizon_client::merchant::TradeEnv { - trades: &self.res.stations.trades, - enchantments: &self.res.stations.enchantments, + trades: &self.res.stations().trades, + enchantments: &self.res.stations().enchantments, maps: Some(&maps), }; let env = Env { - items: &self.res.items, - recipes: &self.res.recipes, - brewing: &self.res.stations.brewing, - banners: &self.res.stations.banners, + items: self.res.items(), + recipes: self.res.recipes(), + brewing: &self.res.stations().brewing, + banners: &self.res.stations().banners, trade: Some(&trade_env), }; menu.creative = creative; @@ -5131,7 +5248,7 @@ impl Game<'_> { .and_then(|k| self.world.block_entities.get_mut(&k)) { // AbstractFurnaceBlockEntity.setItem: only a new input restarts cooking. - f.input_clicked(&self.res.recipes, before[0].clone()); + f.input_clicked(self.res.recipes(), before[0].clone()); } self.apply_equipment(); true @@ -5534,7 +5651,7 @@ impl Game<'_> { None => self.carried = Some(result), Some(c) if c.item == result.item - && c.count + result.count <= max(&self.res.items, c) => + && c.count + result.count <= max(self.res.items(), c) => { c.count += result.count } @@ -5550,7 +5667,7 @@ impl Game<'_> { while let Some((recipe, result)) = self.craft_recipe() { let made = (result.item.clone(), result.count); let cells = self.craft_size * self.craft_size; - let remainders = self.res.recipes.remainders( + let remainders = self.res.recipes().remainders( &recipe, &self.craft_grid[..cells], self.craft_size, @@ -5564,7 +5681,7 @@ impl Game<'_> { None => self.carried = Some(result), Some(c) if c.item == result.item - && c.count + result.count <= max(&self.res.items, c) => + && c.count + result.count <= max(self.res.items(), c) => { c.count += result.count } @@ -5606,7 +5723,7 @@ impl Game<'_> { let wanted = ["head", "chest", "legs", "feet"][slot - 500]; let fits = self.carried.as_ref().is_none_or(|c| { self.res - .items + .items() .get(&c.item) .and_then(|i| i.equip_slot.as_deref()) == Some(wanted) @@ -5620,7 +5737,7 @@ impl Game<'_> { } let carried = self.carried.take(); let current = self.slot_mut(slot).take(); - let items = &self.res.items; + let items = self.res.items(); let (new_slot, new_carried) = match (carried, current) { (None, Some(mut s)) if right => { let half = s.count.div_ceil(2); @@ -5661,7 +5778,7 @@ impl Game<'_> { .container .and_then(|k| self.world.block_entities.get_mut(&k)) { - f.input_clicked(&self.res.recipes, before); + f.input_clicked(self.res.recipes(), before); } } /// `Camera.setRotation`: the camera's orientation, turned round in @@ -5702,7 +5819,7 @@ impl Game<'_> { m.height(), camera, fire_yaw, - &self.atlas.sprites, + &self.gui.atlas.sprites, self.world.light( at.x.floor() as i32, at.y.floor() as i32, @@ -5724,7 +5841,7 @@ impl Game<'_> { p.dimensions.height, camera, fire_yaw, - &self.atlas.sprites, + &self.gui.atlas.sprites, self.world.light( feet.x.floor() as i32, feet.y.floor() as i32, @@ -5737,7 +5854,7 @@ impl Game<'_> { if item.fire_ticks > 0 && !self .res - .items + .items() .resists_fire(&item.stack, "minecraft:in_fire") { let at = item.previous.lerp(item.position, alpha); @@ -5747,7 +5864,7 @@ impl Game<'_> { 0.25, camera, fire_yaw, - &self.atlas.sprites, + &self.gui.atlas.sprites, self.world.light( at.x.floor() as i32, at.y.floor() as i32, @@ -5766,7 +5883,7 @@ impl Game<'_> { 1.975 * scale, camera, fire_yaw, - &self.atlas.sprites, + &self.gui.atlas.sprites, self.world.light( stand.position.x.floor() as i32, stand.position.y.floor() as i32, @@ -5791,7 +5908,7 @@ impl Game<'_> { self.name_tag_geometry(camera, alpha, &mut out, &mut see_through); self.see_through_vertices = see_through; // Entity shadows (EntityRenderer.extractShadow). - if let Some(sprite) = self.atlas.sprites.get("misc/shadow").copied() { + if let Some(sprite) = self.gui.atlas.sprites.get("misc/shadow").copied() { let ambient = if self.dim == Dim::Nether { 0.1 } else { 0.0 }; let darken = self.sky_darken(); let a = alpha; @@ -5821,7 +5938,7 @@ impl Game<'_> { let (radius, strength) = horizon_client::shadows::shadow_params(id); horizon_client::shadows::shadow( &self.world, - &self.res.facts, + self.res.facts(), sprite, camera, pos, @@ -5846,7 +5963,7 @@ impl Game<'_> { game_time: self.world.game_time, max_y: self.dim.max_y(), world: &self.world, - sprites: &self.atlas.sprites, + sprites: &self.gui.atlas.sprites, nether: self.dim == Dim::Nether, lid: &lid, sign: &|p| match self.world.block_entities.get(&(p[0], p[1], p[2])) { @@ -5854,7 +5971,7 @@ impl Game<'_> { _ => None, }, banner: &|p| self.banner_layers_at(p), - glyph: &|c| self.atlas.glyph_cell(c), + glyph: &|c| self.gui.atlas.glyph_cell(c), }; // Block entities outside the view frustum are skipped (with a // block of margin for models larger than their block). @@ -5862,7 +5979,7 @@ impl Game<'_> { // Beams and structure outlines reach far outside their block // (BlockEntityRenderer.shouldRenderOffScreen): never culled. let off_screen = |state: u32| { - let name = &*self.res.facts.get(BlockStateId(state)).name; + let name = &*self.res.facts().get(BlockStateId(state)).name; matches!( name, "minecraft:beacon" @@ -5872,7 +5989,7 @@ impl Game<'_> { ) }; let visible = r.block_entities().filter(|(p, state)| { - if !self.res.block_entity_render.renders(*state) { + if !self.res.block_entity_render().renders(*state) { return false; } off_screen(*state) @@ -5888,7 +6005,7 @@ impl Game<'_> { for block in visible { let start = out.len(); self.res - .block_entity_render + .block_entity_render() .render(&scene, std::iter::once(block), &mut out); if !off_screen(block.1) { self.cull_entity_vertices(&mut out, start); @@ -5896,12 +6013,12 @@ impl Game<'_> { } } else { self.res - .block_entity_render + .block_entity_render() .render(&scene, visible, &mut out); } if let Some(mining) = &self.mining && mining.progress > 0.0 - && self.atlas.sprites.contains_key(&format!( + && self.gui.atlas.sprites.contains_key(&format!( "block/destroy_stage_{}", ((mining.progress * 10.0) as u32).min(9) )) @@ -5910,12 +6027,13 @@ impl Game<'_> { .world .block(mining.pos[0], mining.pos[1], mining.pos[2]); self.res - .block_entity_render + .block_entity_render() .render_breaking(&scene, mining.pos, state.0, &mut out); } } // Experience orbs (ExperienceOrbRenderer): pulsing billboards from a 4x4 icon sheet. if let Some(r) = self + .gui .atlas .sprites .get("entity/experience/experience_orb") @@ -6028,7 +6146,7 @@ impl Game<'_> { &|b| world.light(b[0], b[1], b[2]), &mut out, ); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; // Breaking progress overlay (destroy_stage_0..9). if let Some(m) = &self.mining && m.progress > 0.0 @@ -6045,11 +6163,11 @@ impl Game<'_> { ) - camera) .as_vec3(); let state = self.world.block(m.pos[0], m.pos[1], m.pos[2]); - if self.res.facts.get(state).render_shape + if self.res.facts().get(state).render_shape == horizon_client::blocks::RenderShape::Model && let Ok(models) = self .pack - .assets + .render .model_catalog .collect(state, BlockPos::new(m.pos[0], m.pos[1], m.pos[2])) { @@ -6079,7 +6197,7 @@ impl Game<'_> { if self.dim == Dim::End { let sky = self .res - .end_environment + .end_environment() .sample(self.world.day_time, None, None); return (15.0 - 15.0 * sky.sky_light_level).round() as i32; } @@ -6091,7 +6209,10 @@ impl Game<'_> { { return darken; } - let mut sky = self.res.environment.sample(self.world.day_time, None, None); + let mut sky = self + .res + .environment() + .sample(self.world.day_time, None, None); horizon_client::environment::apply_weather(&mut sky, rain, thunder); // Level.updateSkyBrightness: darkening from the sky light level. let darken = (15.0 - 15.0 * sky.sky_light_level).round() as i32; @@ -6123,7 +6244,7 @@ impl Game<'_> { let hand_damage = 1.0 + self .held() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .map_or(0.0, |i| i.attack_damage); let damage = hand_damage + self.effect_attack_bonus(); let scale = self.attack_strength_scale(); @@ -6146,7 +6267,7 @@ impl Game<'_> { fn attack_strength_scale(&self) -> f32 { let speed = self .held() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .map_or(0.0, |i| i.attack_speed); let delay = 20.0 / (4.0 + speed).max(0.1); ((self.attack_ticks as f32 + 0.5) / delay).clamp(0.0, 1.0) @@ -6156,7 +6277,7 @@ impl Game<'_> { let p = self.player.as_ref()?; let sword = self.held().is_some_and(|s| { self.res - .items + .items() .item_tags .get("minecraft:swords") .is_some_and(|tag| tag.contains(&*s.item)) @@ -6228,7 +6349,7 @@ impl Game<'_> { let hand_damage = 1.0 + self .held() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .map_or(0.0, |i| i.attack_damage); if self.attack_frame() || self.attack_armor_stand() @@ -6381,7 +6502,7 @@ impl Game<'_> { /// SkyRenderer.renderSunMoonAndStars: bodies on a frame rotated Y -90 then X by angle. fn celestial_geometry(&self, sky: &horizon_client::environment::Sky) -> Vec { let mut out = Vec::new(); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let frame = |angle: f32| { glam::Mat4::from_rotation_y((-90.0f32).to_radians()) * glam::Mat4::from_rotation_x(angle.to_radians()) @@ -6478,6 +6599,16 @@ impl Game<'_> { creative: bool, create: Option<&horizon_client::title::WorldOptions>, ) -> Result<()> { + if self.defer_world_entry(PendingWorldEntry::Local { + folder: folder.to_owned(), + name: name.map(str::to_owned), + seed, + creative, + create: create.cloned().map(Box::new), + })? { + return Ok(()); + } + self.join_world_rest()?; let save_root = std::env::current_dir()?.join("saves").join(folder); if integrated::wanted(&self.options, &save_root) { return self.open_integrated(folder, name, seed, creative, create); @@ -6539,7 +6670,7 @@ impl Game<'_> { let dim = Dim::from_id(&level.dimension); let (mut streaming, save) = self.make_streaming(&save_root, dim, level.seed)?; streaming.radius = self.settings.render_distance; - let mut world = World::new(self.res.facts.air, level.seed); + let mut world = World::new(self.res.facts().air, level.seed); world.fast_lava = dim == Dim::Nether; world.game_time = level.time; world.day_time = self.options.time.unwrap_or(level.day_time); @@ -6617,7 +6748,7 @@ impl Game<'_> { self.save = save; self.level = level; // ServerRecipeBook.loadUntrusted: recipes the manager does not have are dropped. - let index = &self.res.stations.recipe_index; + let index = &self.res.stations().recipe_index; let book = &mut self.level.recipe_book; book.recipes.retain(|r| index.contains(r)); book.to_be_displayed.retain(|r| index.contains(r)); @@ -6697,7 +6828,7 @@ impl Game<'_> { horizon_client::flatgen::FlatTerrain::from_settings( &s, pack.assets.registry, - &res.biomes, + res.biomes(), ) }); let mut streaming = if let Some(inner) = flat { @@ -6706,28 +6837,28 @@ impl Game<'_> { inner: Arc::new(inner), save: save.clone(), registry: pack.assets.clone(), - biomes: res.biomes.clone(), + biomes: res.biomes().clone(), }), pack.context.clone(), - res.threads, + res.threads(), ) } else if self.options.test_terrain && dim == Dim::Overworld { - let inner = Arc::new(TestTerrain::new(pack.assets.registry, &res.biomes)?); + let inner = Arc::new(TestTerrain::new(pack.assets.registry, res.biomes())?); Streaming::new( Arc::new(Persistent { inner, save: save.clone(), registry: pack.assets.clone(), - biomes: res.biomes.clone(), + biomes: res.biomes().clone(), }), pack.context.clone(), - res.threads, + res.threads(), ) } else { // WorldOptions.generateStructures, from the world's settings. let structures = horizon_client::save::WorldGen::read(world_root).is_none_or(|w| w.structures); - let inner = Arc::new(VanillaTerrain::for_world(&self.options.resources.join("worldgen"), pack.assets.registry, &res.biomes, seed, dim.id(), structures).map_err(|e| { + let inner = Arc::new(VanillaTerrain::for_world(&self.options.resources.join("worldgen"), pack.assets.registry, res.biomes(), seed, dim.id(), structures).map_err(|e| { format!("{e}\nPrepare the worldgen bundle with the launcher, or: horizon-prepare --prepare") })?); self.end.set_locator(Some(inner.clone())); @@ -6736,10 +6867,10 @@ impl Game<'_> { inner, save: save.clone(), registry: pack.assets.clone(), - biomes: res.biomes.clone(), + biomes: res.biomes().clone(), }), pack.context.clone(), - res.threads, + res.threads(), ) }; streaming.radius = self.settings.render_distance; @@ -6777,7 +6908,7 @@ impl Game<'_> { let keys: Vec<_> = self.world.modified.drain().collect(); let chunks = self.with_entities(keys.iter().filter_map(|k| self.world.chunks.get(k))); self.save - .save(&chunks, self.pack.assets.registry, &self.res.biomes)?; + .save(&chunks, self.pack.assets.registry, self.res.biomes())?; self.save_dimension_entities()?; // Coordinates scale by 8 between the Overworld and the Nether. let scale = match (self.dim, target) { @@ -6793,7 +6924,7 @@ impl Game<'_> { )); let (streaming, save) = self.make_streaming(&self.world_root.clone(), target, self.level.seed)?; - let mut world = World::new(self.res.facts.air, self.level.seed); + let mut world = World::new(self.res.facts().air, self.level.seed); world.fast_lava = target == Dim::Nether; world.game_time = self.world.game_time; world.day_time = self.world.day_time; @@ -6829,7 +6960,7 @@ impl Game<'_> { fn portal_shape(&self, start: [i32; 3], x_axis: bool) -> Option<([i32; 3], i32, i32)> { let name = |p: [i32; 3]| { self.res - .facts + .facts() .get(self.world.block(p[0], p[1], p[2])) .name .clone() @@ -6991,7 +7122,7 @@ impl Game<'_> { horizon_client::crash::clear_detail("World"); self.debug_charts.reset(); self.streaming.paused = true; - self.world = World::new(self.res.facts.air, 0); + self.world = World::new(self.res.facts().air, 0); self.player = None; self.sleeping = None; self.sleep_timer = 0; @@ -7054,7 +7185,7 @@ impl Game<'_> { .collect(); equipped.push((self.inventory[self.selected].as_ref(), "mainhand")); for (stack, slot) in equipped { - let Some(info) = stack.and_then(|s| self.res.items.get(&s.item)) else { + let Some(info) = stack.and_then(|s| self.res.items().get(&s.item)) else { continue; }; for (attribute, id, amount, op, group) in &info.modifiers { @@ -7089,7 +7220,7 @@ impl Game<'_> { .collect(); for (slot, amount) in self.armor.iter_mut().zip(losses) { if let Some(stack) = slot.as_mut() - && let Some(info) = self.res.items.get(&stack.item) + && let Some(info) = self.res.items().get(&stack.item) && info.max_damage > 0 { stack.damage += amount; @@ -7126,7 +7257,7 @@ impl Game<'_> { let b = p.map(|v| v.floor() as i32); if b != last { let state = self.world.block(b[0], b[1], b[2]); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); let face = [last[0] - b[0], last[1] - b[1], last[2] - b[2]]; if f.fluid != Fluid::None && f.fluid_level == 8 @@ -7140,7 +7271,7 @@ impl Game<'_> { point: p, }); } - if !self.res.facts.is_air(state) && f.fluid == Fluid::None { + if !self.res.facts().is_air(state) && f.fluid == Fluid::None { return Some(Hit { pos: b, face, @@ -7197,7 +7328,7 @@ impl Game<'_> { let Some(held) = self.held() else { return Ok(false); }; - let removes_dye = cauldron::removes_dye(&self.res.items, &held.item); + let removes_dye = cauldron::removes_dye(self.res.items(), &held.item); let above = self.world.block(pos[0], pos[1] + 1, pos[2]); let under_water = registry .state(above) @@ -7253,7 +7384,7 @@ impl Game<'_> { } let Some(id) = self .res - .items + .items() .get(&stack.item) .and_then(|i| i.block_transformer.clone()) else { @@ -7264,7 +7395,7 @@ impl Game<'_> { let shield = self .offhand .as_ref() - .and_then(|s| self.res.items.get(&s.item)) + .and_then(|s| self.res.items().get(&s.item)) .is_some_and(|i| i.blocks_attacks.is_some()); if shield && !self.keys.contains(&KeyCode::ShiftLeft) { return Ok(false); @@ -7286,8 +7417,8 @@ impl Game<'_> { }; let Some((_, t, state)) = self.res - .transformers - .apply(&self.res.items, registry, &id, face_name, &around) + .transformers() + .apply(self.res.items(), registry, &id, face_name, &around) else { return Ok(false); }; @@ -7358,7 +7489,7 @@ impl Game<'_> { }; let max = self .held() - .and_then(|s| self.res.items.get(&s.item)) + .and_then(|s| self.res.items().get(&s.item)) .map_or(0, |i| i.max_damage); let cell = self.held_mut(); if let Some(stack) = cell.as_mut() @@ -7423,7 +7554,7 @@ impl Game<'_> { return Ok(UseResult::Pass); }; let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - let f = self.res.facts.get(state).clone(); + let f = self.res.facts().get(state).clone(); if f.fluid == Fluid::None || f.fluid_level != 8 || f.fluid_falling { return Ok(UseResult::Pass); } @@ -7471,7 +7602,7 @@ impl Game<'_> { if !self.may_build() { return Ok(UseResult::Fail); } - let target = if self.res.facts.get(clicked).replaceable { + let target = if self.res.facts().get(clicked).replaceable { hit.pos } else { [ @@ -7513,7 +7644,7 @@ impl Game<'_> { if item == "honeycomb" { let registry = self.pack.assets.registry; let old = registry.state(clicked).cloned(); - if let Some(waxed) = old.and_then(|old| self.res.transformers.waxed(registry, &old)) + if let Some(waxed) = old.and_then(|old| self.res.transformers().waxed(registry, &old)) && let Ok(state) = registry.resolve(&waxed) { self.level_set(hit.pos, state)?; @@ -7534,7 +7665,7 @@ impl Game<'_> { if !self.may_build() { return Ok(UseResult::Fail); } - let name = self.res.facts.get(clicked).name.clone(); + let name = self.res.facts().get(clicked).name.clone(); if self.can_light(clicked, &name) { let registry = self.pack.assets.registry; let mut state = registry @@ -7718,7 +7849,7 @@ impl Game<'_> { .filter(|(feet, _)| distance(feet) < 64.0) .min_by(|a, b| distance(&a.0).total_cmp(&distance(&b.0))) .map(|(_, target)| *target); - o.tick(&self.world, &self.res.facts, self.collision, target) + o.tick(&self.world, self.res.facts(), self.collision, target) }); let mut gained = 0; let mut taken = Vec::new(); @@ -7919,10 +8050,16 @@ impl Game<'_> { if hand == Hand::Off { continue; } - let Some(arm) = self.res.player_arm.clone() else { + let Some(arm) = self.res.player_arm().clone() else { continue; }; - let Some(r) = self.atlas.sprites.get("entity/player/wide/steve").copied() else { + let Some(r) = self + .gui + .atlas + .sprites + .get("entity/player/wide/steve") + .copied() + else { continue; }; // renderPlayerArm (right arm) @@ -8046,22 +8183,22 @@ impl Game<'_> { } out } - /// The renderer for the window, with the current block sprites, shared + /// The renderer for the window, with the current block sprites, GUI /// atlas and world border texture. fn new_renderer(&self, window: Arc) -> Result { - self.renderer_for(window, &self.pack, &self.atlas) + self.renderer_for(window, &self.pack, &self.gui) } fn renderer_for( &self, window: Arc, pack: &PackResources, - atlas: &HudAtlas, + gui: &UiResources, ) -> Result { build_renderer( window, self.options.offscreen, pack, - atlas, + gui, self.renderer.as_ref(), ) } @@ -8111,7 +8248,7 @@ impl Game<'_> { /// base temperature lowered above y 80) or none (no precipitation). fn precipitation(&self, x: i32, y: i32, z: i32) -> Option { let chunk = self.world.chunks.get(&(x >> 4, z >> 4))?; - let b = self.res.biomes.get(chunk.biome(x, y, z)); + let b = self.res.biomes().get(chunk.biome(x, y, z)); if !b.precipitation { return None; } @@ -8127,7 +8264,7 @@ impl Game<'_> { let mut y = from; while y > MIN_Y { let s = self.world.block(x, y, z); - let f = self.res.facts.get(s); + let f = self.res.facts().get(s); if f.full_collision || f.fluid != Fluid::None || f.name.contains("leaves") { return y + 1; } @@ -8178,7 +8315,7 @@ impl Game<'_> { if intensity <= 0.0 { return; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (Some(rain_tex), Some(snow_tex)) = ( atlas.sprites.get("environment/rain").copied(), atlas.sprites.get("environment/snow").copied(), @@ -8382,7 +8519,7 @@ impl Game<'_> { } /// Vanilla tooltip: dark box with a purple gradient border. fn tooltip(&self, batch: &mut HudBatch, text: &str, x: f32, y: f32) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let w = HudBatch::text_width(atlas, text); let (x, y) = (x + 12.0, y - 12.0); batch.fill(atlas, x - 3.0, y - 4.0, w + 6.0, 16.0, rgba(16, 0, 16, 240)); @@ -8404,7 +8541,7 @@ impl Game<'_> { ) }; batch.fill( - &self.atlas, + &self.gui.atlas, 0.0, 0.0, batch.width, @@ -8415,7 +8552,7 @@ impl Game<'_> { for (i, t) in tabs.iter().enumerate() { if i != selected { let (tx, ty) = Creative::tab_position(t); - batch.sprite(&self.atlas, &tab_sprite(t, false), ox + tx, oy + ty); + batch.sprite(&self.gui.atlas, &tab_sprite(t, false), ox + tx, oy + ty); } } let background = if tab.search { @@ -8425,13 +8562,13 @@ impl Game<'_> { } else { "gui/container/creative_inventory/tab_items" }; - if let Some(mut r) = self.atlas.sprites.get(background).copied() { + if let Some(mut r) = self.gui.atlas.sprites.get(background).copied() { r.u1 = r.u0 + (r.u1 - r.u0) * Creative::WIDTH / r.w as f32; r.v1 = r.v0 + (r.v1 - r.v0) * Creative::HEIGHT / r.h as f32; batch.rect_uv(ox, oy, Creative::WIDTH, Creative::HEIGHT, r, u32::MAX); } let (tx, ty) = Creative::tab_position(&tab); - batch.sprite(&self.atlas, &tab_sprite(&tab, true), ox + tx, oy + ty); + batch.sprite(&self.gui.atlas, &tab_sprite(&tab, true), ox + tx, oy + ty); for t in &tabs { let (tx, ty) = Creative::tab_position(t); let stack = ItemStack { @@ -8447,7 +8584,7 @@ impl Game<'_> { oy + ty + if t.top { 9.0 } else { 7.0 }, ); } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; if !tab.inventory { batch.text( atlas, @@ -8489,7 +8626,7 @@ impl Game<'_> { if Self::creative_trash_hovered(batch, self.cursor) { let (x, y) = Creative::TRASH_POSITION; batch.fill( - &self.atlas, + &self.gui.atlas, ox + x, oy + y, 16.0, @@ -8500,7 +8637,7 @@ impl Game<'_> { if let Some(slot) = self.slot_at(batch, self.cursor.0, self.cursor.1) { let (x, y) = self.slot_position(slot); batch.fill( - &self.atlas, + &self.gui.atlas, ox + x, oy + y, 16.0, @@ -8523,7 +8660,7 @@ impl Game<'_> { && self.cursor.1 >= y && self.cursor.1 < y + 16.0 { - batch.fill(&self.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128)); + batch.fill(&self.gui.atlas, x, y, 16.0, 16.0, rgba(255, 255, 255, 128)); hovered = Some(stack.clone()); } } @@ -8549,7 +8686,7 @@ impl Game<'_> { "gui/sprites/container/creative_inventory/scroller_disabled" }; batch.sprite( - &self.atlas, + &self.gui.atlas, scroller, ox + Creative::SCROLL_X, oy + Creative::SCROLL_Y + self.creative_screen.scroller_offset(), @@ -8759,7 +8896,7 @@ impl Game<'_> { let keys: Vec<_> = self.world.modified.drain().collect(); let chunks = self.with_entities(keys.iter().filter_map(|k| self.world.chunks.get(k))); self.save - .save_later(&chunks, self.pack.assets.registry, &self.res.biomes)?; + .save_later(&chunks, self.pack.assets.registry, self.res.biomes())?; if wait { self.save.flush(); } @@ -8768,6 +8905,19 @@ impl Game<'_> { Ok(()) } fn render(&mut self) -> Result { + if self.pending_entry.is_some() { + if let (Some(renderer), Some(loader)) = (&mut self.renderer, &self.rest_loader) { + let mut hud = HudBatch::new([renderer.config.width, renderer.config.height]); + horizon_client::level_loading::draw_progress( + &mut hud, + &self.gui.atlas, + loader.progress.line(), + loader.progress.fraction(), + ); + return renderer.render(&loading_frame(&hud)); + } + return Ok(false); + } self.poll_shader_pack(); let Some(size) = self .renderer @@ -8788,7 +8938,7 @@ impl Game<'_> { let s = self.world .block(c.x.floor() as i32, c.y.floor() as i32, c.z.floor() as i32); - (c, self.res.facts.get(s).fluid == Fluid::Water, yaw, pitch) + (c, self.res.facts().get(s).fluid == Fluid::Water, yaw, pitch) } None => ( glam::DVec3::new(0.5, 100.0, 0.5), @@ -8808,7 +8958,7 @@ impl Game<'_> { let cave_culling = self.settings.horizon.cave_culling && !self .res - .facts + .facts() .get(self.world.block(block[0], block[1], block[2])) .solid_render; // The cave culling search runs on its worker while the frame is prepared. @@ -8826,7 +8976,7 @@ impl Game<'_> { .get(&(block[0] >> 4, block[2] >> 4)) .map(|c| c.biome(block[0], block[1], block[2])) .unwrap_or(0); - let info = self.res.biomes.get(biome).clone(); + let info = self.res.biomes().get(biome).clone(); let environment = self.dim_environment(); let mut sky = environment.sample(self.world.day_time, info.sky, info.fog); let (rain, thunder) = if self.dim == Dim::Overworld { @@ -8867,10 +9017,10 @@ impl Game<'_> { self.pick() .map(|h| { let state = self.world.block(h.pos[0], h.pos[1], h.pos[2]); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); outline_after_terrain = self .pack - .assets + .render .model_catalog .collect(state, BlockPos::new(h.pos[0], h.pos[1], h.pos[2])) .is_ok_and(|models| { @@ -9029,7 +9179,7 @@ impl Game<'_> { clouds: ((!title || live) && self.dim == Dim::Overworld && horizon_client::clouds::visible(&self.settings.clouds, sky.cloud_color[3])) - .then(|| self.atlas.sprites.get("horizon/white")) + .then(|| self.gui.atlas.sprites.get("horizon/white")) .flatten() .map(|white| horizon_client::clouds::Input { texture: &self.pack.clouds, @@ -9059,14 +9209,15 @@ impl Game<'_> { .mining .as_ref() .and_then(|m| { - self.atlas.sprites.get(&format!( + self.gui.atlas.sprites.get(&format!( "block/destroy_stage_{}", ((m.progress * 10.0) as u32).min(9) )) }) .map_or([0.0; 4], |r| [r.u0, r.v0, r.u1 - r.u0, r.v1 - r.v0]), end_portal_sprites: ["environment/end_sky", "entity/end_portal/end_portal"].map(|n| { - self.atlas + self.gui + .atlas .sprites .get(n) .map_or([0.0; 4], |r| [r.u0, r.v0, r.u1 - r.u0, r.v1 - r.v0]) @@ -9126,7 +9277,7 @@ impl Game<'_> { reason: horizon_client::level_loading::Reason, ) { use horizon_client::level_loading::{self, Reason, STATUS_RADIUS}; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); match reason { // The panorama and its blur are drawn by the renderer. @@ -9419,7 +9570,7 @@ impl Game<'_> { if !modified.is_empty() && let Err(e) = horizon_client::spans::time("save_chunks", || { self.save - .save_later(&modified, self.pack.assets.registry, &self.res.biomes) + .save_later(&modified, self.pack.assets.registry, self.res.biomes()) }) { log::warn!("Horizon: failed to save unloaded chunks: {e}"); @@ -9506,7 +9657,10 @@ impl ApplicationHandler for Game<'_> { } }; match self.new_renderer(window.clone()) { - Ok(r) => self.renderer = Some(r), + Ok(r) => { + self.renderer = Some(r); + self.world_renderer_ready = true; + } Err(e) => { self.error = Some(e); event_loop.exit(); @@ -9584,6 +9738,25 @@ impl ApplicationHandler for Game<'_> { // The press state of Horizon-style buttons. horizon_client::ui_theme::set_pressed(*state == ElementState::Pressed); } + if self.pending_entry.is_some() + && matches!(&event, WindowEvent::KeyboardInput { event, .. } + if event.state == ElementState::Pressed + && event.physical_key == PhysicalKey::Code(KeyCode::Escape)) + { + self.pending_entry = None; + self.perf.cancel_world_opening(); + return; + } + if self.pending_entry.is_some() + && !matches!( + &event, + WindowEvent::CloseRequested + | WindowEvent::Resized(_) + | WindowEvent::RedrawRequested + ) + { + return; + } let result: Result<()> = (|| { match event { WindowEvent::CloseRequested => { @@ -9636,7 +9809,7 @@ impl ApplicationHandler for Game<'_> { && !horizon_client::ui_theme::horizon() { title.drag(self.cursor, (b.width, b.height)); - title.drag_field(&self.atlas, self.cursor.0); + title.drag_field(&self.gui.atlas, self.cursor.0); } if self.dragging && self.screen == Screen::Options { let _ = b; @@ -9741,7 +9914,7 @@ impl ApplicationHandler for Game<'_> { .map(|r| [r.config.width, r.config.height]) .unwrap_or([1, 1]); let mut b = HudBatch::new(size); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let shift = self.has_shift_down(); let (action, sound) = self.title.as_mut().map_or((Action::None, false), |t| { if horizon_client::ui_theme::horizon() { @@ -10230,6 +10403,11 @@ impl ApplicationHandler for Game<'_> { } } fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) { + if let Err(error) = self.resume_world_entry() { + self.error = Some(error); + event_loop.exit(); + return; + } self.poll_control(event_loop); self.poll_pads(event_loop); if self.options.frames.is_some() && self.started.elapsed() > self.options.timeout { @@ -10285,7 +10463,7 @@ impl<'a> Game<'a> { fn new( res: &'a Arc, pack: PackResources, - atlas: HudAtlas, + gui: UiResources, options: Options, settings: Settings, audio: Audio, @@ -10294,7 +10472,7 @@ impl<'a> Game<'a> { let registry = pack.assets.registry; // Until a world is opened the streamer is idle. let mut streaming = Streaming::new( - Arc::new(TestTerrain::new(registry, &res.biomes)?), + Arc::new(TestTerrain::new(registry, res.biomes())?), pack.context.clone(), 1, ); @@ -10314,18 +10492,22 @@ impl<'a> Game<'a> { minecarts::CartModels::load(document.as_ref()), ) }; - let world = World::new(res.facts.air, 0); + let world = World::new(res.facts().air, 0); let creative = options.creative; let inventory = vec![None; 36]; let now = Instant::now(); let look = options.look; - let particles = horizon_client::particles::ParticleEngine::new(&root, &atlas.sprites); + let particles = horizon_client::particles::ParticleEngine::new(&root, &gui.atlas.sprites); Ok(Game { res: res.clone(), - collision: &res.collision, - motion: &res.motion, + rest_loader: None, + pending_entry: None, + pending_pack_reload: false, + world_renderer_ready: false, + collision: res.collision(), + motion: res.motion(), pack, - atlas, + gui, fog: Default::default(), screen_fx: Default::default(), world, @@ -10610,23 +10792,150 @@ impl<'a> Game<'a> { struct Loaded { root: PathBuf, pack_error: Option, - resources: Resources, + resources: Arc, + rest_loader: Option, pack: PackResources, - atlas: HudAtlas, + /// The menu bundle, for the synchronous launch; the loading screen receives + /// it earlier through its own channel. + gui: Option, } -/// The loader's checkpoints, in order; the loading screen reports them. -const STAGES: u32 = 9; -const STAGE_LINES: [&str; 9] = [ +/// What the background loader publishes: the menu bundle as soon as it is +/// ready, then the core bundle with a handle to the rest worker. +enum LoaderMsg { + Ui(UiResources, PathBuf), + Done(std::result::Result), +} + +enum PendingWorldEntry { + Local { + folder: String, + name: Option, + seed: Option, + creative: bool, + create: Option>, + }, + Server { + address: String, + name: String, + }, +} + +struct WorldRestLoader { + progress: Progress, + handle: JoinHandle>, + started: Instant, +} + +impl WorldRestLoader { + fn ready(&self) -> Result { + if self.handle.is_finished() { + return Ok(true); + } + if self.started.elapsed() > Duration::from_secs(120) { + return Err("world resource loading timed out after 120 seconds".into()); + } + Ok(false) + } + + fn finish(self) -> Result<()> { + self.handle + .join() + .map_err(|_| "world resource loader panicked")? + .map_err(Into::into) + } +} + +impl Game<'_> { + fn defer_world_entry(&mut self, entry: PendingWorldEntry) -> Result { + self.poll_world_rest()?; + if self.rest_loader.is_none() { + return Ok(false); + } + self.perf.world_opening(); + if self.title.is_none() { + self.title = Some(Title::new( + std::env::current_dir()?.join("saves"), + &self.options.resources, + )); + } + self.pending_entry = Some(entry); + log::info!("Horizon: world entry waiting for world resources"); + Ok(true) + } + + fn resume_world_entry(&mut self) -> Result<()> { + self.poll_world_rest()?; + if self.rest_loader.is_some() { + return Ok(()); + } + if std::mem::take(&mut self.pending_pack_reload) { + self.reload_packs(); + } + match self.pending_entry.take() { + Some(PendingWorldEntry::Local { + folder, + name, + seed, + creative, + create, + }) => { + self.open_world(&folder, name.as_deref(), seed, creative, create.as_deref())?; + } + Some(PendingWorldEntry::Server { address, name }) => { + self.connect_server(&address, &name)?; + } + None => {} + } + Ok(()) + } + + fn poll_world_rest(&mut self) -> Result<()> { + if let Some(loader) = &self.rest_loader + && loader.ready()? + { + self.rest_loader + .take() + .ok_or("missing world loader")? + .finish()?; + } + Ok(()) + } + + fn join_world_rest(&mut self) -> Result<()> { + if self.rest_loader.is_some() { + let waited = Instant::now(); + log::info!("Horizon: waiting for world resources"); + while self.rest_loader.is_some() { + self.poll_world_rest()?; + if self.rest_loader.is_some() { + std::thread::sleep(Duration::from_millis(10)); + } + } + log::info!( + "Horizon: world resources joined after {} ms", + waited.elapsed().as_millis() + ); + } + if self.res.rest.get().is_none() { + return Err("world resources are unavailable".into()); + } + Ok(()) + } +} + +const STAGES: u32 = 10; +const STAGE_LINES: [&str; 10] = [ + "Loading menu", "Loading assets", "Loading block facts", - "Loading items", "Loading biomes", "Loading pack tables", - "Loading atlas", "Loading collision", - "Loading resources", - "Starting audio", + "Loading items", + "Loading recipes", + "Loading world resources", + "World resources ready", ]; /// The background loader's checkpoint, read by the loading screen each frame. @@ -10663,26 +10972,53 @@ fn synchronous_startup(options: &Options) -> bool { || std::env::var_os("HORIZON_NET_REPORT").is_some() } -/// The current loading sequence, unchanged, as a function so the synchronous -/// launch can run it on the main thread and an ordinary launch on a worker. -/// `on_stage` reports [`STAGES`] checkpoints to the loading screen. +/// The synchronous launch loads both phases; an ordinary launch returns the +/// core bundle while the rest worker keeps loading. fn load_resources( mut root: PathBuf, vanilla_root: &std::path::Path, settings: &Settings, started: Instant, - on_stage: &(dyn Fn(u32) + Sync), + menu: bool, + progress: &Progress, + publish: &mut dyn FnMut(UiResources, &std::path::Path), ) -> Result { + let requested_root = root.clone(); + let threads = settings.horizon.worker_threads(); + // Stage A: the menu bundle (atlas and panorama). With a loading screen it is + // published at once so the title backdrop can appear while the world bundle + // loads; the synchronous launch instead carries it in `Loaded`. + let mut loaded_gui = None; + let mut ui_ready = false; + if let Ok(ui) = UiResources::load(&root) { + if menu { + horizon_client::telemetry::mark_ui_ready(); + log::info!( + "Horizon: UI bundle ready after {} ms", + started.elapsed().as_millis() + ); + publish(ui, &root); + } else { + loaded_gui = Some(ui); + } + ui_ready = true; + } + progress.set(0); let mut pack_error = None; - let assets = match Assets::load(&root) { - Ok(assets) => assets, + let (assets, render) = match Assets::load(&root).and_then(|assets| { + let render = assets.reload(&root)?; + Ok((assets, render)) + }) { + Ok(bundle) => bundle, // Minecraft.rollbackResourcePacks: the packs break loading, start // with the game's own resources. Err(e) if root != vanilla_root => { log::warn!("Horizon: resource packs failed to load ({e}); using the default resources"); pack_error = Some(e.to_string()); root = vanilla_root.to_path_buf(); - Assets::load(vanilla_root)? + let assets = Assets::load(vanilla_root)?; + let render = assets.reload(vanilla_root)?; + (assets, render) } Err(e) => { return Err(format!( @@ -10692,38 +11028,68 @@ fn load_resources( } }; let assets = Arc::new(assets); + let render = Arc::new(render); + // The menu bundle must come from the same root as the world bundle. + if !ui_ready || root != requested_root { + let ui = UiResources::load(&root)?; + if menu { + horizon_client::telemetry::mark_ui_ready(); + log::info!( + "Horizon: UI bundle ready after {} ms", + started.elapsed().as_millis() + ); + publish(ui, &root); + } else { + loaded_gui = Some(ui); + } + } log::info!("load assets: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(0); + progress.set(1); let behaviour_json: serde_json::Value = serde_json::from_reader(std::io::BufReader::new( std::fs::File::open(root.join("block-behaviours.json"))?, ))?; + // The block facts, the biomes and the environment are independent reads: + // run them together, within the worker budget the settings allow. + let registry = assets.registry; + let load_facts = || { + BlockFacts::load_with_projection(&root, registry, &behaviour_json) + .map_err(|e| e.to_string()) + }; + let load_biomes = || Biomes::load(&root).map_err(|e| e.to_string()); + let load_environment = || Environment::load(&root).map_err(|e| e.to_string()); + let (facts, biomes, environment) = if threads > 1 { + std::thread::scope(|scope| { + let facts = scope.spawn(load_facts); + let biomes = scope.spawn(load_biomes); + let environment = scope.spawn(load_environment); + ( + facts.join().unwrap(), + biomes.join().unwrap(), + environment.join().unwrap(), + ) + }) + } else { + (load_facts(), load_biomes(), load_environment()) + }; let (facts, gameplay_projection) = - BlockFacts::load_with_projection(&root, assets.registry, &behaviour_json)?; - let mob_data = horizon_client::mobs::MobData::load(&root, &facts); - horizon_client::mobs::trial_spawner::load_registry(&root); + facts.map_err(|e| -> Box { e.into() })?; + let biomes = Arc::new(biomes.map_err(|e| -> Box { e.into() })?); + let environment = environment.map_err(|e| -> Box { e.into() })?; log::info!("load facts: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(1); - let items = Items::load(&root, assets.registry, &facts)?; - log::info!("load items: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(2); - let recipes = Recipes::load(&root, &items)?; - let transformers = horizon_client::block_transform::Transformers::load(&root, assets.registry)?; - let biomes = Arc::new(Biomes::load(&root)?); - let environment = Environment::load(&root)?; + progress.set(2); log::info!("load biomes+env: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(3); + progress.set(3); let light = Arc::new(LightTables::load(&root, assets.registry, &facts)?); - let pack = PackResources::load(&root, assets.clone(), &facts, biomes.clone(), light)?; + let pack = PackResources::load(&root, assets.clone(), render, &facts, biomes.clone(), light)?; log::info!("load pack tables: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(4); - let atlas = HudAtlas::build(&root)?; - horizon_client::ui::load_metadata(&root); - horizon_client::lang::set(horizon_client::lang::Language::load( - &[&root], - &settings.language, - )); - log::info!("load atlas: {:.2}s", started.elapsed().as_secs_f32()); - on_stage(5); + progress.set(4); + if !menu { + horizon_client::ui::load_metadata(&root); + horizon_client::lang::set(horizon_client::lang::Language::load( + &[&root], + &settings.language, + )); + } let registry_owner = assets.clone(); let collision = collisions::load(&root, registry_owner.registry)?; let motion = MotionResources::load_with_facts(&root, ®istry_owner, &facts)?; @@ -10731,8 +11097,109 @@ fn load_resources( "load collision+motion: {:.2}s", started.elapsed().as_secs_f32() ); - on_stage(6); - let threads = settings.horizon.worker_threads(); + progress.set(5); + let resources = Resources { + core: WorldCore { + facts, + biomes: biomes.clone(), + environment, + collision, + motion, + threads, + }, + rest: std::sync::OnceLock::new(), + }; + let resources = Arc::new(resources); + if menu { + horizon_client::telemetry::mark_core_ready(); + log::info!( + "Horizon: core-ready after {} ms", + started.elapsed().as_millis() + ); + } + let rest_loader = if menu { + let resources = resources.clone(); + let root = root.clone(); + let rest_progress = progress.clone(); + let progress = progress.clone(); + let handle = std::thread::Builder::new() + .name("world-rest-loader".into()) + .spawn(move || { + let rest = load_world_rest( + &root, + &resources, + &assets, + &behaviour_json, + &gameplay_projection, + &progress, + started, + ) + .map_err(|error| error.to_string())?; + resources + .rest + .set(rest) + .map_err(|_| "world resources already loaded".to_owned())?; + progress.set(9); + horizon_client::telemetry::mark_rest_ready(); + log::info!( + "Horizon: rest-ready after {} ms", + started.elapsed().as_millis() + ); + Ok(()) + })?; + Some(WorldRestLoader { + progress: rest_progress, + handle, + started: Instant::now(), + }) + } else { + let rest = load_world_rest( + &root, + &resources, + &assets, + &behaviour_json, + &gameplay_projection, + progress, + started, + )?; + resources + .rest + .set(rest) + .map_err(|_| "world resources already loaded")?; + None + }; + Ok(Loaded { + root, + pack_error, + resources, + rest_loader, + pack, + gui: loaded_gui, + }) +} + +fn load_world_rest( + root: &std::path::Path, + resources: &Resources, + assets: &Assets, + behaviour_json: &serde_json::Value, + gameplay_projection: &[horizon_client::blocks::GameplayProjection], + progress: &Progress, + started: Instant, +) -> Result { + let facts = resources.facts(); + let biomes = resources.biomes(); + let threads = resources.threads(); + let registry_owner = assets; + progress.set(6); + let mob_data = horizon_client::mobs::MobData::load(root, facts); + horizon_client::mobs::trial_spawner::load_registry(root); + + let items = Items::load(root, assets.registry, facts)?; + log::info!("load items: {:.2}s", started.elapsed().as_secs_f32()); + progress.set(7); + let recipes = Recipes::load(root, &items)?; + let transformers = horizon_client::block_transform::Transformers::load(root, assets.registry)?; log::info!( "Horizon: resources loaded in {:.1}s; {} block states, {} items, {} biomes; {} worker threads", started.elapsed().as_secs_f32(), @@ -10741,59 +11208,42 @@ fn load_resources( biomes.list.len(), threads ); - let stations = horizon_client::stations::StationData::load(&root, &items); + progress.set(8); + let stations = horizon_client::stations::StationData::load(root, &items); let animate = - horizon_client::animate_tick::AnimateTables::load(&root, registry_owner.registry, &biomes)?; - let fog = horizon_client::fog::FogTables::load(&root, &biomes); - let resources = Resources { + horizon_client::animate_tick::AnimateTables::load(root, registry_owner.registry, biomes)?; + let fog = horizon_client::fog::FogTables::load(root, biomes); + Ok(WorldRest { stations, - facts, items, recipes, transformers, - biomes, - environment, - collision, - motion, - providers: Providers::load(&root), + providers: Providers::load(root), block_entity_render: horizon_client::block_entity_render::BlockEntityRenderer::load( - &root, + root, registry_owner.registry, )?, animate, fog, - music: horizon_client::music::MusicTables::load(&root), - ambient: horizon_client::ambience::AmbientTables::load(&root), - nether_environment: Environment::load_dimension(&root, "the_nether", false)?, - end_environment: Environment::load_dimension(&root, "the_end", false)?, + music: horizon_client::music::MusicTables::load(root), + ambient: horizon_client::ambience::AmbientTables::load(root), + nether_environment: Environment::load_dimension(root, "the_nether", false)?, + end_environment: Environment::load_dimension(root, "the_end", false)?, behaviours: Behaviours::load_with_gameplay( registry_owner.registry, - &root, - &behaviour_json, - &gameplay_projection, + root, + behaviour_json, + gameplay_projection, )?, - mob_types: MobTypes::load(&root)? + mob_types: MobTypes::load(root)? .types .into_iter() .map(|(k, v)| (k, Arc::new(v))) .collect(), mob_data, - threads, - player_type: perspective::player_type(&root), - player_arm: horizon_client::mobs::load_model(&root, "minecraft:player#main") + player_type: perspective::player_type(root), + player_arm: horizon_client::mobs::load_model(root, "minecraft:player#main") .and_then(|m| m.children.into_iter().find(|c| c.name == "right_arm")), - }; - // Both inputs are needed only while constructing the behaviour tables. - // Release their owned JSON/Arc buffers before entering the long-lived game loop. - drop(gameplay_projection); - drop(behaviour_json); - on_stage(7); - Ok(Loaded { - root, - pack_error, - resources, - pack, - atlas, }) } @@ -10803,10 +11253,11 @@ fn build_renderer( window: Arc, offscreen: bool, pack: &PackResources, - atlas: &HudAtlas, + gui: &UiResources, previous: Option<&Renderer>, ) -> Result { - let assets = &pack.assets; + let assets = &pack.render; + let atlas = &gui.atlas; let mut renderer = pollster::block_on(Renderer::new( window, offscreen, @@ -10818,7 +11269,7 @@ fn build_renderer( &assets.animations, (&atlas.pixels, atlas.width, atlas.height), (&pack.forcefield.2, pack.forcefield.0), - &pack.panorama, + &gui.panorama, previous, ))?; renderer.hud.fire_animations = atlas @@ -10830,18 +11281,22 @@ fn build_renderer( } /// The loading screen's renderer: the real HUD atlas and font over one opaque -/// white block-sprite layer, an empty border texture and an empty panorama. +/// white block-sprite layer, an empty border texture and the title panorama +/// once the menu bundle is ready. fn loading_renderer( window: Arc, offscreen: bool, - atlas: Option<&HudAtlas>, + gui: Option<&UiResources>, + previous: Option<&Renderer>, ) -> Result { static FORCEFIELD: [u8; 4] = [0; 4]; static EMPTY_HUD: [u8; 4] = [0, 0, 0, 255]; - let panorama = horizon_client::gfx::panorama::Faces { + let empty_panorama = horizon_client::gfx::panorama::Faces { size: 1, pixels: [0u8; 4].repeat(6), }; + let panorama = gui.map_or(&empty_panorama, |gui| gui.panorama.as_ref()); + let atlas = gui.map(|gui| &gui.atlas); let (pixels, width, height) = match atlas { Some(atlas) => (atlas.pixels.as_slice(), atlas.width, atlas.height), None => (EMPTY_HUD.as_slice(), 1, 1), @@ -10857,8 +11312,8 @@ fn loading_renderer( &[], (pixels, width, height), (&FORCEFIELD[..], 1), - &panorama, - None, + panorama, + previous, ))?; if let Some(atlas) = atlas { renderer.hud.fire_animations = atlas @@ -10928,12 +11383,13 @@ fn loading_frame(hud: &HudBatch) -> Frame<'_> { fn start_game<'a>( res: &'a Arc, pack: PackResources, - atlas: HudAtlas, + gui: UiResources, options: Options, pack_error: Option, audio: Audio, vanilla_root: PathBuf, started: Instant, + rest_loader: Option, ) -> Result>> { let mut settings = Settings::load(&std::env::current_dir()?.join("options.txt")); horizon_client::ui_theme::load_preferences(&std::env::current_dir()?); @@ -10947,7 +11403,8 @@ fn start_game<'a>( if let Some(d) = options.distance_override { settings.render_distance = d; } - let mut game = Game::new(res, pack, atlas, options, settings, audio)?; + let mut game = Game::new(res, pack, gui, options, settings, audio)?; + game.rest_loader = rest_loader; game.ui.vanilla_root = vanilla_root; if let Some(error) = pack_error { game.open_options_at(true, horizon_client::options_ui::Page::Packs); @@ -11078,7 +11535,7 @@ fn run_event_loop(mut game: Game<'_>) -> Result<()> { struct Loading { window: Option>, renderer: Option, - atlas: Option, + gui: Option, settings: Settings, fullscreen: horizon_client::window::FullscreenState, options: Option, @@ -11086,10 +11543,11 @@ struct Loading { pack_error: Option, started: Instant, progress: Progress, - receiver: Receiver>, + receiver: Receiver, loaded: Option>, handle: Option>, shown: bool, + menu: startup_menu::StartupMenu, error: Option>, } impl Loading { @@ -11121,7 +11579,7 @@ impl Loading { } }; let offscreen = self.options.as_ref().is_some_and(|o| o.offscreen); - match loading_renderer(window.clone(), offscreen, self.atlas.as_ref()) { + match loading_renderer(window.clone(), offscreen, self.gui.as_ref(), None) { Ok(r) => self.renderer = Some(r), Err(e) => { self.error = Some(e); @@ -11140,31 +11598,44 @@ impl Loading { if self.window.as_ref().is_none_or(|w| w.id() != id) { return; } - match event { - WindowEvent::CloseRequested => event_loop.exit(), - WindowEvent::Resized(size) => { - if let Some(r) = &mut self.renderer { - r.resize(size.width, size.height); - } + if let Err(error) = self.menu_event(event_loop, event) { + self.error = Some(error); + event_loop.exit(); + } + } + /// The menu bundle arrived: rebuild the loading screen with the real atlas + /// and title panorama. + fn set_ui(&mut self, gui: UiResources, root: PathBuf) { + log::info!( + "Horizon: loading the title artwork after {} ms", + self.started.elapsed().as_millis() + ); + self.menu.set_root(root, &self.settings); + self.gui = Some(gui); + horizon_client::ui_theme::reset_atlas(); + self.apply_menu_settings(); + let Some(window) = self.window.clone() else { + return; + }; + let offscreen = self.options.as_ref().is_some_and(|o| o.offscreen); + if let Some(renderer) = &mut self.renderer { + renderer.release_surface(); + } + match loading_renderer(window, offscreen, self.gui.as_ref(), self.renderer.as_ref()) { + Ok(r) => { + self.settings + .clamp_gui_scale([r.config.width as i32, r.config.height as i32]); + horizon_client::hud::GUI_SCALE.store(self.settings.gui_scale, Ordering::Relaxed); + self.renderer = Some(r); } - WindowEvent::RedrawRequested => self.draw(), - _ => {} + Err(e) => self.error = Some(e), } } fn about_to_wait(&mut self, event_loop: &ActiveEventLoop) { - if self.loaded.is_none() { - match self.receiver.try_recv() { - Ok(result) => self.loaded = Some(result), - Err(TryRecvError::Disconnected) => { - if let Some(handle) = self.handle.take() { - let _ = handle.join(); - } - self.error = Some("resource loader stopped before finishing".into()); - event_loop.exit(); - return; - } - Err(TryRecvError::Empty) => {} - } + if let Err(error) = self.poll_menu_resources() { + self.error = Some(error); + event_loop.exit(); + return; } if let Some(w) = &self.window { if self.options.as_ref().is_some_and(|o| o.offscreen) { @@ -11176,22 +11647,24 @@ impl Loading { event_loop.set_control_flow(ControlFlow::Poll); } fn draw(&mut self) { - let Some(renderer) = self.renderer.as_mut() else { + let Some(size) = self + .renderer + .as_ref() + .map(|r| [r.config.width, r.config.height]) + else { return; }; - let size = [renderer.config.width, renderer.config.height]; let mut batch = HudBatch::new(size); - if let Some(atlas) = &self.atlas { - horizon_client::level_loading::draw_progress( - &mut batch, - atlas, - self.progress.line(), - self.progress.fraction(), - ); - } + self.draw_menu(&mut batch); let frame = loading_frame(&batch); - if let Err(e) = renderer.render(&frame) { - log::warn!("Horizon: loading screen frame failed: {e}"); + if let Some(renderer) = &mut self.renderer { + match renderer.render(&frame) { + Ok(true) if self.gui.is_some() && self.menu.pending.is_none() => { + self.menu.perf.title_shown() + } + Ok(_) => {} + Err(e) => log::warn!("Horizon: loading screen frame failed: {e}"), + } } if !self.shown { self.shown = true; @@ -11204,13 +11677,10 @@ impl Loading { fn finish(&mut self, loaded: Loaded) -> Result>> { let mut options = self.options.take().ok_or("loading already finished")?; options.resources = loaded.root.clone(); - self.progress.set(STAGES - 1); - // Audio is created on the main thread, after the join. - let audio = if options.dedicated.is_some() { - Audio::silent(&options.resources) - } else { - Audio::new(&options.resources) - }; + // StartupMenu owns world selection until it can hand it to Game. + options.world = None; + options.server = None; + let gui = self.gui.take().ok_or("missing menu bundle")?; let window = self.window.clone().ok_or("window closed")?; // Keep the loader's device and swap in the real textures in one step. if let Some(renderer) = &mut self.renderer { @@ -11220,29 +11690,43 @@ impl Loading { window.clone(), options.offscreen, &loaded.pack, - &loaded.atlas, + &gui, self.renderer.as_ref(), )?; + log::info!( + "Horizon: world renderer ready after {} ms", + self.started.elapsed().as_millis() + ); + // Audio is created on the main thread, after the core is ready. + let audio = if options.dedicated.is_some() { + Audio::silent(&options.resources) + } else { + Audio::new(&options.resources) + }; let pack_error = loaded.pack_error.or_else(|| self.pack_error.take()); // The game borrows its shared resources for the process's lifetime, // like the single copy an integrated server would share. - let res: &'static Arc = Box::leak(Box::new(Arc::new(loaded.resources))); + let res: &'static Arc = Box::leak(Box::new(loaded.resources)); let Some(mut game) = start_game( res, loaded.pack, - loaded.atlas, + gui, options, pack_error, audio, self.vanilla_root.clone(), self.started, + loaded.rest_loader, )? else { return Ok(None); }; game.window = Some(window); game.renderer = Some(renderer); + game.world_renderer_ready = true; game.fullscreen = self.fullscreen; + self.menu.handoff(&mut game); + game.settings = self.settings.clone(); game.apply_settings(); game.previous = Instant::now(); Ok(Some(game)) @@ -11291,7 +11775,11 @@ impl ApplicationHandler for App { event_loop.exit(); return; } - match loading.loaded.take() { + match if loading.menu.reload_packs { + None + } else { + loading.loaded.take() + } { None => Step::Waiting, Some(Err(e)) => Step::Failed(e.into()), Some(Ok(loaded)) => match loading.finish(loaded) { @@ -11330,28 +11818,15 @@ fn run_loading( pack_error: Option, started: Instant, ) -> Result<()> { + horizon_client::ui_theme::load_preferences(&std::env::current_dir()?); let progress = Progress::new(); - let (sender, receiver) = std::sync::mpsc::channel(); - let loader = { - let progress = progress.clone(); - let settings = settings.clone(); - let vanilla_root = vanilla_root.clone(); - let root = options.resources.clone(); - std::thread::Builder::new() - .name("resource-loader".into()) - .spawn(move || { - let result = load_resources(root, &vanilla_root, &settings, started, &|stage| { - progress.set(stage) - }) - .map_err(|e| e.to_string()); - let _ = sender.send(result); - })? - }; - let atlas = HudAtlas::build(&options.resources).ok(); + let (receiver, loader) = + startup_menu::spawn_loader(&options, &settings, &vanilla_root, started, &progress)?; + let menu = startup_menu::StartupMenu::new(&options, pack_error.as_deref())?; let loading = Loading { window: None, renderer: None, - atlas, + gui: None, settings, fullscreen: horizon_client::window::FullscreenState::new(false), options: Some(options), @@ -11363,6 +11838,7 @@ fn run_loading( loaded: None, handle: Some(loader), shown: false, + menu, error: None, }; let mut app = App::Loading(Box::new(loading)); @@ -11397,6 +11873,9 @@ pub fn run() -> Result<()> { // Snapshots of derived tables live in the game folder, never beside the // shared resources. Behaviours::set_cache_dir(std::env::current_dir()?.join(".horizon-cache")); + if !synchronous_startup(&options) { + return run_loading(options, early_settings, vanilla_root, None, started); + } let mut pack_error = None; options.resources = packs::startup_root(&vanilla_root, &early_settings.resource_packs) .unwrap_or_else(|e| { @@ -11409,34 +11888,33 @@ pub fn run() -> Result<()> { &early_settings.mods.enabled, &options.dev_mods, ); - // Harnesses and dedicated runs stay synchronous; a normal launch enters - // the event loop at once and loads the resources on a worker. - if !synchronous_startup(&options) { - return run_loading(options, early_settings, vanilla_root, pack_error, started); - } let loaded = load_resources( options.resources.clone(), &vanilla_root, &early_settings, started, - &|_| {}, + false, + &Progress::new(), + &mut |_, _| {}, )?; + let gui = loaded.gui.ok_or("missing menu bundle")?; options.resources = loaded.root.clone(); let audio = if options.dedicated.is_some() { Audio::silent(&options.resources) } else { Audio::new(&options.resources) }; - let resources = Arc::new(loaded.resources); + let resources = loaded.resources; let game = start_game( &resources, loaded.pack, - loaded.atlas, + gui, options, loaded.pack_error.or(pack_error), audio, vanilla_root, started, + loaded.rest_loader, )?; if let Some(game) = game { run_event_loop(game)?; @@ -11518,6 +11996,65 @@ mod tests { assert!(hud_overlays::sleep_overlay(320, 240, timer as i32).is_empty()); } + #[test] + fn world_rest_poll_does_not_wait_for_a_blocked_worker() { + let (release, wait) = std::sync::mpsc::channel(); + let loader = WorldRestLoader { + progress: Progress::new(), + handle: std::thread::spawn(move || { + wait.recv().unwrap(); + Ok(()) + }), + started: Instant::now(), + }; + assert!(!loader.ready().unwrap()); + release.send(()).unwrap(); + loader.finish().unwrap(); + } + + #[test] + fn world_rest_poll_reports_a_stalled_worker() { + let (release, wait) = std::sync::mpsc::channel(); + let loader = WorldRestLoader { + progress: Progress::new(), + handle: std::thread::spawn(move || { + wait.recv().unwrap(); + Ok(()) + }), + started: Instant::now() - Duration::from_secs(121), + }; + let error = loader.ready().unwrap_err().to_string(); + release.send(()).unwrap(); + loader.finish().unwrap(); + assert_eq!(error, "world resource loading timed out after 120 seconds"); + } + + #[test] + fn world_rest_worker_failure_reaches_the_client() { + let loader = WorldRestLoader { + progress: Progress::new(), + handle: std::thread::spawn(|| Err("missing world table".to_owned())), + started: Instant::now(), + }; + assert_eq!( + loader.finish().unwrap_err().to_string(), + "missing world table" + ); + } + + #[test] + fn world_rest_worker_panic_reaches_the_client() { + let loader = WorldRestLoader { + progress: Progress::new(), + handle: std::thread::spawn(|| panic!("broken loader")), + started: Instant::now(), + }; + assert_eq!( + loader.finish().unwrap_err().to_string(), + "world resource loader panicked" + ); + } + /// An integrated server thread shares the loaded resources with the client. #[test] fn shared_resources_can_cross_threads() { diff --git a/crates/horizon-client/src/game/advancements.rs b/crates/horizon-client/src/game/advancements.rs index 882b5cc93..da2db2592 100644 --- a/crates/horizon-client/src/game/advancements.rs +++ b/crates/horizon-client/src/game/advancements.rs @@ -106,7 +106,7 @@ impl adv::World for View<'_, '_> { .map(|c| { self.0 .res - .biomes + .biomes() .get(c.biome(p[0], p[1], p[2])) .name .clone() @@ -118,7 +118,7 @@ impl adv::World for View<'_, '_> { } fn block(&self, p: [i32; 3]) -> (String, BTreeMap) { let state = self.0.world.block(p[0], p[1], p[2]); - let name = self.0.res.facts.get(state).name.to_string(); + let name = self.0.res.facts().get(state).name.to_string(); let props = self .0 .pack @@ -138,7 +138,7 @@ impl adv::World for View<'_, '_> { match self .0 .res - .facts + .facts() .get(self.0.world.block(p[0], p[1], p[2])) .fluid { @@ -152,7 +152,7 @@ impl adv::World for View<'_, '_> { !self .0 .res - .facts + .facts() .get(self.0.world.block(p[0], y, p[2])) .full_collision }) @@ -165,19 +165,19 @@ impl adv::World for View<'_, '_> { (1..=5).any(|d| { self.0 .res - .facts + .facts() .get(self.0.world.block(p[0], p[1] - d, p[2])) .name .ends_with("campfire") }) } fn in_tag(&self, registry: &str, tag: &str, id: &str) -> bool { - let items = &self.0.res.items; + let items = &self.0.res.items(); match registry { "item" => items.item_tags.get(tag).is_some_and(|t| t.contains(id)), "block" => items.block_tags.get(tag).is_some_and(|t| t.contains(id)), - "entity_type" => self.0.res.mob_data.entity_has(tag, id), - "worldgen/biome" => self.0.res.mob_data.biome_has(tag, id), + "entity_type" => self.0.res.mob_data().entity_has(tag, id), + "worldgen/biome" => self.0.res.mob_data().biome_has(tag, id), _ => false, } } @@ -454,17 +454,17 @@ impl Game<'_> { .rewards .recipes .iter() - .filter(|r| self.res.stations.recipe_index.contains(r)) + .filter(|r| self.res.stations().recipe_index.contains(r)) .cloned() .collect(); let (_, unlocked) = self .level .recipe_book - .add_recipes(&self.res.stations.recipe_index, &rewards); + .add_recipes(&self.res.stations().recipe_index, &rewards); for table in &a.rewards.loot { let items = self .res - .items + .items() .loot_table(table, false, None, &mut self.world.random); for s in items { if let Some(rest) = self.give(s) @@ -549,7 +549,7 @@ impl Game<'_> { .filter_map(|s| s.as_ref()) .filter(|s| { self.res - .items + .items() .get(&s.item) .is_some_and(|i| s.count >= i.max_stack) }) @@ -790,11 +790,11 @@ impl Game<'_> { if let Some((station, item)) = recipe { // RecipeToast: black description under a purple title, the // station at 0.6 scale in the corner over the cycling result. - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite(atlas, "gui/sprites/toast/recipe", x, 0.0); let title = self.translate("recipe.toast.title", "New Recipe(s) Unlocked!"); let description = self.translate("recipe.toast.description", "Check your recipe book"); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.text(atlas, &title, x + 30.0, 7.0, 0xFF50_0050, false); batch.text(atlas, &description, x + 30.0, 18.0, 0xFF00_0000, false); let start = batch.vertices.len(); @@ -803,7 +803,7 @@ impl Game<'_> { self.draw_item_model(batch, &item, x + 8.0, 8.0); return; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite(atlas, "gui/sprites/toast/advancement", x, 0.0); let (key, color) = match frame { Frame::Task => ("advancements.toast.task", 0xFF00_FFFF), diff --git a/crates/horizon-client/src/game/advancements_screen.rs b/crates/horizon-client/src/game/advancements_screen.rs index 759588887..211bab362 100644 --- a/crates/horizon-client/src/game/advancements_screen.rs +++ b/crates/horizon-client/src/game/advancements_screen.rs @@ -269,7 +269,7 @@ impl Game<'_> { } /// `AdvancementWidget`'s title lines, description lines and width. fn adv_widget_text(&self, i: usize) -> (Vec, Vec, f32) { - let font = &self.atlas.font; + let font = &self.gui.atlas.font; let a = &self.adv.tree.list[i]; let Some(d) = &a.display else { return (Vec::new(), Vec::new(), 0.0); @@ -332,7 +332,7 @@ impl Game<'_> { let (sx, sy) = self.adv_ui.scroll.unwrap_or_default(); let (sx, sy) = (sx.floor() as i32, sy.floor() as i32); self.adv_tick_hover(&view, sx, sy, left, top); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); let title = Text::translate("gui.advancements", &[]); let tw = atlas.font.width_text(&title); @@ -444,7 +444,7 @@ impl Game<'_> { } let (x, y) = pos(i); let (x, y) = ((ox + x) as f32, (oy + y) as f32); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite_scaled( atlas, frame_sprite(d.frame, done), @@ -461,7 +461,7 @@ impl Game<'_> { } } // The window, tabs and title. - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite_region( atlas, "gui/advancements/window", @@ -475,7 +475,7 @@ impl Game<'_> { let (x, y) = tab_pos(ty, i); let sprite = tab_sprite(ty, i, ty.3, Some(t) == tab); batch.sprite_scaled( - &self.atlas, + &self.gui.atlas, &sprite, left + x, top + y, @@ -494,7 +494,7 @@ impl Game<'_> { } } } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let title = tab.and_then(|t| tree.list[t].display.as_ref()).map_or_else( || Text::translate("gui.advancements", &[]), |d| text_of(&d.title), @@ -509,7 +509,7 @@ impl Game<'_> { } } // Done. - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (bx, by) = ((w / 2.0 - 100.0).floor(), h - FOOTER + 6.0); let hover = ui::hovered(self.cursor, bx, by, 200.0, 20.0); ui::button( @@ -532,7 +532,7 @@ impl Game<'_> { let (cx, cy) = self.cursor; if cx > x && cx < x + ty.1 && cy > y && cy < y + ty.2 { if let Some(d) = &tree.list[t].display { - ui::tooltip(batch, &self.atlas, &[text_of(&d.title)], self.cursor); + ui::tooltip(batch, &self.gui.atlas, &[text_of(&d.title)], self.cursor); } break; } @@ -616,7 +616,7 @@ impl Game<'_> { ], ) }); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let progress_w = progress.as_ref().map_or(0.0, |t| atlas.font.width_text(t)) as i32; let top_side = title_bottom + desc_h >= INSIDE_H; let amount = if a.criteria.is_empty() || total == 0 { diff --git a/crates/horizon-client/src/game/agent.rs b/crates/horizon-client/src/game/agent.rs index b11fdd552..ed08825d6 100644 --- a/crates/horizon-client/src/game/agent.rs +++ b/crates/horizon-client/src/game/agent.rs @@ -325,7 +325,7 @@ impl Game<'_> { let state = self.world.block(pos[0], pos[1], pos[2]); let mut v = json!({ "pos": pos, - "block": &*self.res.facts.get(state).name, + "block": &*self.res.facts().get(state).name, "state": self.state_string(state), "loaded": self.world.chunks.contains_key(&(pos[0] >> 4, pos[2] >> 4)), }); @@ -677,17 +677,25 @@ impl Game<'_> { /// Whether a block stops movement, for the path finder. fn blocks_motion(&self, pos: [i32; 3]) -> bool { - let f = self.res.facts.get(self.world.block(pos[0], pos[1], pos[2])); + let f = self + .res + .facts() + .get(self.world.block(pos[0], pos[1], pos[2])); f.full_collision || f.legacy_solid } fn walkable(&self, n: Node) -> bool { let below = self.world.block(n[0], n[1] - 1, n[2]); let lava = |p: [i32; 3]| { - &*self.res.facts.get(self.world.block(p[0], p[1], p[2])).name == "minecraft:lava" + &*self + .res + .facts() + .get(self.world.block(p[0], p[1], p[2])) + .name + == "minecraft:lava" }; self.world.chunks.contains_key(&(n[0] >> 4, n[2] >> 4)) && (self.blocks_motion([n[0], n[1] - 1, n[2]]) - || self.res.facts.get(below).fluid != horizon_client::blocks::Fluid::None) + || self.res.facts().get(below).fluid != horizon_client::blocks::Fluid::None) && !self.blocks_motion(n) && !self.blocks_motion([n[0], n[1] + 1, n[2]]) && !lava(n) @@ -748,7 +756,11 @@ impl Game<'_> { if !clear || !self.walkable(m) { continue; } - let water = self.res.facts.get(self.world.block(m[0], m[1], m[2])).fluid + let water = self + .res + .facts() + .get(self.world.block(m[0], m[1], m[2])) + .fluid != horizon_client::blocks::Fluid::None; let step = 10 + if dy != 0 { 5 } else { 0 } + if water { 30 } else { 0 }; let c = base + step; @@ -958,10 +970,10 @@ impl Game<'_> { for z in lo[2]..=hi[2] { for x in lo[0]..=hi[0] { let state = self.world.block(x, y, z); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { continue; } - let name = self.res.facts.get(state).name.to_string(); + let name = self.res.facts().get(state).name.to_string(); *census.entry(name).or_insert(0) += 1; list.push(json!([x, y, z, self.state_string(state)])); } @@ -1013,7 +1025,7 @@ impl Game<'_> { for z in c[2] - radius..=c[2] + radius { for x in c[0] - radius..=c[0] + radius { let state = self.world.block(x, y, z); - if *self.res.facts.get(state).name == *want { + if *self.res.facts().get(state).name == *want { let d = dist(eye, [x, y, z].map(|v| f64::from(v) + 0.5)); found.push((d, [x, y, z])); } @@ -1221,7 +1233,7 @@ impl Game<'_> { self.playing()?; let pos = a.block_pos(0)?; let before = self.world.block(pos[0], pos[1], pos[2]); - if self.res.facts.is_air(before) { + if self.res.facts().is_air(before) { return Err(format!("there is no block at {pos:?}").into()); } self.aim_block(pos, None)?; @@ -1250,24 +1262,24 @@ impl Game<'_> { .ok_or("nothing in hand to place; select an item")?; let held = held.item.clone(); let before = self.world.block(pos[0], pos[1], pos[2]); - if !self.res.facts.get(before).replaceable && !self.res.facts.is_air(before) { + if !self.res.facts().get(before).replaceable && !self.res.facts().is_air(before) { return Err(format!( "{pos:?} holds {}; break it first", - self.res.facts.get(before).name + self.res.facts().get(before).name ) .into()); } // A replaceable block there (grass, snow) is clicked itself, as // a player would; otherwise the face of a neighbour touching it. - let mut aimed = !self.res.facts.is_air(before) - && !self.res.facts.get(before).outline.is_empty() + let mut aimed = !self.res.facts().is_air(before) + && !self.res.facts().get(before).outline.is_empty() && self.aim_block(pos, None).is_ok(); for (_, d) in FACES.iter().filter(|_| !aimed) { let d = *d; let support = add(pos, d); let state = self.world.block(support[0], support[1], support[2]); - let f = self.res.facts.get(state); - if self.res.facts.is_air(state) + let f = self.res.facts().get(state); + if self.res.facts().is_air(state) || f.replaceable || f.fluid != horizon_client::blocks::Fluid::None && !f.waterlogged { @@ -1933,7 +1945,10 @@ impl Game<'_> { // Step up onto the next block, or out of water. let in_water = { let b = p.map(|v| v.floor() as i32); - self.res.facts.get(self.world.block(b[0], b[1], b[2])).fluid + self.res + .facts() + .get(self.world.block(b[0], b[1], b[2])) + .fluid != horizon_client::blocks::Fluid::None }; if aim[1] > p[1] + 0.5 && horizontal(p, aim) < 1.6 && on_ground { diff --git a/crates/horizon-client/src/game/allays.rs b/crates/horizon-client/src/game/allays.rs index a2a5842b5..52dfa7e1c 100644 --- a/crates/horizon-client/src/game/allays.rs +++ b/crates/horizon-client/src/game/allays.rs @@ -29,7 +29,11 @@ impl Game<'_> { continue; }; let carried = self.mobs[i].extra.ints[1]; - let max = self.res.items.get(&held).map_or(64, |i| i.max_stack as i32); + let max = self + .res + .items() + .get(&held) + .map_or(64, |i| i.max_stack as i32); // GoToWantedItem / wantsToPickUp: the same item within 32. let wanted = if griefing && carried < max && self.mobs[i].extra.ints[3] <= 0 { self.dropped diff --git a/crates/horizon-client/src/game/armor_stands.rs b/crates/horizon-client/src/game/armor_stands.rs index 4ea8df359..6ff5c7c15 100644 --- a/crates/horizon-client/src/game/armor_stands.rs +++ b/crates/horizon-client/src/game/armor_stands.rs @@ -111,7 +111,12 @@ impl Game<'_> { let Some(item) = item else { continue; }; - let Some(asset) = self.res.items.get(item).and_then(|i| i.equip_asset.clone()) else { + let Some(asset) = self + .res + .items() + .get(item) + .and_then(|i| i.equip_asset.clone()) + else { continue; }; let kind = if layer == "leggings" { @@ -124,7 +129,7 @@ impl Game<'_> { continue; }; let (Some(r), Some(part)) = ( - self.atlas.sprites.get(texture.as_str()), + self.gui.atlas.sprites.get(texture.as_str()), assets.player.get(layer), ) else { continue; @@ -144,7 +149,7 @@ impl Game<'_> { // BlockPlaceContext: a replaceable clicked block is replaced. let clicked = self .res - .facts + .facts() .get(self.world.block(hit.pos[0], hit.pos[1], hit.pos[2])); let pos = if clicked.replaceable { hit.pos @@ -230,7 +235,7 @@ impl Game<'_> { fn equipment_slot(&self, stack: &ItemStack) -> usize { match self .res - .items + .items() .get(&stack.item) .and_then(|i| i.equip_slot.as_deref()) { @@ -379,7 +384,7 @@ impl Game<'_> { let mut dead = Vec::new(); for (i, a) in self.armor_stands.iter_mut().enumerate() { a.tick(&mut scene); - if !a.environment_tick(&self.world, &self.res.facts, self.pack.assets.registry) { + if !a.environment_tick(&self.world, self.res.facts(), self.pack.assets.registry) { dead.push(i); } } @@ -403,7 +408,7 @@ impl Game<'_> { out: &mut Vec, ) { let assets = &self.armor_stand_assets; - let sprites = &self.atlas.sprites; + let sprites = &self.gui.atlas.sprites; let uv_of = |name: &str| sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); let Some(wood) = uv_of("entity/armorstand/armorstand") else { return; @@ -516,7 +521,7 @@ impl Game<'_> { }; let Some(asset) = self .res - .items + .items() .get(&stack.item) .and_then(|i| i.equip_asset.clone()) else { @@ -568,7 +573,7 @@ impl Game<'_> { /// `Equippable.swapWithEquipmentSlot`: right-clicking armor swaps it into /// its slot (the worn piece comes back to the hand). pub(super) fn equip_from_hand(&mut self, stack: &ItemStack) -> bool { - let Some(info) = self.res.items.get(&stack.item) else { + let Some(info) = self.res.items().get(&stack.item) else { return false; }; let index = match info.equip_slot.as_deref() { @@ -699,7 +704,7 @@ impl Game<'_> { &serde_json::Value::Null, false, pose, - &self.atlas.sprites, + &self.gui.atlas.sprites, &self.item_host(), &mut sink, ); @@ -709,7 +714,7 @@ impl Game<'_> { if let Some(stack) = &a.equipment[5] && self .res - .items + .items() .get(&stack.item) .is_none_or(|i| i.equip_asset.is_none()) && let Some(head) = part_matrix(model, base, poses, "head", 0.0) diff --git a/crates/horizon-client/src/game/backdrop.rs b/crates/horizon-client/src/game/backdrop.rs index 149cddefa..3a5ec81d6 100644 --- a/crates/horizon-client/src/game/backdrop.rs +++ b/crates/horizon-client/src/game/backdrop.rs @@ -71,8 +71,10 @@ impl Game<'_> { } /// Called every frame while the title is up. pub(super) fn update_backdrop(&mut self) -> Result<()> { - let wanted = self.title.is_some() + let wanted = self.pending_entry.is_none() + && self.title.is_some() && horizon_client::ui_theme::horizon() + && self.world_renderer_ready && self.renderer.is_some() && self.options.frames.is_none(); if !wanted { @@ -127,6 +129,10 @@ impl Game<'_> { .is_some_and(|r| r.section_count() > 40) { self.backdrop.ready = Some(Instant::now()); + log::info!( + "Horizon: title backdrop ready; world rest ready: {}", + self.res.rest.get().is_some() + ); } Ok(()) } @@ -139,10 +145,14 @@ impl Game<'_> { } } fn surface_y(&self, x: i32, z: i32) -> Option { - let air = self.res.facts.air; + let air = self.res.facts().air; (-60..320).rev().find(|&y| self.world.block(x, y, z) != air) } fn start_backdrop(&mut self) -> Result<()> { + log::info!( + "Horizon: starting title backdrop after {} ms", + self.started.elapsed().as_millis() + ); let seed = seed(); let root = std::env::current_dir()? .join("saves") @@ -155,7 +165,7 @@ impl Game<'_> { VanillaTerrain::new( &self.options.resources.join("worldgen"), pack.assets.registry, - &res.biomes, + res.biomes(), seed, ) .map_err(|e| format!("title backdrop: {e}"))?, @@ -165,10 +175,10 @@ impl Game<'_> { inner: inner.clone(), save: save.clone(), registry: pack.assets.clone(), - biomes: res.biomes.clone(), + biomes: res.biomes().clone(), }), pack.context.clone(), - res.threads.min(6), + res.threads().min(6), ); streaming.radius = self.settings.render_distance.clamp(4, 10); streaming.biome_blend = self.settings.biome_blend; @@ -179,7 +189,7 @@ impl Game<'_> { streaming.paused = true; self.streaming = streaming; self.save = save; - let mut world = World::new(self.res.facts.air, seed); + let mut world = World::new(self.res.facts().air, seed); world.day_time = DAY_TIME; world.game_time = 6000; // Light snow: the weather renders as snow in frozen biomes. @@ -237,7 +247,7 @@ impl Game<'_> { } fn stop_backdrop(&mut self) { self.streaming.paused = true; - self.world = World::new(self.res.facts.air, 0); + self.world = World::new(self.res.facts().air, 0); if let Some(r) = self.renderer.as_mut() { r.clear_sections(); } diff --git a/crates/horizon-client/src/game/banners.rs b/crates/horizon-client/src/game/banners.rs index 6875fcb7f..05beda3f8 100644 --- a/crates/horizon-client/src/game/banners.rs +++ b/crates/horizon-client/src/game/banners.rs @@ -14,7 +14,7 @@ impl Game<'_> { else { return Vec::new(); }; - layer_textures(&self.res.stations.banners, &b.layers) + layer_textures(&self.res.stations().banners, &b.layers) } } diff --git a/crates/horizon-client/src/game/beacon.rs b/crates/horizon-client/src/game/beacon.rs index a6b8e84f3..79cf14541 100644 --- a/crates/horizon-client/src/game/beacon.rs +++ b/crates/horizon-client/src/game/beacon.rs @@ -100,7 +100,7 @@ impl Game<'_> { /// `getHeight(WORLD_SURFACE)`: above the highest non-air block. pub(super) fn world_surface(&self, x: i32, z: i32) -> i32 { self.world - .world_surface(x, z, |id| self.res.facts.is_air(id)) + .world_surface(x, z, |id| self.res.facts().is_air(id)) } /// `BeaconBlockEntity.tick` of the beacon at `key`. pub(super) fn tick_beacon_at(&mut self, key: (i32, i32, i32)) { @@ -122,7 +122,7 @@ impl Game<'_> { let mut i = 0; while i < 10 && check <= surface { let state = self.world.block(x, check, z); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); if let Some(color) = self.beam_color(&f.name) { if b.checking.len() <= 1 { b.checking.push((color, 1)); @@ -183,7 +183,7 @@ impl Game<'_> { fn beacon_base(&self, x: i32, y: i32, z: i32) -> i32 { let base = self .res - .items + .items() .block_tags .get("minecraft:beacon_base_blocks"); let mut levels = 0; @@ -194,7 +194,7 @@ impl Game<'_> { } let ok = (x - step..=x + step).all(|lx| { (z - step..=z + step).all(|lz| { - let name = &self.res.facts.get(self.world.block(lx, ly, lz)).name; + let name = &self.res.facts().get(self.world.block(lx, ly, lz)).name; base.is_some_and(|t| t.contains(&**name)) }) }); @@ -375,7 +375,7 @@ impl Game<'_> { let levels = self.beacon_levels(); let sel = self.station.as_ref().map_or([None; 2], |s| s.beacon); let paid = self.station.as_ref().is_some_and(|s| s.inputs[0].is_some()); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.fill( atlas, 0.0, @@ -396,7 +396,7 @@ impl Game<'_> { ("block.minecraft.beacon.secondary", "Secondary Power", 169.0), ] { let text = self.translate(key, fallback); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let w = HudBatch::text_width(atlas, &text); batch.text( atlas, @@ -411,7 +411,7 @@ impl Game<'_> { let x = [20.0, 41.0, 63.0, 86.0, 108.0][i]; self.draw_item(batch, &ItemStack::new(item, 1), bx + x, by + 109.0); } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let mut tooltip = None; let button = |batch: &mut HudBatch, x: f32, y: f32, active: bool, selected: bool, icon: &str| { @@ -493,7 +493,7 @@ impl Game<'_> { if let Some(slot) = self.slot_at(batch, self.cursor.0, self.cursor.1) { let (sx, sy) = self.slot_position(slot); batch.fill( - &self.atlas, + &self.gui.atlas, ox + sx, oy + sy, 16.0, @@ -514,7 +514,13 @@ impl Game<'_> { } /// `BeaconRenderer`: each section's rotating solid beam and its glow. pub(super) fn beacon_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { - let Some(s) = self.atlas.sprites.get("entity/beacon/beacon_beam").copied() else { + let Some(s) = self + .gui + .atlas + .sprites + .get("entity/beacon/beacon_beam") + .copied() + else { return; }; let time = (self.world.game_time.rem_euclid(40)) as f32 + alpha as f32; diff --git a/crates/horizon-client/src/game/beehives.rs b/crates/horizon-client/src/game/beehives.rs index 52fed3f3b..b7f7efb1a 100644 --- a/crates/horizon-client/src/game/beehives.rs +++ b/crates/horizon-client/src/game/beehives.rs @@ -41,7 +41,7 @@ impl HiveHost for GameHive<'_, '_> { if !self .game .res - .mob_data + .mob_data() .entity_has("minecraft:beehive_inhabitors", &kind) { return None; @@ -72,10 +72,10 @@ impl Game<'_> { /// The hive's honey level and front, from its block state. pub(super) fn hive_state(&self, at: [i32; 3]) -> Option<(Option, [i32; 2])> { let state = self.world.block(at[0], at[1], at[2]); - let name = &self.res.facts.get(state).name; + let name = &self.res.facts().get(state).name; if !self .res - .items + .items() .block_tags .get("minecraft:beehives") .is_some_and(|t| t.contains(&**name)) @@ -108,7 +108,7 @@ impl Game<'_> { .iter() .any(|d| { let state = self.world.block(at[0] + d[0], at[1] + d[1], at[2] + d[2]); - &*self.res.facts.get(state).name == "minecraft:fire" + &*self.res.facts().get(state).name == "minecraft:fire" }); let mut host = GameHive { game: self }; if fire && !hive.bees.is_empty() { diff --git a/crates/horizon-client/src/game/block_entity_anims.rs b/crates/horizon-client/src/game/block_entity_anims.rs index 102b46063..619fcd009 100644 --- a/crates/horizon-client/src/game/block_entity_anims.rs +++ b/crates/horizon-client/src/game/block_entity_anims.rs @@ -193,7 +193,7 @@ impl Game<'_> { }; let raiders = self .res - .stations + .stations() .enchantments .entity_tags .get("minecraft:raiders") @@ -201,7 +201,7 @@ impl Game<'_> { .unwrap_or_default(); let frames = self .res - .items + .items() .block_tags .get("minecraft:conduit_effect_block") .cloned() @@ -285,7 +285,7 @@ impl Game<'_> { } Ticker::Conduit => { let world = &self.world; - let facts = &self.res.facts; + let facts = self.res.facts(); let registry = self.pack.assets.registry; let is_water = |p: [i32; 3]| { facts.get(world.block(p[0], p[1], p[2])).fluid @@ -372,7 +372,7 @@ impl Game<'_> { /// pot's saved `sherds` (back, left, right, front). pub(super) fn block_anim(&self, pos: [i32; 3], partial: f32) -> BlockAnim { let state = self.world.block(pos[0], pos[1], pos[2]); - let sherds = if &*self.res.facts.get(state).name == "minecraft:decorated_pot" { + let sherds = if &*self.res.facts().get(state).name == "minecraft:decorated_pot" { let sherds = self.saved_tag(pos).and_then(|t| t.get("sherds")); ["back", "left", "right", "front"].map(|side| match sherds.and_then(|s| s.get(side)) { // An item id, or the item stack the processed templates hold. diff --git a/crates/horizon-client/src/game/block_entity_ticks.rs b/crates/horizon-client/src/game/block_entity_ticks.rs index f596f2d8b..1c0258871 100644 --- a/crates/horizon-client/src/game/block_entity_ticks.rs +++ b/crates/horizon-client/src/game/block_entity_ticks.rs @@ -76,7 +76,7 @@ impl Game<'_> { (0..registry.len()) .map(|i| { let state = BlockStateId(i as u32); - let name: &str = &self.res.facts.get(state).name; + let name: &str = &self.res.facts().get(state).name; match name { "minecraft:hopper" | "minecraft:crafter" @@ -129,7 +129,7 @@ impl Game<'_> { let Some(BlockEntity::Furnace(f)) = self.world.block_entities.get_mut(&pos) else { return Ok(()); }; - let Some(lit) = f.tick(&self.res.recipes, &self.res.items, &self.res.providers) else { + let Some(lit) = f.tick(self.res.recipes(), self.res.items(), self.res.providers()) else { return Ok(()); }; let state = self.world.block(pos.0, pos.1, pos.2); diff --git a/crates/horizon-client/src/game/block_items.rs b/crates/horizon-client/src/game/block_items.rs index b8012cce1..199c39a78 100644 --- a/crates/horizon-client/src/game/block_items.rs +++ b/crates/horizon-client/src/game/block_items.rs @@ -22,7 +22,7 @@ impl Game<'_> { let entity = self.world.block_entities.get(&key)?; let block = &self .res - .facts + .facts() .get(self.world.block(key.0, key.1, key.2)) .name; let mut tag = save::encode_block_entity(key, entity, block); @@ -37,7 +37,7 @@ impl Game<'_> { pub(super) fn picked_stack(&self, pos: [i32; 3], include_data: bool) -> Option { let key = (pos[0], pos[1], pos[2]); let state = self.world.block(pos[0], pos[1], pos[2]); - let facts = self.res.facts.get(state); + let facts = self.res.facts().get(state); if &*facts.item == "minecraft:air" { return None; } diff --git a/crates/horizon-client/src/game/blockctl.rs b/crates/horizon-client/src/game/blockctl.rs index 993e0789e..719ce8dd2 100644 --- a/crates/horizon-client/src/game/blockctl.rs +++ b/crates/horizon-client/src/game/blockctl.rs @@ -47,7 +47,7 @@ impl Game<'_> { format!("{}[{}]", s.name, props.join(",")) } fn put_block(&mut self, pos: [i32; 3], state: BlockStateId) -> Result<()> { - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); self.world.block_entities.remove(&(pos[0], pos[1], pos[2])); self.level_set(pos, state)?; if let Some(entity) = BlockEntity::for_block(&name) { diff --git a/crates/horizon-client/src/game/boats.rs b/crates/horizon-client/src/game/boats.rs index 8f2cad5f5..1d1a6b628 100644 --- a/crates/horizon-client/src/game/boats.rs +++ b/crates/horizon-client/src/game/boats.rs @@ -180,11 +180,11 @@ impl BoatModels { } impl Game<'_> { fn fluid_height(&self, x: i32, y: i32, z: i32) -> Option<(f32, bool)> { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if f.fluid != Fluid::Water { return None; } - let above = self.res.facts.get(self.world.block(x, y + 1, z)); + let above = self.res.facts().get(self.world.block(x, y + 1, z)); // FluidState.getHeight: 1 under the same fluid, else amount / 9. let height = if above.fluid == Fluid::Water { 1.0 @@ -277,7 +277,7 @@ impl Game<'_> { && f64::from(x + 1) > lo.x && f64::from(z) < hi.z && f64::from(z + 1) > lo.z; - let f = self.res.facts.get(self.world.block(x, y0, z)); + let f = self.res.facts().get(self.world.block(x, y0, z)); if inside && (f.full_collision || f.legacy_solid) && !f.has_class("LilyPadBlock") { friction += f.friction; count += 1; @@ -495,8 +495,8 @@ impl Game<'_> { ); let top = b.bounds().max_position().y; let (bx, by, bz) = (x.floor() as i32, top.floor() as i32, z.floor() as i32); - let below = self.res.facts.get(self.world.block(bx, by - 1, bz)); - let here = self.res.facts.get(self.world.block(bx, by, bz)); + let below = self.res.facts().get(self.world.block(bx, by - 1, bz)); + let here = self.res.facts().get(self.world.block(bx, by, bz)); let target = if below.fluid != Fluid::Water && !here.full_collision && (below.full_collision || below.legacy_solid) @@ -723,6 +723,7 @@ impl Game<'_> { }; let folder = if b.chest { "chest_boat" } else { "boat" }; let Some(uv) = self + .gui .atlas .sprites .get(&format!("entity/{folder}/{}", b.wood)) diff --git a/crates/horizon-client/src/game/books.rs b/crates/horizon-client/src/game/books.rs index 5603e8369..8745c6f35 100644 --- a/crates/horizon-client/src/game/books.rs +++ b/crates/horizon-client/src/game/books.rs @@ -45,7 +45,7 @@ pub(super) enum BookScreen { } impl Game<'_> { fn book_lines(&self, page: &str) -> Vec { - self.atlas.font.split(&Text::literal(page), 114.0) + self.gui.atlas.font.split(&Text::literal(page), 114.0) } /// `WritableBookItem.use` / `WrittenBookItem.use`. pub(super) fn use_book(&mut self, stack: &ItemStack) -> bool { @@ -242,7 +242,7 @@ impl Game<'_> { /// the page (`MultilineTextField.insertText`: line breaks kept, cut to /// the 1024 characters left, rejected when it overflows the 14 lines). fn book_shortcut(&mut self, shortcut: horizon_client::clipboard::EditShortcut) { - let font = &self.atlas.font; + let font = &self.gui.atlas.font; match self.book.as_mut() { Some(BookScreen::Edit { signing: true, @@ -397,7 +397,7 @@ impl Game<'_> { let key = (pos[0], pos[1], pos[2]); if &*self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1], pos[2])) .name != "minecraft:lectern" @@ -549,7 +549,7 @@ impl Game<'_> { } pub(super) fn draw_book(&self, batch: &mut HudBatch) { let Some(book) = &self.book else { return }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); let (mx, my) = self.cursor; let hover = diff --git a/crates/horizon-client/src/game/breezes.rs b/crates/horizon-client/src/game/breezes.rs index 52e3b36a9..466469110 100644 --- a/crates/horizon-client/src/game/breezes.rs +++ b/crates/horizon-client/src/game/breezes.rs @@ -40,7 +40,7 @@ impl Game<'_> { m.position.z.floor() as i32, ); let mut state = self.world.block(x, y, z); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { state = self.world.block(x, (m.position.y - 0.2).floor() as i32, z); } let Some((sprite, tint)) = self.particle_sprite(state) else { diff --git a/crates/horizon-client/src/game/cartography.rs b/crates/horizon-client/src/game/cartography.rs index 86d5d5395..4a5738f6e 100644 --- a/crates/horizon-client/src/game/cartography.rs +++ b/crates/horizon-client/src/game/cartography.rs @@ -89,17 +89,17 @@ impl Game<'_> { if is_locked { locked = true; if scaling || locking { - batch.sprite(&self.atlas, error, ox + 35.0, oy + 31.0); + batch.sprite(&self.gui.atlas, error, ox + 35.0, oy + 31.0); } } if scaling && scale >= 4 { locked = true; - batch.sprite(&self.atlas, error, ox + 35.0, oy + 31.0); + batch.sprite(&self.gui.atlas, error, ox + 35.0, oy + 31.0); } } let sprite = |batch: &mut HudBatch, game: &Self, name: &str, x: f32, y: f32| { batch.sprite( - &game.atlas, + &game.gui.atlas, &format!("gui/sprites/container/cartography_table/{name}"), ox + x, oy + y, diff --git a/crates/horizon-client/src/game/chat.rs b/crates/horizon-client/src/game/chat.rs index cb8a3a0b5..11b1e0267 100644 --- a/crates/horizon-client/src/game/chat.rs +++ b/crates/horizon-client/src/game/chat.rs @@ -219,12 +219,18 @@ impl Game<'_> { .map(|a| format!("minecraft:{a}")) .collect(); let reg = &mut self.ui.registries; - let mut items: Vec = self.res.items.order.iter().map(|s| s.to_string()).collect(); + let mut items: Vec = self + .res + .items() + .order + .iter() + .map(|s| s.to_string()) + .collect(); items.sort(); reg.items = items; reg.item_tags = self .res - .items + .items() .item_tags .keys() .map(|k| horizon_client::command::args::normalize(k)) @@ -232,7 +238,7 @@ impl Game<'_> { reg.item_tags.sort(); reg.block_tags = self .res - .items + .items() .block_tags .keys() .map(|k| horizon_client::command::args::normalize(k)) @@ -259,7 +265,7 @@ impl Game<'_> { .collect(); let mut summonable: Vec = self .res - .mob_types + .mob_types() .keys() .map(|k| horizon_client::command::args::normalize(k)) .collect(); @@ -405,7 +411,7 @@ impl Game<'_> { .as_ref() .map_or([1280, 720], |r| [r.config.width, r.config.height]); let b = HudBatch::new(size); - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -450,7 +456,7 @@ impl Game<'_> { let focused = self.screen == Screen::Chat; let heard = self.mods.mods.is_running().then(|| text.plain()); self.ui.chat.add( - &self.atlas, + &self.gui.atlas, text, Some(SYSTEM_INDICATOR), self.ticks, @@ -463,7 +469,7 @@ impl Game<'_> { /// Keys while the chat screen is open. pub(super) fn chat_key(&mut self, event: &KeyEvent) { if let Some(shortcut) = self.edit_shortcut(event) { - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -509,7 +515,7 @@ impl Game<'_> { let Some(mut screen) = self.ui.chat_screen.take() else { return; }; - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -541,7 +547,7 @@ impl Game<'_> { range: (usize, usize), list: Vec<(String, Option)>, ) { - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -552,7 +558,7 @@ impl Game<'_> { } /// Text typed into the chat box (control socket `chat`). pub(super) fn chat_type(&mut self, text: &str) { - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -580,7 +586,7 @@ impl Game<'_> { let heard = self.mods.mods.is_running().then(|| line.plain()); self.ui .chat - .add(&self.atlas, line, None, self.ticks, focused); + .add(&self.gui.atlas, line, None, self.ticks, focused); if let Some(line) = heard { self.mods_chat(&line); } @@ -608,7 +614,7 @@ impl Game<'_> { let height = self.renderer.as_ref().map_or(720.0, |r| { HudBatch::new([r.config.width, r.config.height]).height }); - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -621,7 +627,7 @@ impl Game<'_> { return; } match self.ui.chat.click_at( - &self.atlas.font, + &self.gui.atlas.font, height as i32, cursor.0 as f64, cursor.1 as f64, @@ -647,13 +653,15 @@ impl Game<'_> { if self.ui.hide_gui && !focused { return; } - self.ui.chat.draw(batch, &self.atlas, self.ticks, focused); + self.ui + .chat + .draw(batch, &self.gui.atlas, self.ticks, focused); } pub(super) fn draw_chat_screen(&mut self, batch: &mut HudBatch) { let Some(mut screen) = self.ui.chat_screen.take() else { return; }; - let m = Measure(&self.atlas.font); + let m = Measure(&self.gui.atlas.font); let c = Commands { dispatcher: chat_tree(&self.remote, &self.mods), registries: &self.ui.registries, @@ -671,7 +679,7 @@ impl Game<'_> { .chat_opened .map_or(0, |t| t.elapsed().as_millis() as u64); let draws = screen.draw(&m, mouse, blink, background); - horizon_client::screen_draw::paint(batch, &self.atlas, &draws); + horizon_client::screen_draw::paint(batch, &self.gui.atlas, &draws); self.ui.chat_screen = Some(screen); } /// Advance the overworld clock (ServerClockManager.tick) when @@ -863,11 +871,11 @@ impl Game<'_> { let focused = self.screen == Screen::Chat; self.ui .chat - .add(&self.atlas, message, None, self.ticks, focused); + .add(&self.gui.atlas, message, None, self.ticks, focused); } #[allow(dead_code)] fn chat_debug_fill(&self, batch: &mut HudBatch) { - batch.fill(&self.atlas, 0.0, 0.0, 1.0, 1.0, rgba(0, 0, 0, 0)); + batch.fill(&self.gui.atlas, 0.0, 0.0, 1.0, 1.0, rgba(0, 0, 0, 0)); } } /// `yyyy-MM-dd_HH.mm.ss[_n].png` (Util.getFilenameFormattedDateTime, local time diff --git a/crates/horizon-client/src/game/combat.rs b/crates/horizon-client/src/game/combat.rs index abe67c6c6..da3851d9a 100644 --- a/crates/horizon-client/src/game/combat.rs +++ b/crates/horizon-client/src/game/combat.rs @@ -114,7 +114,7 @@ impl Game<'_> { let location = if let Some(c) = p.last_climbable { let name = self .res - .facts + .facts() .get(self.world.block(c.x, c.y, c.z)) .name .clone(); @@ -127,7 +127,7 @@ impl Game<'_> { _ => "other_climbable", }) } else { - let f = self.res.facts.get(self.world.block( + let f = self.res.facts().get(self.world.block( p.position.x.floor() as i32, (p.position.y + 0.1).floor() as i32, p.position.z.floor() as i32, diff --git a/crates/horizon-client/src/game/command_blocks.rs b/crates/horizon-client/src/game/command_blocks.rs index 717134515..560a910a4 100644 --- a/crates/horizon-client/src/game/command_blocks.rs +++ b/crates/horizon-client/src/game/command_blocks.rs @@ -459,7 +459,7 @@ impl Game<'_> { self.close_command_block(); return; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); let mid = (w / 2.0).floor(); ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); diff --git a/crates/horizon-client/src/game/commands.rs b/crates/horizon-client/src/game/commands.rs index 575f5c93e..c0085fe88 100644 --- a/crates/horizon-client/src/game/commands.rs +++ b/crates/horizon-client/src/game/commands.rs @@ -941,7 +941,7 @@ impl Game<'_> { }; let count = Self::int(ctx, "count").unwrap_or(1); let targets = self.entities(ctx, "targets", true)?; - let max_stack = self.res.items.get(&id).map_or(64, |i| i.max_stack) as i32; + let max_stack = self.res.items().get(&id).map_or(64, |i| i.max_stack) as i32; if count > max_stack * 100 { return Err(CommandError::new(Text::translate( "commands.give.failed.toomanyitems", @@ -1468,7 +1468,7 @@ impl Game<'_> { if self.ui.difficulty == 0 && self .res - .mob_types + .mob_types() .get(&format!("minecraft:{short}")) .is_some_and(|t| t.category == "monster") { @@ -1485,7 +1485,7 @@ impl Game<'_> { let name; if let Some(t) = self .res - .mob_types + .mob_types() .get(&format!("minecraft:{short}")) .cloned() { @@ -1561,10 +1561,10 @@ impl Game<'_> { let name_ok = if b.tag { let tag = b.id.trim_start_matches("minecraft:"); self.res - .items + .items() .block_tags .get(tag) - .or_else(|| self.res.items.block_tags.get(&b.id)) + .or_else(|| self.res.items().block_tags.get(&b.id)) .is_some_and(|set| { set.contains(&s.name) || set.contains(s.name.trim_start_matches("minecraft:")) }) @@ -1589,8 +1589,8 @@ impl Game<'_> { } // A different block replaces the block entity (Level.setBlock). let (old, new) = ( - self.res.facts.get(previous).name.clone(), - self.res.facts.get(state).name.clone(), + self.res.facts().get(previous).name.clone(), + self.res.facts().get(state).name.clone(), ); // The command clears the old block entity without its side effects // (UPDATE_SKIP_BLOCK_ENTITY_SIDEEFFECTS); the new block gets a fresh one. @@ -2184,10 +2184,10 @@ impl Game<'_> { let tag = predicate.id.trim_start_matches("minecraft:"); return self .res - .items + .items() .item_tags .get(tag) - .or_else(|| self.res.items.item_tags.get(&predicate.id)) + .or_else(|| self.res.items().item_tags.get(&predicate.id)) .is_some_and(|s| { s.contains(item) || s.contains(item.trim_start_matches("minecraft:")) }); @@ -2633,7 +2633,7 @@ impl Game<'_> { let focused = self.screen == Screen::Chat; self.ui .chat - .add(&self.atlas, line, None, self.ticks, focused); + .add(&self.gui.atlas, line, None, self.ticks, focused); Ok(1) } /// MessageArgument: `@p`-style selectors in a message become names. diff --git a/crates/horizon-client/src/game/commands/compute.rs b/crates/horizon-client/src/game/commands/compute.rs index 24552011d..c7b2355e3 100644 --- a/crates/horizon-client/src/game/commands/compute.rs +++ b/crates/horizon-client/src/game/commands/compute.rs @@ -502,7 +502,7 @@ impl Game<'_> { Some(Value::String(b)) => match b.strip_prefix('#') { Some(tag) => self .res - .items + .items() .block_tags .get(tag.trim_start_matches("minecraft:")) .is_some_and(|set| { diff --git a/crates/horizon-client/src/game/commands/data.rs b/crates/horizon-client/src/game/commands/data.rs index 1d2321a1a..5cf52cd1e 100644 --- a/crates/horizon-client/src/game/commands/data.rs +++ b/crates/horizon-client/src/game/commands/data.rs @@ -142,7 +142,7 @@ impl Game<'_> { set_key(&mut tag, "id", Tag::String(k.as_str().into())); } let new = - entity_nbt::mob_from_nbt(&tag, &self.res.mob_types, id).ok_or_else(stale)?; + entity_nbt::mob_from_nbt(&tag, self.res.mob_types(), id).ok_or_else(stale)?; if let Some(slot) = self.mobs.iter_mut().find(|m| m.id == id) { // Runtime-only state (AI, animation) carries over. let old = std::mem::replace(slot, new); diff --git a/crates/horizon-client/src/game/commands/effects.rs b/crates/horizon-client/src/game/commands/effects.rs index 86726fed9..c67e67b18 100644 --- a/crates/horizon-client/src/game/commands/effects.rs +++ b/crates/horizon-client/src/game/commands/effects.rs @@ -187,7 +187,7 @@ impl Game<'_> { return Ok(0); }; let level = Self::int(ctx, "level").unwrap_or(1); - let enchantments = &self.res.stations.enchantments; + let enchantments = &self.res.stations().enchantments; let Some(def) = enchantments.get(&id) else { return Err(err( "argument.resource.not_found", @@ -213,8 +213,8 @@ impl Game<'_> { } continue; }; - let e = &self.res.stations.enchantments; - let compatible = e.can_enchant(&self.res.items, &id, &stack.item) + let e = &self.res.stations().enchantments; + let compatible = e.can_enchant(self.res.items(), &id, &stack.item) && stack .crafting_enchantments() .iter() @@ -265,7 +265,7 @@ impl Game<'_> { } let (name, curse) = self .res - .stations + .stations() .enchantments .full_name(&id, level.max(0) as u32); let style = Style { diff --git a/crates/horizon-client/src/game/commands/execute.rs b/crates/horizon-client/src/game/commands/execute.rs index 01488db2c..7bc52685f 100644 --- a/crates/horizon-client/src/game/commands/execute.rs +++ b/crates/horizon-client/src/game/commands/execute.rs @@ -656,7 +656,7 @@ impl Game<'_> { if state == self.world.air { continue; } - let facts = self.res.facts.get(state); + let facts = self.res.facts().get(state); let blocks = facts.legacy_solid || facts.fluid != horizon_client::blocks::Fluid::None; let leaves = self .pack @@ -948,7 +948,7 @@ impl Game<'_> { let chunk = self.world.chunks.get(&(p[0] >> 4, p[2] >> 4))?; Some( self.res - .biomes + .biomes() .get(chunk.biome(p[0], p[1], p[2])) .name .clone(), @@ -971,7 +971,7 @@ impl Game<'_> { .resources .join(format!("data/{ns}/tags/worldgen/biome/{path}.json")); let Ok(bytes) = std::fs::read(file) else { - return self.res.mob_data.biome_has(tag, biome); + return self.res.mob_data().biome_has(tag, biome); }; let v: serde_json::Value = serde_json::from_slice(&bytes).unwrap_or_default(); v["values"].as_array().is_some_and(|a| { diff --git a/crates/horizon-client/src/game/commands/extra.rs b/crates/horizon-client/src/game/commands/extra.rs index a90648043..7a4accb0d 100644 --- a/crates/horizon-client/src/game/commands/extra.rs +++ b/crates/horizon-client/src/game/commands/extra.rs @@ -586,7 +586,7 @@ impl Game<'_> { ); let hit = traverse_blocks(eye, end, 256, |b: BlockPos| { let state = self.world.block(b.x, b.y, b.z); - (!self.res.facts.is_air(state)).then_some([b.x, b.y, b.z]) + (!self.res.facts().is_air(state)).then_some([b.x, b.y, b.z]) }); hit.ok().flatten().unwrap_or([ end.x.floor() as i32, diff --git a/crates/horizon-client/src/game/commands/items.rs b/crates/horizon-client/src/game/commands/items.rs index c71eebc68..fde97764d 100644 --- a/crates/horizon-client/src/game/commands/items.rs +++ b/crates/horizon-client/src/game/commands/items.rs @@ -375,7 +375,11 @@ impl Game<'_> { } else { 0 }; - let max = self.res.items.get(&stack.item).map_or(64, |i| i.max_stack); + let max = self + .res + .items() + .get(&stack.item) + .map_or(64, |i| i.max_stack); stack.count = (base + n).clamp(0, max as i32) as u32; } "minecraft:limit_count" => { @@ -389,7 +393,11 @@ impl Game<'_> { } } "minecraft:set_damage" => { - let max = self.res.items.get(&stack.item).map_or(0, |i| i.max_damage); + let max = self + .res + .items() + .get(&stack.item) + .map_or(0, |i| i.max_damage); if max > 0 { let f = match m["damage"].as_f64() { Some(f) => f as f32, @@ -587,7 +595,7 @@ impl Game<'_> { if let Some(Tag::Int(n)) = s.data().and_then(|d| d.other("minecraft:max_stack_size")) { return (*n).clamp(1, 99) as u32; } - self.res.items.get(&s.item).map_or(64, |i| i.max_stack) + self.res.items().get(&s.item).map_or(64, |i| i.max_stack) } /// `ResourceOrIdArgument.getItemModifier`: an inline modifier (SNBT) or /// a registered one. diff --git a/crates/horizon-client/src/game/commands/terrain_cmds.rs b/crates/horizon-client/src/game/commands/terrain_cmds.rs index cee7a1d72..46df0ce7d 100644 --- a/crates/horizon-client/src/game/commands/terrain_cmds.rs +++ b/crates/horizon-client/src/game/commands/terrain_cmds.rs @@ -174,7 +174,7 @@ impl Game<'_> { if volume > i64::from(limit) { return Err(err("commands.fillbiome.toobig", &[&limit, &volume])); } - let Some(target) = self.res.biomes.list.iter().position(|b| b.name == biome) else { + let Some(target) = self.res.biomes().list.iter().position(|b| b.name == biome) else { return Err(err( "argument.resource.not_found", &[&biome, &"minecraft:worldgen/biome"], @@ -201,7 +201,7 @@ impl Game<'_> { continue; }; let current = chunk.biome(x, y, z); - let current_name = &self.res.biomes.list[usize::from(current)].name; + let current_name = &self.res.biomes().list[usize::from(current)].name; if let Some(f) = &filter && !self.biome_matches(f, current_name) { @@ -474,11 +474,11 @@ impl Game<'_> { let json = horizon_client::scoreboard::tag_to_json(&tag); let drops = self .res - .items + .items() .inline_loot_table(&json, &mut self.world.random); (drops, None) } else { - if !self.res.items.has_loot_table(&table) { + if !self.res.items().has_loot_table(&table) { return Err(err("argument.resource_or_id.failed_to_parse", &[&table])); } let held = if id == "loot.fish" { @@ -486,14 +486,14 @@ impl Game<'_> { } else { None }; - let drops = match self.res.items.loot_sequence(&table) { + let drops = match self.res.items().loot_sequence(&table) { Some(seq) => { let random = self.rand_sequences.get(&seq, self.level.seed); self.res - .items + .items() .loot_table(&table, false, held.as_ref(), random) } - None => self.res.items.loot_table( + None => self.res.items().loot_table( &table, false, held.as_ref(), @@ -510,7 +510,7 @@ impl Game<'_> { }; let ty = self.target_type(t); let table = format!("minecraft:entities/{}", ty.trim_start_matches("minecraft:")); - if t == Target::Player || !self.res.items.has_loot_table(&table) { + if t == Target::Player || !self.res.items().has_loot_table(&table) { return Err(err( "commands.drop.no_loot_table.entity", &[&self.target_name(t).plain()], @@ -521,14 +521,14 @@ impl Game<'_> { None | Some(Some(Target::Player)) ); let held = self.slot_get(&super::items::Slot::Inv(self.selected)); - let drops = match self.res.items.loot_sequence(&table) { + let drops = match self.res.items().loot_sequence(&table) { Some(seq) => { let random = self.rand_sequences.get(&seq, self.level.seed); self.res - .items + .items() .entity_drops(&ty, by_player, held.as_ref(), random) } - None => self.res.items.entity_drops( + None => self.res.items().entity_drops( &ty, by_player, held.as_ref(), @@ -543,21 +543,21 @@ impl Game<'_> { let state = self.world.block(p[0], p[1], p[2]); let name = self.data_block_name(p); let table = format!("minecraft:blocks/{}", name.trim_start_matches("minecraft:")); - if !self.res.items.has_loot_table(&table) { + if !self.res.items().has_loot_table(&table) { return Err(err("commands.drop.no_loot_table.block", &[&name])); } let tool = self.tool_stack(ctx)?; - let drops = match self.res.items.loot_sequence(&table) { + let drops = match self.res.items().loot_sequence(&table) { Some(seq) => { let random = self.rand_sequences.get(&seq, self.level.seed); - self.res.items.block_drops( + self.res.items().block_drops( self.pack.assets.registry, state, tool.as_ref(), random, ) } - None => self.res.items.block_drops( + None => self.res.items().block_drops( self.pack.assets.registry, state, tool.as_ref(), @@ -624,7 +624,7 @@ impl Game<'_> { && cur.damage == left.damage && cur.extra == left.extra => { - let max = self.res.items.get(&cur.item).map_or(64, |i| i.max_stack); + let max = self.res.items().get(&cur.item).map_or(64, |i| i.max_stack); let take = left.count.min(max.saturating_sub(cur.count)); if take > 0 { cur.count += take; diff --git a/crates/horizon-client/src/game/commands/world_cmds.rs b/crates/horizon-client/src/game/commands/world_cmds.rs index 2055798f4..ef2adf80c 100644 --- a/crates/horizon-client/src/game/commands/world_cmds.rs +++ b/crates/horizon-client/src/game/commands/world_cmds.rs @@ -31,7 +31,7 @@ impl Game<'_> { /// Every recipe id of the recipe manager (what `/recipe` resolves and suggests). pub(super) fn learnable_recipes(&self) -> Vec { - self.res.stations.recipe_index.ids().cloned().collect() + self.res.stations().recipe_index.ids().cloned().collect() } pub(super) fn cmd_recipe(&mut self, id: &str, ctx: &Context) -> R { let targets = self.entities(ctx, "targets", true)?; @@ -52,7 +52,7 @@ impl Game<'_> { // displays (a transmute recipe has one per material count). let mut n = 0; // ServerPlayer.awardRecipes / resetRecipes: the displays changed. - let index = &self.res.stations.recipe_index; + let index = &self.res.stations().recipe_index; n += if give { let (count, unlocked) = self.level.recipe_book.add_recipes(index, &recipes); self.recipe_unlocked(&unlocked); @@ -1267,7 +1267,7 @@ impl Game<'_> { fn spread_spawn_y(&self, p: [f64; 2], max_y: i32) -> i32 { let (x, z) = (p[0].floor() as i32, p[1].floor() as i32); let air = |y: i32| { - let name: &str = &self.res.facts.get(self.world.block(x, y, z)).name; + let name: &str = &self.res.facts().get(self.world.block(x, y, z)).name; matches!( name, "minecraft:air" | "minecraft:cave_air" | "minecraft:void_air" @@ -1292,16 +1292,16 @@ impl Game<'_> { fn spread_safe(&self, p: [f64; 2], max_y: i32) -> bool { let y = self.spread_spawn_y(p, max_y) - 1; let (x, z) = (p[0].floor() as i32, p[1].floor() as i32); - let name = self.res.facts.get(self.world.block(x, y, z)).name.clone(); + let name = self.res.facts().get(self.world.block(x, y, z)).name.clone(); let liquid = matches!(&*name, "minecraft:water" | "minecraft:lava"); let teleportable = self .res - .items + .items() .block_tags .get("entities_can_teleport_to") .or_else(|| { self.res - .items + .items() .block_tags .get("minecraft:entities_can_teleport_to") }) diff --git a/crates/horizon-client/src/game/composter.rs b/crates/horizon-client/src/game/composter.rs index 3e4cb7169..3f57229ad 100644 --- a/crates/horizon-client/src/game/composter.rs +++ b/crates/horizon-client/src/game/composter.rs @@ -21,7 +21,7 @@ impl Game<'_> { } /// The item's `compostable` layers provider. fn compostable(&self, stack: &ItemStack) -> Option { - self.res.items.get(&stack.item)?.compostable.clone() + self.res.items().get(&stack.item)?.compostable.clone() } /// `ComposterBlock.addLayer` and level event 1500: the provider is /// evaluated in the composter's block-interaction loot context (its diff --git a/crates/horizon-client/src/game/consume.rs b/crates/horizon-client/src/game/consume.rs index b2fe15c82..50b1fa814 100644 --- a/crates/horizon-client/src/game/consume.rs +++ b/crates/horizon-client/src/game/consume.rs @@ -154,7 +154,7 @@ impl Game<'_> { let states: Vec<_> = blocks.map(|(x, y, z)| self.world.block(x, y, z)).collect(); let liquid = states .iter() - .any(|&s| self.res.facts.get(s).fluid != horizon_client::blocks::Fluid::None); + .any(|&s| self.res.facts().get(s).fluid != horizon_client::blocks::Fluid::None); if !free || liquid || states.iter().any(|&s| self.state_in_tag(avoid, s)) { return false; } @@ -167,9 +167,9 @@ impl Game<'_> { true } fn state_in_tag(&self, tag: &str, state: horizon_world::registry::BlockStateId) -> bool { - let name = &self.res.facts.get(state).name; + let name = &self.res.facts().get(state).name; self.res - .items + .items() .block_tags .get(tag) .is_some_and(|s| s.contains(&**name)) diff --git a/crates/horizon-client/src/game/control.rs b/crates/horizon-client/src/game/control.rs index 6827d49c9..b1dd35ab8 100644 --- a/crates/horizon-client/src/game/control.rs +++ b/crates/horizon-client/src/game/control.rs @@ -345,7 +345,7 @@ impl Game<'_> { }; let info = self .res - .items + .items() .get(&item) .ok_or_else(|| format!("unknown item {item}"))?; let count: u32 = words.get(2).map_or(Ok(1), |c| c.parse())?; @@ -437,7 +437,7 @@ impl Game<'_> { match self.screen { Screen::Chat => self.chat_type(text), Screen::CommandBlock => self.command_block_type(text), - Screen::Options => self.ui.options.type_text(&self.atlas, text), + Screen::Options => self.ui.options.type_text(&self.gui.atlas, text), // The port, or the game rules' search and number boxes. Screen::WorldOptions if text == "\\b" => self.world_options_text(None), Screen::WorldOptions => self.world_options_text(Some(text)), @@ -661,7 +661,7 @@ impl Game<'_> { }); let target = self.pick().map(|hit| { let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - json!({ "pos": hit.pos, "block": &*self.res.facts.get(state).name }) + json!({ "pos": hit.pos, "block": &*self.res.facts().get(state).name }) }); let renderer = self.renderer.as_ref().map(|r| { let [arena_bytes, section_vertex_bytes] = r.section_vertex_bytes(); diff --git a/crates/horizon-client/src/game/copper_golems.rs b/crates/horizon-client/src/game/copper_golems.rs index a12fbd416..2f98e1c7e 100644 --- a/crates/horizon-client/src/game/copper_golems.rs +++ b/crates/horizon-client/src/game/copper_golems.rs @@ -106,7 +106,7 @@ impl Game<'_> { fn golem_chest_sound(&mut self, p: [i32; 3], open: bool) { let name = self .res - .facts + .facts() .get(self.world.block(p[0], p[1], p[2])) .name .clone(); @@ -292,7 +292,7 @@ impl Game<'_> { pub(super) fn golem_shearable(&self, index: usize) -> bool { self.mobs[index].saddle_item().is_some_and(|a| { self.res - .items + .items() .item_tags .get("minecraft:shearable_from_copper_golem") .is_some_and(|t| t.contains(&*a.item)) diff --git a/crates/horizon-client/src/game/creaking.rs b/crates/horizon-client/src/game/creaking.rs index d75becb8d..e7a1386f9 100644 --- a/crates/horizon-client/src/game/creaking.rs +++ b/crates/horizon-client/src/game/creaking.rs @@ -110,7 +110,7 @@ impl Game<'_> { let mut next_entity = self.next_entity; let mut random = self.world.random.clone(); let spawning = self.spawning_monsters(); - let creaking = self.res.mob_types.get("minecraft:creaking").cloned(); + let creaking = self.res.mob_types().get("minecraft:creaking").cloned(); let player_uuid = self.level.player_uuid; let snapshot: Vec<_> = mobs.iter().map(|m| seen(m, player_uuid)).collect(); let mut events = Vec::new(); @@ -265,7 +265,7 @@ impl Game<'_> { return Ok(()); }; let state = self.world.block(key.0, key.1, key.2); - if &*self.res.facts.get(state).name != "minecraft:creaking_heart" { + if &*self.res.facts().get(state).name != "minecraft:creaking_heart" { // The block is gone: preRemoveSideEffects. self.world.block_entities.forget(&key); self.with_heart(key, &mut heart, |h, _, _, host, out| { @@ -317,7 +317,7 @@ impl Game<'_> { if self.creaking.hearts.is_empty() { self.creaking.hearts = self .res - .facts + .facts() .states .iter() .map(|f| &*f.name == "minecraft:creaking_heart") diff --git a/crates/horizon-client/src/game/creatures.rs b/crates/horizon-client/src/game/creatures.rs index 3ef399e62..97104ac00 100644 --- a/crates/horizon-client/src/game/creatures.rs +++ b/crates/horizon-client/src/game/creatures.rs @@ -204,8 +204,8 @@ impl Game<'_> { let Some(chunk) = self.world.chunks.get(&(x >> 4, z >> 4)) else { return BiomeFacts::default(); }; - let b = self.res.biomes.get(chunk.biome(x, y, z)); - let tags = &self.res.mob_data; + let b = self.res.biomes().get(chunk.biome(x, y, z)); + let tags = self.res.mob_data(); let has = |t: &str| tags.biome_has(t, &b.name); let climate = if has("minecraft:spawns_warm_variant_farm_animals") { Climate::Warm @@ -255,7 +255,7 @@ impl Game<'_> { } else { format!("minecraft:{kind}") }; - let t = self.res.mob_types.get(&kind).cloned()?; + let t = self.res.mob_types().get(&kind).cloned()?; self.next_entity += 1; let yaw = self.world.random.next_float() * 360.0; let mut mob = Mob::new(self.next_entity, t, Vec3::new(at[0], at[1], at[2]), yaw); @@ -368,7 +368,7 @@ impl Game<'_> { pub(super) fn motion_top(&self, x: i32, z: i32) -> i32 { let top = if self.dim == Dim::Nether { 127 } else { 319 }; for y in (horizon_client::chunk::MIN_Y..=top).rev() { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if (f.full_collision || f.fluid != Fluid::None) && !f.name.ends_with("leaves") { return y + 1; } @@ -380,10 +380,10 @@ impl Game<'_> { MobWorld { world: &self.world, registry: self.pack.assets.registry, - facts: &self.res.facts, + facts: self.res.facts(), movement: &self.motion.blocks, collision: self.collision, - data: &self.res.mob_data, + data: self.res.mob_data(), player: self.player_view(), others, others_grid: None, @@ -393,14 +393,14 @@ impl Game<'_> { raining: rain > 0.2, thundering: thunder > 0.9, nether: self.dim == Dim::Nether, - block_tags: &self.res.items.block_tags, - biomes: &self.res.biomes, + block_tags: &self.res.items().block_tags, + biomes: self.res.biomes(), mob_griefing: self.ui.rules.bool("mob_griefing"), end: self.dim == Dim::End, world_seed: self.level.seed, sea_level: if self.dim == Dim::Nether { 32 } else { 63 }, teams: self.mob_teams(), - items: Some(&self.res.items), + items: Some(self.res.items()), difficulty: self.local_difficulty( self.player .as_ref() @@ -984,7 +984,7 @@ impl Game<'_> { if effect { let old = self.world.block(pos[0], pos[1], pos[2]); self.destroy_particles(pos, old); - let s = self.res.facts.get(old).sounds.break_sound.clone(); + let s = self.res.facts().get(old).sounds.break_sound.clone(); self.audio.play( &s, Some([ @@ -1004,7 +1004,7 @@ impl Game<'_> { let old = self.world.block(pos[0], pos[1], pos[2]); self.destroy_particles(pos, old); if drop { - let drops = self.res.items.block_drops_in( + let drops = self.res.items().block_drops_in( self.pack.assets.registry, old, None, @@ -1158,7 +1158,7 @@ impl Game<'_> { MobEvent::GiftLoot { table, at } => { let drops = self.res - .items + .items() .loot_table(table, false, None, &mut self.world.random); for d in drops { self.spawn_item(d, at, [0.0, 0.2, 0.0], 10); @@ -1421,7 +1421,7 @@ impl Game<'_> { } let projectile = self .res - .stations + .stations() .enchantments .damage_tags .get("minecraft:is_projectile") @@ -1781,7 +1781,7 @@ impl Game<'_> { horizon_client::arrows::ArrowScene { world: &self.world, registry: self.pack.assets.registry, - facts: &self.res.facts, + facts: self.res.facts(), collision: self.collision, fluids: &self.motion.fluids, raining: rain, @@ -2033,7 +2033,7 @@ impl Game<'_> { let fire = [pos[0] + face[0], pos[1] + face[1], pos[2] + face[2]]; if self .res - .facts + .facts() .is_air(self.world.block(fire[0], fire[1], fire[2])) && let Some(state) = self.pack.assets.registry.default_state("minecraft:fire") @@ -2359,7 +2359,7 @@ impl Game<'_> { Species::Sheep if item == "minecraft:shears" && !m.extra.sheared && !m.is_baby() => { m.extra.sheared = true; let color = horizon_client::mobs::render::DYE_NAMES[m.extra.color as usize & 15]; - let stacks = self.res.items.loot_table( + let stacks = self.res.items().loot_table( &format!("minecraft:shearing/sheep/{color}"), false, None, @@ -2391,7 +2391,7 @@ impl Game<'_> { Species::Wolf if m.extra.tame && is_food && m.health < m.attrs.max_health => { let heal = self .res - .items + .items() .get(&item) .and_then(|i| i.food.as_ref()) .map_or(2.0, |f| f.0 as f32); @@ -2495,7 +2495,7 @@ impl Game<'_> { Species::Cat if m.extra.tame && is_food && m.health < m.attrs.max_health => { let heal = self .res - .items + .items() .get(&item) .and_then(|i| i.food.as_ref()) .map_or(1.0, |f| f.0 as f32); @@ -2662,7 +2662,7 @@ impl Game<'_> { return; } if let Some(stack) = self.inventory[self.selected].as_mut() - && let Some(info) = self.res.items.get(&stack.item) + && let Some(info) = self.res.items().get(&stack.item) && info.max_damage > 0 { stack.damage += 1; @@ -2735,7 +2735,7 @@ impl Game<'_> { // EntityType.canSpawn: no monsters in peaceful (FAIL ends the click). let id = format!("minecraft:{}", kind.trim_start_matches("minecraft:")); if self.ui.difficulty == 0 - && let Some(t) = self.res.mob_types.get(&id) + && let Some(t) = self.res.mob_types().get(&id) && !horizon_client::mobs::spawn_rules::allowed_in_peaceful(t.species) { return Ok(true); @@ -2799,7 +2799,7 @@ impl Game<'_> { } /// Mob models and projectiles for the entity pass. pub(super) fn mob_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); let scale = f64::from(self.settings.entity_distance); for mob in &self.mobs { @@ -2857,7 +2857,7 @@ impl Game<'_> { camera, &lookup, packed, - &self.res.mob_data, + self.res.mob_data(), &armor, out, ); @@ -3101,13 +3101,17 @@ impl Game<'_> { return; } let mut y = pos[1]; - while &*self.res.facts.get(self.world.block(pos[0], y, pos[2])).name + while &*self + .res + .facts() + .get(self.world.block(pos[0], y, pos[2])) + .name == "minecraft:nether_portal" { y -= 1; } // isValidSpawn: a sturdy top face (portal frames emit no light). - let below = self.res.facts.get(self.world.block(pos[0], y, pos[2])); + let below = self.res.facts().get(self.world.block(pos[0], y, pos[2])); if below.sturdy_full & (1 << 1) == 0 { return; } diff --git a/crates/horizon-client/src/game/debug_keys.rs b/crates/horizon-client/src/game/debug_keys.rs index d90ac907d..a2e1b0ce6 100644 --- a/crates/horizon-client/src/game/debug_keys.rs +++ b/crates/horizon-client/src/game/debug_keys.rs @@ -440,7 +440,7 @@ impl Game<'_> { } } let (left, right) = d.columns(&self.debug_chart_lines()); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let mut draws = debug_overlay::draw(&atlas.font, [&left, &right], scale, width); let charts = self.debug_charts.draw( &atlas.font, diff --git a/crates/horizon-client/src/game/decorated_pot.rs b/crates/horizon-client/src/game/decorated_pot.rs index 3ac43566a..af2eaacb2 100644 --- a/crates/horizon-client/src/game/decorated_pot.rs +++ b/crates/horizon-client/src/game/decorated_pot.rs @@ -63,7 +63,7 @@ impl Game<'_> { /// pot without), or None when no pot is there. fn pot_tag(&mut self, pos: [i32; 3]) -> Option { let state = self.world.block(pos[0], pos[1], pos[2]); - if &*self.res.facts.get(state).name != "minecraft:decorated_pot" { + if &*self.res.facts().get(state).name != "minecraft:decorated_pot" { return None; } let mut tag = spill::saved_entity(&self.world, pos).unwrap_or_else(|| { diff --git a/crates/horizon-client/src/game/dedicated.rs b/crates/horizon-client/src/game/dedicated.rs index 59f0cf6f3..f9c3464dd 100644 --- a/crates/horizon-client/src/game/dedicated.rs +++ b/crates/horizon-client/src/game/dedicated.rs @@ -340,7 +340,7 @@ impl Game<'_> { ); } let settings = if flat { - let biomes = &self.res.biomes; + let biomes = self.res.biomes(); let (settings, errors) = horizon_client::flatgen::settings_from_json( &props.generator_settings, |b| self.pack.assets.registry.default_state(b).is_some(), @@ -431,6 +431,7 @@ const BROADCAST: &[&str] = &[ impl Game<'_> { /// DedicatedServer.initServer and MinecraftServer.runServer. pub(super) fn run_dedicated(&mut self) -> Result<()> { + self.join_world_rest()?; let Setup { props, universe, diff --git a/crates/horizon-client/src/game/dispense_fixture.rs b/crates/horizon-client/src/game/dispense_fixture.rs index 211dff57c..ab7a6cf48 100644 --- a/crates/horizon-client/src/game/dispense_fixture.rs +++ b/crates/horizon-client/src/game/dispense_fixture.rs @@ -114,9 +114,9 @@ impl Game<'_> { } fn fixture_reset(&mut self, seed: i64) { - self.world = World::new(self.res.facts.air, seed); + self.world = World::new(self.res.facts().air, seed); // The oracle level is plains everywhere (bone meal's flowers, freezing). - let plains = u32::from(self.res.biomes.id("minecraft:plains")); + let plains = u32::from(self.res.biomes().id("minecraft:plains")); for cx in -2..=2 { for cz in -2..=2 { let mut chunk = Chunk::empty(cx, cz); @@ -198,7 +198,7 @@ impl Game<'_> { let state = BlockStateId(cell[3].as_u64().unwrap_or(0) as u32); self.world.set(p.0, p.1, p.2, state)?; before.insert(p, state.0); - if let Some(entity) = BlockEntity::for_block(&self.res.facts.get(state).name) { + if let Some(entity) = BlockEntity::for_block(&self.res.facts().get(state).name) { self.world.block_entities.insert(p, entity); } } @@ -339,7 +339,7 @@ impl Game<'_> { changed.dedup(); for p in changed { let now = self.world.block(p.0, p.1, p.2).0; - if before.get(&p).copied().unwrap_or(self.res.facts.air.0) != now { + if before.get(&p).copied().unwrap_or(self.res.facts().air.0) != now { out.push(format!("set {},{},{} {now}", p.0, p.1, p.2)); } } @@ -706,7 +706,7 @@ impl Game<'_> { /// lectern's book, or the items of a block entity Horizon keeps as saved. fn fixture_fill(&mut self, p: (i32, i32, i32), slot: usize, stack: Option) { let jukebox = - &*self.res.facts.get(self.world.block(p.0, p.1, p.2)).name == "minecraft:jukebox"; + &*self.res.facts().get(self.world.block(p.0, p.1, p.2)).name == "minecraft:jukebox"; match self.world.block_entities.get_mut(&p) { Some(BlockEntity::Jukebox(j)) => j.record = stack, Some(BlockEntity::Lectern(l)) => l.book = stack, @@ -735,7 +735,7 @@ impl Game<'_> { use horizon_world::nbt::Tag; let name = self .res - .facts + .facts() .get(self.world.block(p.0, p.1, p.2)) .name .clone(); @@ -833,7 +833,7 @@ impl Game<'_> { self.inventory[self.selected] = stack.clone(); self.offhand = None; let state = self.world.block(pos.x, pos.y, pos.z); - let block = self.res.facts.get(state).name.clone(); + let block = self.res.facts().get(state).name.clone(); let item = stack.as_ref().map(|s| s.item.clone()); let before = |game: &Self| { let used = item.as_ref().map_or(0, |i| game.stats.get("used", i)); @@ -882,7 +882,7 @@ impl Game<'_> { } let t = self .res - .mob_types + .mob_types() .get(kind) .cloned() .ok_or_else(|| format!("no mob type {kind}"))?; diff --git a/crates/horizon-client/src/game/dispenser.rs b/crates/horizon-client/src/game/dispenser.rs index cb28aa1cc..0f59e5300 100644 --- a/crates/horizon-client/src/game/dispenser.rs +++ b/crates/horizon-client/src/game/dispenser.rs @@ -328,18 +328,18 @@ impl Game<'_> { self.world.block(p.0, p.1, p.2) } fn dispenser_block_name(&self, p: Pos) -> std::sync::Arc { - self.res.facts.get(self.block_at(p)).name.clone() + self.res.facts().get(self.block_at(p)).name.clone() } fn in_block_tag(&self, tag: &str, block: &str) -> bool { self.res - .items + .items() .block_tags .get(tag) .is_some_and(|s| s.contains(block)) } fn water_at(&self, p: Pos) -> bool { matches!( - self.res.behaviours.fluid_kind(self.block_at(p)), + self.res.behaviours().fluid_kind(self.block_at(p)), FluidKind::Water | FluidKind::FlowingWater ) } @@ -520,7 +520,7 @@ impl Game<'_> { if let Some(entity) = self.world.block_entities.get_mut(&pos) { let max = self .res - .items + .items() .get(&rest.item) .map_or(64, |i| i.max_stack) .max(1); @@ -555,7 +555,11 @@ impl Game<'_> { } /// `ItemStack.hurtAndBreak(amount)` without an entity. fn hurt_and_break(&mut self, mut stack: ItemStack, amount: u32) -> Option { - let max = self.res.items.get(&stack.item).map_or(0, |i| i.max_damage); + let max = self + .res + .items() + .get(&stack.item) + .map_or(0, |i| i.max_damage); if max == 0 { return Some(stack); } @@ -637,7 +641,7 @@ impl Game<'_> { ) -> Result { let equippable = self .res - .items + .items() .get(&stack.item) .is_some_and(|i| i.equip_slot.is_some()); if equippable { @@ -649,7 +653,7 @@ impl Game<'_> { } let swallowable = self .res - .items + .items() .item_tags .get("minecraft:sulfur_cube_swallowable") .is_some_and(|t| t.contains(&*stack.item)); @@ -748,7 +752,7 @@ impl Game<'_> { } else { format!("minecraft:{kind}") }; - let t = self.res.mob_types.get(&name)?.clone(); + let t = self.res.mob_types().get(&name)?.clone(); let y_off = if try_move_down { self.drop_offset(t.width, t.height, p) } else { @@ -768,7 +772,7 @@ impl Game<'_> { /// `EquipmentDispenseItemBehavior.dispenseEquipment`: the first living /// entity in front that `canEquipWithDispenser` gets one of the item. fn dispense_equipment(&mut self, pos: Pos, facing: Direction, stack: &mut ItemStack) -> bool { - let Some(info) = self.res.items.get(&stack.item) else { + let Some(info) = self.res.items().get(&stack.item) else { return false; }; let (Some(slot), true) = ( @@ -1078,7 +1082,7 @@ impl Game<'_> { let below = (front.0, front.1 - 1, front.2); let y_offset = if self.water_at(front) { 1.0 - } else if self.res.facts.is_air(self.block_at(front)) && self.water_at(below) { + } else if self.res.facts().is_air(self.block_at(front)) && self.water_at(below) { 0.0 } else { return (self.dispense_default(pos, facing, stack), CLICK); @@ -1116,7 +1120,7 @@ impl Game<'_> { let y_offset = if let Some(rail) = self.rail(front.0, front.1, front.2) { if rail.shape.is_slope() { 0.6 } else { 0.1 } } else { - if !self.res.facts.is_air(self.block_at(front)) { + if !self.res.facts().is_air(self.block_at(front)) { return (self.dispense_default(pos, facing, stack), CLICK); } let below = (front.0, front.1 - 1, front.2); @@ -1389,7 +1393,7 @@ impl Game<'_> { stack: ItemStack, ) -> Result { let target = offset(pos, facing); - let free = self.res.facts.is_air(self.block_at(target)) + let free = self.res.facts().is_air(self.block_at(target)) && target.1 >= horizon_client::chunk::MIN_Y + 2 && self.ui.difficulty != 0 && self.can_build_wither(target); @@ -1443,7 +1447,7 @@ impl Game<'_> { "minecraft:soul_sand" | "minecraft:soul_soil" ) }; - let air = |p: Pos| self.res.facts.is_air(self.block_at(p)); + let air = |p: Pos| self.res.facts().is_air(self.block_at(p)); for (ax, az) in [(1, 0), (0, 1)] { for col in 0..3 { let left = (head.0 - ax * col, head.1, head.2 - az * col); @@ -1466,7 +1470,7 @@ impl Game<'_> { stack: ItemStack, ) -> Result { let target = offset(pos, facing); - if self.res.facts.is_air(self.block_at(target)) + if self.res.facts().is_air(self.block_at(target)) && self.can_spawn_golem([target.0, target.1, target.2]) { if let Some(pumpkin) = self @@ -1511,7 +1515,7 @@ impl Game<'_> { let front = offset(pos, facing); let below_empty = self .res - .facts + .facts() .is_air(self.block_at((front.0, front.1 - 1, front.2))); let clicked_face = if below_empty { facing } else { Direction::Up }; let ctx = PlaceContext { @@ -1539,7 +1543,7 @@ impl Game<'_> { return Ok((Some(stack), FAIL)); }; let target = (placed.x, placed.y, placed.z); - if let Some(entity) = BlockEntity::for_block(&self.res.facts.get(state).name) { + if let Some(entity) = BlockEntity::for_block(&self.res.facts().get(state).name) { self.world.block_entities.insert(target, entity); self.apply_placed_item([target.0, target.1, target.2], &stack, false); } @@ -1689,14 +1693,14 @@ impl Game<'_> { table: &str, held: Option<&ItemStack>, ) -> Vec { - match self.res.items.loot_sequence(parent) { + match self.res.items().loot_sequence(parent) { Some(sequence) => { let random = self.rand_sequences.get(&sequence, self.level.seed); - self.res.items.loot_table_from(table, false, held, random) + self.res.items().loot_table_from(table, false, held, random) } None => self .res - .items + .items() .loot_table(table, false, held, &mut self.world.random), } } @@ -1717,7 +1721,7 @@ impl Game<'_> { /// random draws) keeps the name, flags, persistence and age; the old one /// is discarded. pub(super) fn convert_mob(&mut self, index: usize, kind: &str) -> Option { - let t = self.res.mob_types.get(kind).cloned()?; + let t = self.res.mob_types().get(kind).cloned()?; let old = &self.mobs[index]; self.next_entity += 1; let mut mob = Mob::new(self.next_entity, t, old.position, old.yaw); diff --git a/crates/horizon-client/src/game/dragon.rs b/crates/horizon-client/src/game/dragon.rs index e76eb16fb..cbfad527b 100644 --- a/crates/horizon-client/src/game/dragon.rs +++ b/crates/horizon-client/src/game/dragon.rs @@ -447,9 +447,9 @@ impl Game<'_> { } fn end_portal_active(&self) -> bool { (0..256).any(|y| { - &*self.res.facts.get(self.world.block(0, y, 0)).name == "minecraft:bedrock" + &*self.res.facts().get(self.world.block(0, y, 0)).name == "minecraft:bedrock" && (-3..=3).any(|d| { - &*self.res.facts.get(self.world.block(d, y, 0)).name == "minecraft:end_portal" + &*self.res.facts().get(self.world.block(d, y, 0)).name == "minecraft:end_portal" }) }) } @@ -591,7 +591,7 @@ impl Game<'_> { let p = self.crystals[i].position; let b = [p.x.floor() as i32, p.y.floor() as i32, p.z.floor() as i32]; if let Some(fire) = fire - && self.res.facts.is_air(self.world.block(b[0], b[1], b[2])) + && self.res.facts().is_air(self.world.block(b[0], b[1], b[2])) && self.world.loaded(b[0], b[2]) { let _ = self.level_set(b, fire); @@ -764,7 +764,7 @@ impl Game<'_> { let held = self.held().cloned(); let modifiers = held .as_ref() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .map(|i| (i.attack_damage, i.attack_speed)) .unwrap_or((0.0, 0.0)); let speed = (4.0 + modifiers.1).max(0.1); @@ -813,7 +813,7 @@ impl Game<'_> { (0..256) .rev() .find(|&y| { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); (f.full_collision || f.legacy_solid || f.fluid != horizon_client::blocks::Fluid::None) @@ -1257,7 +1257,7 @@ impl Game<'_> { let (x, z) = (head.x + look.x * 2.5, head.z + look.y * 2.5); let mut y = head.y + 0.5; while y > 0.0 - && self.res.facts.is_air(self.world.block( + && self.res.facts().is_air(self.world.block( x.floor() as i32, y.floor() as i32, z.floor() as i32, @@ -1594,7 +1594,7 @@ impl Game<'_> { return; }; let boxes = [d.part_box(0), d.part_box(1), d.part_box(2)]; - let tags = &self.res.items.block_tags; + let tags = &self.res.items().block_tags; let transparent = tags .get("minecraft:dragon_transparent") .cloned() @@ -1610,8 +1610,8 @@ impl Game<'_> { for y in lo.y.floor() as i32..=hi.y.floor() as i32 { for z in lo.z.floor() as i32..=hi.z.floor() as i32 { let state = self.world.block(x, y, z); - let name = &self.res.facts.get(state).name; - if self.res.facts.is_air(state) || transparent.contains(&**name) { + let name = &self.res.facts().get(state).name; + if self.res.facts().is_air(state) || transparent.contains(&**name) { continue; } if griefing && !immune.contains(&**name) { @@ -1713,7 +1713,7 @@ impl Game<'_> { let y = (0..256) .rev() .find(|&y| { - let f = self.res.facts.get(self.world.block(0, y, 0)); + let f = self.res.facts().get(self.world.block(0, y, 0)); f.full_collision || f.legacy_solid }) .map_or(64, |y| y + 1); @@ -1767,7 +1767,7 @@ impl Game<'_> { next.y.floor() as i32, next.z.floor() as i32, ]; - let f = self.res.facts.get(self.world.block(p[0], p[1], p[2])); + let f = self.res.facts().get(self.world.block(p[0], p[1], p[2])); f.full_collision || f.legacy_solid }; let hit_player = player.is_some_and(|pb| { @@ -1869,9 +1869,9 @@ impl Game<'_> { batch.width as i32, batch.height as i32, &bars, - &self.atlas.font, + &self.gui.atlas.font, ); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } /// The dragon fight's boss bar shows (`EnderDragonFight.dragonEvent`, /// with `setCreateWorldFog`). @@ -1909,7 +1909,13 @@ impl Game<'_> { return; }; let a = alpha as f32; - let sprite = |n: &str| self.atlas.sprites.get(n).map(|r| [r.u0, r.v0, r.u1, r.v1]); + let sprite = |n: &str| { + self.gui + .atlas + .sprites + .get(n) + .map(|r| [r.u0, r.v0, r.u1, r.v1]) + }; let (Some(skin), Some(eyes)) = ( sprite("entity/enderdragon/dragon"), sprite("entity/enderdragon/dragon_eyes"), @@ -2075,7 +2081,7 @@ impl Game<'_> { } /// `submitRays`: the death rays from a fixed seed, fading in white to magenta. fn dragon_rays(&self, base: glam::Mat4, t: f32, out: &mut Vec) { - let white = self.atlas.font.white(); + let white = self.gui.atlas.font.white(); let uv = [white.u0, white.v0]; let over = if t > 0.8 { ((t - 0.8) / 0.2).min(1.0) @@ -2131,6 +2137,7 @@ impl Game<'_> { out: &mut Vec, ) { let Some(s) = self + .gui .atlas .sprites .get("entity/end_crystal/end_crystal_beam") @@ -2192,6 +2199,7 @@ impl Game<'_> { out: &mut Vec, ) { let Some(s) = self + .gui .atlas .sprites .get("entity/enderdragon/dragon_fireball") @@ -2381,7 +2389,7 @@ impl Game<'_> { } let name = self .res - .facts + .facts() .get(self.world.block(hit.pos[0], hit.pos[1], hit.pos[2])) .name .clone(); @@ -2391,7 +2399,7 @@ impl Game<'_> { let above = [hit.pos[0], hit.pos[1] + 1, hit.pos[2]]; if !self .res - .facts + .facts() .is_air(self.world.block(above[0], above[1], above[2])) { return false; @@ -2512,7 +2520,7 @@ impl Game<'_> { } fn block_name_at(&self, p: [i32; 3]) -> std::sync::Arc { self.res - .facts + .facts() .get(self.world.block(p[0], p[1], p[2])) .name .clone() @@ -2614,7 +2622,7 @@ impl Game<'_> { for y in h - 10..=h + 10 { for z in cz - 10..=cz + 10 { for x in cx - 10..=cx + 10 { - if !self.res.facts.is_air(self.world.block(x, y, z)) { + if !self.res.facts().is_air(self.world.block(x, y, z)) { let _ = self.level_set([x, y, z], air); } } @@ -2636,7 +2644,7 @@ impl Game<'_> { if &*self.block_name_at([x, y, z]) != "minecraft:obsidian" { let _ = self.set_state_named([x, y, z], "minecraft:obsidian", &[]); } - } else if y > 65 && !self.res.facts.is_air(self.world.block(x, y, z)) { + } else if y > 65 && !self.res.facts().is_air(self.world.block(x, y, z)) { let _ = self.level_set([x, y, z], air); } } diff --git a/crates/horizon-client/src/game/enchant_effects.rs b/crates/horizon-client/src/game/enchant_effects.rs index 1e36b00f0..0aa3138f6 100644 --- a/crates/horizon-client/src/game/enchant_effects.rs +++ b/crates/horizon-client/src/game/enchant_effects.rs @@ -16,7 +16,7 @@ impl Game<'_> { let held = self.inventory[self.selected].as_ref(); speed += self .res - .stations + .stations() .enchantments .attribute_add(held, "minecraft:mining_efficiency") as f32; } @@ -26,7 +26,7 @@ impl Game<'_> { pub(super) fn submerged_mining_speed(&self) -> f32 { let mut total = 0.0; for stack in self.armor.iter().flatten() { - for (attr, _, amount, op) in self.res.stations.enchantments.attributes(stack) { + for (attr, _, amount, op) in self.res.stations().enchantments.attributes(stack) { if attr == "minecraft:submerged_mining_speed" && op == "add_multiplied_total" { total += amount; } @@ -36,13 +36,13 @@ impl Game<'_> { } /// `EnchantmentHelper.processDurabilityChange` (unbreaking) for `amount` points. pub(super) fn durability_loss(&mut self, stack: &ItemStack, amount: u32) -> u32 { - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; if !e.has_component(stack, "minecraft:item_damage") { return amount; } let ctx = EffectContext { tool: Some(&stack.item), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; e.modify_value( @@ -65,10 +65,10 @@ impl Game<'_> { direct_attacker: Some("minecraft:player"), is_direct: true, damage_type: Some("minecraft:player_attack"), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; - self.res.stations.enchantments.modify_value( + self.res.stations().enchantments.modify_value( Some(&held), "minecraft:damage", &ctx, @@ -96,10 +96,10 @@ impl Game<'_> { attacker: Some("minecraft:player"), direct_attacker: Some("minecraft:player"), is_direct: true, - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; - let knockback = self.res.stations.enchantments.modify_value( + let knockback = self.res.stations().enchantments.modify_value( Some(&held), "minecraft:knockback", &ctx, @@ -130,7 +130,7 @@ impl Game<'_> { // minecraft:post_attack ignite effects of the attacker's weapon (fire aspect). let mut ignite = 0.0f32; for (id, level) in held.enchantments() { - let Some(def) = self.res.stations.enchantments.get(id) else { + let Some(def) = self.res.stations().enchantments.get(id) else { continue; }; for effect in def.effects["minecraft:post_attack"] @@ -145,7 +145,7 @@ impl Game<'_> { let mut random = self.world.random.clone(); let ok = effect.get("requirements").is_none_or(|r| { self.res - .stations + .stations() .enchantments .condition(r, *level, &ctx, &mut random) }); @@ -182,13 +182,13 @@ impl Game<'_> { attacker: Some("minecraft:player"), direct_attacker: Some("minecraft:player"), is_direct: true, - items: Some(&self.res.items), + items: Some(self.res.items()), direct_motion: Some(motion), ..Default::default() }; let mut bursts = Vec::new(); for (id, level) in held.enchantments() { - let Some(def) = self.res.stations.enchantments.get(id) else { + let Some(def) = self.res.stations().enchantments.get(id) else { continue; }; for effect in def.effects["minecraft:post_attack"] @@ -205,7 +205,7 @@ impl Game<'_> { continue; } let ok = effect.get("requirements").is_none_or(|r| { - self.res.stations.enchantments.condition( + self.res.stations().enchantments.condition( r, *level, &ctx, @@ -254,16 +254,16 @@ impl Game<'_> { if level == 0 { continue; } - let Some(def) = self.res.stations.enchantments.get("minecraft:thorns") else { + let Some(def) = self.res.stations().enchantments.get("minecraft:thorns") else { continue; }; let effect = def.effects["minecraft:post_attack"][0].clone(); let ctx = EffectContext { - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; let mut random = self.world.random.clone(); - let ok = self.res.stations.enchantments.condition( + let ok = self.res.stations().enchantments.condition( &effect["requirements"], level, &ctx, @@ -286,7 +286,7 @@ impl Game<'_> { s.damage += 2; if self .res - .items + .items() .get(&s.item) .is_some_and(|i| s.damage >= i.max_damage) { @@ -330,10 +330,10 @@ impl Game<'_> { }; let Some(stack) = stack else { return amount }; let ctx = EffectContext { - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; - let to_repair_xp = self.res.stations.enchantments.modify_value( + let to_repair_xp = self.res.stations().enchantments.modify_value( Some(&stack), "minecraft:repair_with_xp", &ctx, @@ -364,11 +364,11 @@ impl Game<'_> { let Some(bow) = self.inventory[self.selected].clone() else { return (0.0, false); }; - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let ctx = EffectContext { direct_attacker: Some("minecraft:arrow"), attacker: Some("minecraft:player"), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; let power = e.modify_value( @@ -380,7 +380,7 @@ impl Game<'_> { ); let ammo_ctx = EffectContext { tool: Some("minecraft:arrow"), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; let infinity = e.has_component(&bow, "minecraft:ammo_use") @@ -399,12 +399,12 @@ impl Game<'_> { let bow = self.inventory[self.selected].clone()?; let ctx = EffectContext { this: Some("minecraft:arrow"), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; let mut ignite: Option = None; for (id, level) in bow.enchantments() { - let Some(def) = self.res.stations.enchantments.get(id) else { + let Some(def) = self.res.stations().enchantments.get(id) else { continue; }; for effect in def.effects["minecraft:projectile_spawned"] @@ -416,7 +416,7 @@ impl Game<'_> { continue; } let ok = effect.get("requirements").is_none_or(|r| { - self.res.stations.enchantments.condition( + self.res.stations().enchantments.condition( r, *level, &ctx, @@ -436,7 +436,7 @@ impl Game<'_> { pub(super) fn apply_enchantment_attributes(&mut self) { let mut wanted: Vec<(String, String, f64, String)> = Vec::new(); for stack in self.armor.iter().flatten() { - wanted.extend(self.res.stations.enchantments.attributes(stack)); + wanted.extend(self.res.stations().enchantments.attributes(stack)); } let Some(p) = self.player.as_mut() else { return; diff --git a/crates/horizon-client/src/game/end.rs b/crates/horizon-client/src/game/end.rs index a80c51796..34026bb07 100644 --- a/crates/horizon-client/src/game/end.rs +++ b/crates/horizon-client/src/game/end.rs @@ -132,9 +132,9 @@ impl Game<'_> { /// The environment attributes of the current dimension. pub(super) fn dim_environment(&self) -> &Environment { match self.dim { - Dim::Overworld => &self.res.environment, - Dim::Nether => &self.res.nether_environment, - Dim::End => &self.res.end_environment, + Dim::Overworld => self.res.environment(), + Dim::Nether => self.res.nether_environment(), + Dim::End => self.res.end_environment(), } } @@ -142,7 +142,7 @@ impl Game<'_> { /// tinted 0x282828. The atlas does not wrap, so each face is 16×16 quads. pub(super) fn end_sky_geometry(&self) -> Vec { let mut out = Vec::with_capacity(6 * 256 * 4); - let Some(r) = self.atlas.sprites.get("environment/end_sky").copied() else { + let Some(r) = self.gui.atlas.sprites.get("environment/end_sky").copied() else { return out; }; use std::f32::consts::FRAC_PI_2; @@ -184,6 +184,7 @@ impl Game<'_> { let intensity = self.end.flash.intensity(self.clock.fraction() as f32); if intensity > 1e-5 && let Some(r) = self + .gui .atlas .sprites .get("environment/celestial/end_flash") @@ -224,7 +225,7 @@ impl Game<'_> { pub(super) fn block_name(&self, p: [i32; 3]) -> std::sync::Arc { self.res - .facts + .facts() .get(self.world.block(p[0], p[1], p[2])) .name .clone() @@ -561,7 +562,7 @@ impl Game<'_> { let mut y = (0..256) .rev() .find(|&y| { - let f = self.res.facts.get(self.world.block(0, y, 0)); + let f = self.res.facts().get(self.world.block(0, y, 0)); (f.full_collision || f.fluid != horizon_client::blocks::Fluid::None) && !f.name.ends_with("_leaves") }) @@ -783,7 +784,7 @@ impl Game<'_> { let mut y = 255; while y > floor { let p = [around[0] + xd, y, around[2] + zd]; - let f = self.res.facts.get(self.world.block(p[0], p[1], p[2])); + let f = self.res.facts().get(self.world.block(p[0], p[1], p[2])); if f.full_collision && (allow_bedrock || &*f.name != "minecraft:bedrock") { tallest = Some(p); break; @@ -839,12 +840,12 @@ impl Game<'_> { if &*self.block_name([x, y, z]) != "minecraft:end_stone" || self .res - .facts + .facts() .get(self.world.block(x, y + 1, z)) .full_collision || self .res - .facts + .facts() .get(self.world.block(x, y + 2, z)) .full_collision { @@ -920,7 +921,8 @@ impl Game<'_> { fn end_crystal_geometry(&self, camera: glam::DVec3, out: &mut Vec) { let (Some(model), Some(r)) = ( self.crystal_model.as_ref(), - self.atlas + self.gui + .atlas .sprites .get("entity/end_crystal/end_crystal") .copied(), @@ -1073,7 +1075,7 @@ impl Game<'_> { /// ThrownItemRenderer: the ender eye item facing the camera. fn eye_geometry(&self, camera: glam::DVec3, out: &mut Vec) { - let Some(r) = self.atlas.sprites.get("item/ender_eye").copied() else { + let Some(r) = self.gui.atlas.sprites.get("item/ender_eye").copied() else { return; }; let alpha = self.clock.fraction(); diff --git a/crates/horizon-client/src/game/entity_culling.rs b/crates/horizon-client/src/game/entity_culling.rs index b710f4e73..3abf92835 100644 --- a/crates/horizon-client/src/game/entity_culling.rs +++ b/crates/horizon-client/src/game/entity_culling.rs @@ -21,7 +21,7 @@ impl Game<'_> { && self.settings.resource_packs.iter().all(|id| id == "vanilla") && self.player.is_some() && !self.spectator() - && !opaque(self.res.facts.get(self.world.block(at[0], at[1], at[2])))) + && !opaque(self.res.facts().get(self.world.block(at[0], at[1], at[2])))) .then(|| Culler::new(camera.to_array(), 8_192)); } @@ -31,7 +31,7 @@ impl Game<'_> { if let Some(culler) = &self.entity_culler { culler.cull_vertices(vertices, start, |pos| { let state = self.world.block(pos[0], pos[1], pos[2]); - if !opaque(self.res.facts.get(state)) { + if !opaque(self.res.facts().get(state)) { return false; } let Some(y) = pos[1].checked_sub(MIN_Y) else { diff --git a/crates/horizon-client/src/game/explosion.rs b/crates/horizon-client/src/game/explosion.rs index 4ed2772c7..c6df8d9e2 100644 --- a/crates/horizon-client/src/game/explosion.rs +++ b/crates/horizon-client/src/game/explosion.rs @@ -196,7 +196,7 @@ impl Game<'_> { break; } let state = self.world.block(pos[0], pos[1], pos[2]); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); let fluid = if f.fluid != Fluid::None { 100.0f32 } else { @@ -206,7 +206,7 @@ impl Game<'_> { Some((at, resistance)) if at == pos => { power -= (resistance + 0.3) * 0.3; } - _ if !self.res.facts.is_air(state) || f.fluid != Fluid::None => { + _ if !self.res.facts().is_air(state) || f.fluid != Fluid::None => { power -= (f.explosion_resistance.max(fluid) + 0.3) * 0.3; } _ => {} @@ -450,11 +450,11 @@ impl Game<'_> { if self.world.random.next_int_bound(3).unwrap_or(1) == 0 && self .res - .facts + .facts() .is_air(self.world.block(pos[0], pos[1], pos[2])) && self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1] - 1, pos[2])) .solid_render { @@ -475,7 +475,7 @@ impl Game<'_> { } else { targets.len() }; - let (world, facts) = (&self.world, &self.res.facts); + let (world, facts) = (&self.world, self.res.facts()); self.particles.explosion(center, radius, block_count, &|b| { facts.is_air(world.block(b[0], b[1], b[2])) }); @@ -490,10 +490,10 @@ impl Game<'_> { stacks: &mut Vec<([i32; 3], ItemStack)>, ) -> Result<()> { let state = self.world.block(pos[0], pos[1], pos[2]); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { return Ok(()); } - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); let is_tnt = &*name == "minecraft:tnt"; // Block.onExplosionHit: the drops copy from the block entity, which // then spills its contents as the block turns to air. @@ -510,7 +510,7 @@ impl Game<'_> { // tables' survives_explosion and explosion_decay draw from their // random sequence. let decay = (interaction == BlockInteraction::DestroyWithDecay).then_some(radius); - let drops = self.res.items.block_drops_exploded( + let drops = self.res.items().block_drops_exploded( self.pack.assets.registry, state, None, diff --git a/crates/horizon-client/src/game/extras.rs b/crates/horizon-client/src/game/extras.rs index 712796a81..c16c54447 100644 --- a/crates/horizon-client/src/game/extras.rs +++ b/crates/horizon-client/src/game/extras.rs @@ -188,7 +188,7 @@ impl Game<'_> { let radius = ((reach / 16.0).ceil() as i32 + 1).min(self.settings.render_distance.max(2)); self.extras.minimap.update( &self.world, - &self.res.facts, + self.res.facts(), (bx >> 4, bz >> 4), radius, layer, @@ -197,10 +197,10 @@ impl Game<'_> { if !self.extras.minimap.compose(view) { return; } - let Some(rect) = self.atlas.sprites.get(MINIMAP_SPRITE).copied() else { + let Some(rect) = self.gui.atlas.sprites.get(MINIMAP_SPRITE).copied() else { return; }; - let (w, h) = (self.atlas.width as f32, self.atlas.height as f32); + let (w, h) = (self.gui.atlas.width as f32, self.gui.atlas.height as f32); self.map_patches.push(horizon_client::font::Patch { x: (rect.u0 * w).round() as u32, y: (rect.v0 * h).round() as u32, @@ -246,7 +246,7 @@ impl Game<'_> { let (map_corner, map_size) = (e.minimap_corner, f32::from(e.minimap_size)); let visible = |corner| !(self.debug && corner == Corner::TopLeft); let mut corners = Corners::new(batch.width, batch.height, self.effect_rows_height()); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; if let Some(view) = self.minimap_view() && visible(map_corner) && !self.extras.minimap.image.is_empty() @@ -290,7 +290,7 @@ impl Game<'_> { use_: self.extras.mouse[1], cps, }; - extras_hud::draw_keystrokes(batch, &self.atlas, &mut corners, keys_corner, &k); + extras_hud::draw_keystrokes(batch, &self.gui.atlas, &mut corners, keys_corner, &k); } if mod_panels { self.draw_mod_panels(batch, &mut corners); diff --git a/crates/horizon-client/src/game/falling_damage.rs b/crates/horizon-client/src/game/falling_damage.rs index f10a3b738..8eec28d1d 100644 --- a/crates/horizon-client/src/game/falling_damage.rs +++ b/crates/horizon-client/src/game/falling_damage.rs @@ -6,7 +6,7 @@ use horizon_world::level::LevelEvent; impl Game<'_> { pub(super) fn finish_falling_block(&mut self, mut block: FallingBlock, pos: [i32; 3]) { - let anvil = self.res.facts.get(block.state).name.ends_with("anvil"); + let anvil = self.res.facts().get(block.state).name.ends_with("anvil"); if let Some(impact) = block.damage.impact(block.fall_distance) { if impact.amount > 0.0 { falling_block::hurt_mobs(&mut self.mobs, block.position, impact.amount); @@ -80,7 +80,7 @@ impl Game<'_> { && block.drop_item && self.ui.rules.bool("entity_drops") { - let item = self.res.facts.get(block.state).item.clone(); + let item = self.res.facts().get(block.state).item.clone(); if &*item != "minecraft:air" { self.pop_resource( pos, diff --git a/crates/horizon-client/src/game/fangs.rs b/crates/horizon-client/src/game/fangs.rs index dd2b9bde6..0939f6490 100644 --- a/crates/horizon-client/src/game/fangs.rs +++ b/crates/horizon-client/src/game/fangs.rs @@ -108,6 +108,7 @@ impl Game<'_> { return; }; let Some(r) = self + .gui .atlas .sprites .get("entity/illager/evoker_fangs") diff --git a/crates/horizon-client/src/game/fishing.rs b/crates/horizon-client/src/game/fishing.rs index 8a63f2cfe..94067e7f9 100644 --- a/crates/horizon-client/src/game/fishing.rs +++ b/crates/horizon-client/src/game/fishing.rs @@ -226,14 +226,18 @@ impl Game<'_> { fn biome_name_at(&self, p: Vec3) -> Option { let (x, y, z) = (p.x.floor() as i32, p.y.floor() as i32, p.z.floor() as i32); let c = self.world.chunks.get(&(x >> 4, z >> 4))?; - Some(self.res.biomes.list[c.biome(x, y, z) as usize].name.clone()) + Some( + self.res.biomes().list[c.biome(x, y, z) as usize] + .name + .clone(), + ) } fn water_height(&self, x: i32, y: i32, z: i32) -> Option<(f32, bool)> { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if f.fluid != Fluid::Water { return None; } - let above = self.res.facts.get(self.world.block(x, y + 1, z)); + let above = self.res.facts().get(self.world.block(x, y + 1, z)); let h = if above.fluid == Fluid::Water { 1.0 } else { @@ -243,7 +247,7 @@ impl Game<'_> { } /// getOpenWaterTypeForBlock: 0 above water, 1 inside water, 2 invalid. fn open_water_type(&self, x: i32, y: i32, z: i32) -> u8 { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if self.world.is_air(self.world.block(x, y, z)) || &*f.name == "minecraft:lily_pad" { return 0; } @@ -390,7 +394,7 @@ impl Game<'_> { (fish[1] - 1.0).floor() as i32, fish[2].floor() as i32, ); - &*self.res.facts.get(state).name == "minecraft:water" + &*self.res.facts().get(state).name == "minecraft:water" } /// `ServerLevel.sendParticles` of a simple particle. fn send_particles( @@ -565,6 +569,7 @@ impl Game<'_> { return; }; let Some(r) = self + .gui .atlas .sprites .get("entity/fishing/fishing_hook") diff --git a/crates/horizon-client/src/game/fov.rs b/crates/horizon-client/src/game/fov.rs index 64047b4f7..37796c8c3 100644 --- a/crates/horizon-client/src/game/fov.rs +++ b/crates/horizon-client/src/game/fov.rs @@ -75,7 +75,7 @@ impl Game<'_> { } /// The fluid at the camera, as `Camera.getFluidInCamera` reports it. fn camera_fluid(&self, camera: [f64; 3]) -> CameraFluid { - match fog_type(&self.world, &self.res.facts, camera, self.forward()) { + match fog_type(&self.world, self.res.facts(), camera, self.forward()) { FogType::Water => CameraFluid::Water, FogType::Lava => CameraFluid::Lava, FogType::PowderSnow => CameraFluid::PowderSnow, @@ -177,6 +177,6 @@ impl Game<'_> { } let draws = hud_overlays::spyglass(batch.width as i32, batch.height as i32, self.scope_scale); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } } diff --git a/crates/horizon-client/src/game/frames.rs b/crates/horizon-client/src/game/frames.rs index 2977ad483..857eb40a4 100644 --- a/crates/horizon-client/src/game/frames.rs +++ b/crates/horizon-client/src/game/frames.rs @@ -110,7 +110,7 @@ impl Game<'_> { return false; } let s = f.step(); - let behind = self.res.facts.get(self.world.block( + let behind = self.res.facts().get(self.world.block( f.pos[0] - s[0], f.pos[1] - s[1], f.pos[2] - s[2], @@ -301,7 +301,7 @@ impl Game<'_> { } /// ItemFrameRenderer: the frame model, then the item half size on its face. pub(super) fn frame_geometry(&mut self, camera: glam::DVec3, out: &mut Vec) { - let sprites = &self.atlas.sprites; + let sprites = &self.gui.atlas.sprites; let mut maps: Vec<(i32, glam::Mat4, u32)> = Vec::new(); let mut items: Vec<(ItemStack, u32, glam::Mat4, u8)> = Vec::new(); // ItemFrame.shouldRenderAtSqrDistance: 1024 blocks at 100%. diff --git a/crates/horizon-client/src/game/gamemode_switcher.rs b/crates/horizon-client/src/game/gamemode_switcher.rs index 5f73080f4..db057ad25 100644 --- a/crates/horizon-client/src/game/gamemode_switcher.rs +++ b/crates/horizon-client/src/game/gamemode_switcher.rs @@ -39,7 +39,7 @@ impl Game<'_> { }; switcher.hover(w, h, (self.cursor.0 as i32, self.cursor.1 as i32)); let selected = switcher.selected; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite_region( atlas, "gui/container/gamemode_switcher", @@ -62,14 +62,14 @@ impl Game<'_> { for (index, mode) in MODES.into_iter().enumerate() { let (x, y) = slot_origin(w, h, index); batch.sprite( - &self.atlas, + &self.gui.atlas, "gui/sprites/gamemode_switcher/slot", x as f32, y as f32, ); if mode == selected { batch.sprite( - &self.atlas, + &self.gui.atlas, "gui/sprites/gamemode_switcher/selection", x as f32, y as f32, diff --git a/crates/horizon-client/src/game/golems.rs b/crates/horizon-client/src/game/golems.rs index 2bfeda70d..da204eee6 100644 --- a/crates/horizon-client/src/game/golems.rs +++ b/crates/horizon-client/src/game/golems.rs @@ -8,7 +8,7 @@ use horizon_client::Result; impl Game<'_> { fn golem_block(&self, p: [i32; 3]) -> &str { let state = self.world.block(p[0], p[1], p[2]); - &self.res.facts.get(state).name + &self.res.facts().get(state).name } fn is_golem_head(&self, p: [i32; 3]) -> bool { matches!( @@ -33,7 +33,7 @@ impl Game<'_> { for (ax, az) in [(1, 0), (0, 1)] { let side = |s: i32, row: i32| [head[0] + ax * s, head[1] - row, head[2] + az * s]; let arms = (-1..=1).all(|s| self.golem_block(side(s, 1)) == "minecraft:iron_block"); - let air = |p: [i32; 3]| self.res.facts.is_air(self.world.block(p[0], p[1], p[2])); + let air = |p: [i32; 3]| self.res.facts().is_air(self.world.block(p[0], p[1], p[2])); if arms && self.golem_block(side(0, 2)) == "minecraft:iron_block" && [-1, 1].iter().all(|&s| air(side(s, 0)) && air(side(s, 2))) @@ -58,7 +58,7 @@ impl Game<'_> { let below = [head[0], head[1] - 1, head[2]]; let name = self.golem_block(below); self.res - .items + .items() .block_tags .get("minecraft:copper") .is_some_and(|t| t.contains(name)) @@ -88,7 +88,7 @@ impl Game<'_> { /// `EntityType.create(level, TRIGGERED)` and `snapTo`: a built golem or /// wither has no spawn finalization and draws nothing from the level. pub(super) fn create_triggered(&mut self, kind: &str, at: [f64; 3], yaw: f32) -> Option { - let t = self.res.mob_types.get(kind).cloned()?; + let t = self.res.mob_types().get(kind).cloned()?; self.next_entity += 1; let mut mob = horizon_client::mobs::Mob::new( self.next_entity, @@ -181,9 +181,9 @@ impl Game<'_> { }); if let Some(chest) = chest { self.with_level(|b, level, ticks| b.set_block(level, ticks, pos, chest, 2)); - if let Some(entity) = - horizon_client::containers::BlockEntity::for_block(&self.res.facts.get(chest).name) - { + if let Some(entity) = horizon_client::containers::BlockEntity::for_block( + &self.res.facts().get(chest).name, + ) { self.world .block_entities .insert((below[0], below[1], below[2]), entity); diff --git a/crates/horizon-client/src/game/growth.rs b/crates/horizon-client/src/game/growth.rs index 18591b0fe..a6e062e24 100644 --- a/crates/horizon-client/src/game/growth.rs +++ b/crates/horizon-client/src/game/growth.rs @@ -10,7 +10,7 @@ impl Game<'_> { /// Load the configured/placed feature registry used by saplings, fungi /// and bone meal (once per process; shares the generator's bundle). pub(super) fn install_live_features(&self) { - if self.res.behaviours.live_features().is_some() { + if self.res.behaviours().live_features().is_some() { return; } let dir = self.options.resources.join("worldgen"); @@ -20,7 +20,7 @@ impl Game<'_> { .and_then(|data| LiveFeatures::new(&data).map_err(|e| e.to_string())); match features { Ok(Some(features)) => { - self.res.behaviours.set_live_features(Arc::new(features)); + self.res.behaviours().set_live_features(Arc::new(features)); log::info!("Horizon: live features ready in {:?}", started.elapsed()); } Ok(None) => { diff --git a/crates/horizon-client/src/game/hand.rs b/crates/horizon-client/src/game/hand.rs index 19e66174b..13309af87 100644 --- a/crates/horizon-client/src/game/hand.rs +++ b/crates/horizon-client/src/game/hand.rs @@ -90,7 +90,7 @@ impl Game<'_> { let (pos, first) = (d.pos, (d.ticks as u32 - 1).is_multiple_of(4)); let state = self.world.block(pos[0], pos[1], pos[2]); if first { - let sounds = self.res.facts.get(state).sounds.clone(); + let sounds = self.res.facts().get(state).sounds.clone(); self.audio.play( &sounds.hit, Some(pos.map(|v| f64::from(v) + 0.5)), @@ -117,17 +117,17 @@ impl Game<'_> { /// `BlockBehaviour.getDestroyProgress` with `Player.getDestroySpeed`. pub(super) fn destroy_progress(&self, pos: [i32; 3]) -> f32 { let state = self.world.block(pos[0], pos[1], pos[2]); - let facts = self.res.facts.get(state); + let facts = self.res.facts().get(state); if facts.hardness == -1.0 { return 0.0; } let held = self.held(); - let mut speed = self.res.items.mining_speed(held, &facts.name); + let mut speed = self.res.items().mining_speed(held, &facts.name); speed = self.modify_destroy_speed(speed); if let Some(eye) = self.eye_position() && self .res - .facts + .facts() .get(self.world.block( eye[0].floor() as i32, eye[1].floor() as i32, @@ -141,7 +141,7 @@ impl Game<'_> { if self.player.as_ref().is_some_and(|p| !p.ground.on_ground) { speed /= 5.0; } - let harvest = !facts.requires_tool || self.res.items.correct_for_drops(held, &facts.name); + let harvest = !facts.requires_tool || self.res.items().correct_for_drops(held, &facts.name); speed / facts.hardness / if harvest { 30.0 } else { 100.0 } } /// Whether an attack would hit an entity rather than the block behind @@ -287,7 +287,7 @@ impl Game<'_> { horizon_client::attack_strength::BASE_ATTACK_SPEED + self .held() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .map_or(0.0, |i| f64::from(i.attack_speed)) } /// `evaluateWhichHandsToRender`: which of the main and off hand show. @@ -351,7 +351,7 @@ impl HandWorld for GameHands<'_, '_> { } fn is_air(&mut self, pos: [i32; 3]) -> bool { let state = self.game.world.block(pos[0], pos[1], pos[2]); - self.game.res.facts.get(state).name.ends_with("air") + self.game.res.facts().get(state).name.ends_with("air") } fn creative(&self) -> bool { self.game.creative diff --git a/crates/horizon-client/src/game/initial_spawn.rs b/crates/horizon-client/src/game/initial_spawn.rs index 5fcd90517..3f7a071bb 100644 --- a/crates/horizon-client/src/game/initial_spawn.rs +++ b/crates/horizon-client/src/game/initial_spawn.rs @@ -83,7 +83,7 @@ impl Game<'_> { horizon_client::flatgen::FlatTerrain::from_settings( &s, self.pack.assets.registry, - &self.res.biomes, + self.res.biomes(), ) }) { diff --git a/crates/horizon-client/src/game/integrated.rs b/crates/horizon-client/src/game/integrated.rs index 976d3abfd..e4899e4f0 100644 --- a/crates/horizon-client/src/game/integrated.rs +++ b/crates/horizon-client/src/game/integrated.rs @@ -10,7 +10,7 @@ //! player joins as a network player, and the server side of a network player //! does not do everything single player does yet. use super::{ - Game, Options, PackResources, Resources, + Game, Options, PackResources, Resources, UiResources, lan::{LanSettings, Owner}, }; use horizon_client::{ @@ -201,6 +201,7 @@ impl Game<'_> { options.server = None; options.world = None; options.dev_mods.clear(); + self.join_world_rest()?; let (res, pack, settings) = (self.res.clone(), self.pack.clone(), self.settings.clone()); let flags = Arc::new(Flags::default()); flags @@ -595,7 +596,14 @@ fn serve( ) -> Result<()> { // It draws nothing: only the font, which books and chat measure with. let atlas = HudAtlas::fonts(&options.resources)?; + let gui = UiResources { + atlas, + panorama: Arc::new(horizon_client::gfx::panorama::Faces { + size: 1, + pixels: [0u8; 4].repeat(6), + }), + }; let audio = Audio::silent(&options.resources); - let mut server = Game::new(res, pack, atlas, options, settings, audio)?; + let mut server = Game::new(res, pack, gui, options, settings, audio)?; server.run_integrated(launch, flags, tasks, ready) } diff --git a/crates/horizon-client/src/game/item_draw.rs b/crates/horizon-client/src/game/item_draw.rs index b05f4fbf5..8e7176a70 100644 --- a/crates/horizon-client/src/game/item_draw.rs +++ b/crates/horizon-client/src/game/item_draw.rs @@ -176,7 +176,7 @@ impl Game<'_> { } pub(super) fn item_host(&self) -> Host<'_> { Host { - banners: &self.res.stations.banners, + banners: &self.res.stations().banners, } } /// The client level as item models read it. @@ -255,7 +255,7 @@ impl Game<'_> { item_render::gui::draw( &state, &self.pack.item_renderer, - &self.atlas.sprites, + &self.gui.atlas.sprites, &self.item_host(), batch, x, @@ -279,7 +279,7 @@ impl Game<'_> { }; state.submit( &self.pack.item_renderer, - &self.atlas.sprites, + &self.gui.atlas.sprites, &self.item_host(), pose, &mut sink, @@ -300,7 +300,7 @@ impl Game<'_> { }; state.submit( &self.pack.item_renderer, - &self.atlas.sprites, + &self.gui.atlas.sprites, &self.item_host(), pose, &mut sink, diff --git a/crates/horizon-client/src/game/jukebox.rs b/crates/horizon-client/src/game/jukebox.rs index ba7d2b786..c3ed75ebb 100644 --- a/crates/horizon-client/src/game/jukebox.rs +++ b/crates/horizon-client/src/game/jukebox.rs @@ -51,7 +51,7 @@ impl Game<'_> { pub(super) fn use_jukebox(&mut self, pos: [i32; 3], held: Option<&ItemStack>) -> bool { if &*self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1], pos[2])) .name != "minecraft:jukebox" @@ -65,7 +65,7 @@ impl Game<'_> { let Some(stack) = held else { return false }; let Some(song) = self .res - .items + .items() .get(&stack.item) .and_then(|i| i.jukebox_song.clone()) else { @@ -95,7 +95,7 @@ impl Game<'_> { /// Level event 1010: the song from the jukebox, and the "Now Playing" overlay. fn start_song(&mut self, pos: [i32; 3], song: &str) { self.stop_song(pos); - let Some(s) = self.res.items.songs.get(song).cloned() else { + let Some(s) = self.res.items().songs.get(song).cloned() else { return; }; // LevelRenderer.playJukeboxSong: SimpleSoundInstance.forJukeboxSong. @@ -144,7 +144,7 @@ impl Game<'_> { pub(super) fn tick_jukebox(&mut self, key: (i32, i32, i32)) { let playing = match self.world.block_entities.get(&key) { Some(BlockEntity::Jukebox(j)) if j.playing => j.record.as_ref().and_then(|r| { - let song = self.res.items.get(&r.item)?.jukebox_song.clone()?; + let song = self.res.items().get(&r.item)?.jukebox_song.clone()?; Some((song, j.ticks)) }), _ => None, @@ -153,7 +153,7 @@ impl Game<'_> { return; }; let pos = [key.0, key.1, key.2]; - let Some(s) = self.res.items.songs.get(&song).cloned() else { + let Some(s) = self.res.items().songs.get(&song).cloned() else { return; }; if s.finished(ticks) { diff --git a/crates/horizon-client/src/game/lan.rs b/crates/horizon-client/src/game/lan.rs index d35bf787a..8d411e6c3 100644 --- a/crates/horizon-client/src/game/lan.rs +++ b/crates/horizon-client/src/game/lan.rs @@ -467,7 +467,7 @@ impl Game<'_> { .clone()?; let biome_names: Vec = self .res - .biomes + .biomes() .list .iter() .map(|b| b.name.clone()) @@ -480,7 +480,7 @@ impl Game<'_> { .unwrap_or_default(); let mut encoder = ChunkEncoder::new( self.res - .facts + .facts() .states .iter() .map(|s| (s.name.clone(), s.fluid_level > 0 || s.waterlogged)), @@ -1100,7 +1100,7 @@ impl Game<'_> { /// The guests' models, for the host to see them. fn lan_update_models(&mut self, host: &mut LanHost) { - let Some(kind) = self.res.player_type.clone() else { + let Some(kind) = self.res.player_type().clone() else { return; }; host.models @@ -1171,7 +1171,7 @@ impl Game<'_> { let Some(host) = &self.lan else { return; }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); for m in host.models.values() { let entity_start = out.len(); @@ -1187,7 +1187,7 @@ impl Game<'_> { camera, &lookup, packed, - &self.res.mob_data, + self.res.mob_data(), &self.worn_armor_layers(m), out, ); diff --git a/crates/horizon-client/src/game/lan_actions.rs b/crates/horizon-client/src/game/lan_actions.rs index ced435d8d..ab88366c3 100644 --- a/crates/horizon-client/src/game/lan_actions.rs +++ b/crates/horizon-client/src/game/lan_actions.rs @@ -377,7 +377,7 @@ impl Game<'_> { fn lan_open_container(&mut self, host: &mut LanHost, conn: u32, pos: (i32, i32, i32)) -> bool { let name = &self .res - .facts + .facts() .get(self.world.block(pos.0, pos.1, pos.2)) .name; let (menu, title, slots) = if &**name == "minecraft:ender_chest" { @@ -621,7 +621,7 @@ impl Game<'_> { } } S::ContainerClick(p) => { - let rules = ItemRules(&self.res.items); + let rules = ItemRules(self.res.items()); let drops = host.hub.container_click(conn, &p, &mut self.world, &rules); self.drop_guest_items(host, gi, drops); } @@ -750,7 +750,7 @@ impl Game<'_> { } S::PickItemFromBlock(p) => { let state = self.world.block(p.pos[0], p.pos[1], p.pos[2]); - let item = self.res.facts.get(state).item.clone(); + let item = self.res.facts().get(state).item.clone(); let g = &mut host.hub.guests[gi]; if g.creative() && &*item != "minecraft:air" { let slot = g.selected; @@ -1184,7 +1184,7 @@ impl Game<'_> { g.sleep_timer = super::tick_sleep_timer(g.sleep_timer, g.bed.is_some()); if let Some(head) = g.bed { let block = self.world.block(head[0], head[1], head[2]); - let bed = self.res.facts.get(block).name.ends_with("_bed"); + let bed = self.res.facts().get(block).name.ends_with("_bed"); if g.dead || g.health <= 0.0 || !bed { host.hub.wake(gi); } @@ -1352,7 +1352,7 @@ impl Game<'_> { let range = |v: f64| (v - half).floor() as i32..=(v + half).floor() as i32; range(at[0]).any(|x| { range(at[2]).any(|z| { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); f.full_collision && f.solid_render }) }) @@ -1370,7 +1370,7 @@ impl Game<'_> { play.mining = None; let start = play.dig_start; let state = self.world.block(pos[0], pos[1], pos[2]); - if !dug || self.res.facts.is_air(state) { + if !dug || self.res.facts().is_air(state) { return; } let progress = self @@ -1394,7 +1394,7 @@ impl Game<'_> { }; let ticks = host.hub.ticks; let state = self.world.block(pos[0], pos[1], pos[2]); - let progress = if self.res.facts.is_air(state) { + let progress = if self.res.facts().is_air(state) { None } else { self.as_guest(host, conn, |g| g.destroy_progress(pos)) diff --git a/crates/horizon-client/src/game/lan_crafting.rs b/crates/horizon-client/src/game/lan_crafting.rs index 1f16a9c74..5351c0575 100644 --- a/crates/horizon-client/src/game/lan_crafting.rs +++ b/crates/horizon-client/src/game/lan_crafting.rs @@ -84,10 +84,10 @@ fn place_back(menu: &mut Menu, env: &Env, stacks: Vec) { impl Game<'_> { fn menu_env(&self) -> Env<'_> { Env { - items: &self.res.items, - recipes: &self.res.recipes, - brewing: &self.res.stations.brewing, - banners: &self.res.stations.banners, + items: self.res.items(), + recipes: self.res.recipes(), + brewing: &self.res.stations().brewing, + banners: &self.res.stations().banners, trade: None, } } @@ -218,7 +218,7 @@ impl Game<'_> { f.items[k] = menu.slot(k).cloned(); } // AbstractFurnaceBlockEntity.setItem: only a new input restarts cooking. - f.input_clicked(&self.res.recipes, items[0].clone()); + f.input_clicked(self.res.recipes(), items[0].clone()); } host.play.entry(conn).or_default().crafting.furnace = Some((p.container, menu)); host.hub.inventory_clicked(conn, p, &self.world, &changed); @@ -245,7 +245,7 @@ impl Game<'_> { } let Some(id) = self .res - .stations + .stations() .recipe_index .recipe_of_display(p.recipe) .map(str::to_owned) @@ -256,7 +256,7 @@ impl Game<'_> { if !g.recipe_book.knows(&id) || self .res - .recipes + .recipes() .placement(&id) .is_none_or(|placement| placement.impossible()) { diff --git a/crates/horizon-client/src/game/lan_screen.rs b/crates/horizon-client/src/game/lan_screen.rs index 6be6fc7fa..335b5fbae 100644 --- a/crates/horizon-client/src/game/lan_screen.rs +++ b/crates/horizon-client/src/game/lan_screen.rs @@ -596,11 +596,11 @@ impl Game<'_> { View::Restrictions => self.draw_restrictions(batch), View::GameRules => { if let Some(rules) = o.rules.as_mut() { - rules.draw(batch, &self.atlas, self.cursor); + rules.draw(batch, &self.gui.atlas, self.cursor); } else { ui::menu_background( batch, - &self.atlas, + &self.gui.atlas, 0.0, 0.0, batch.width, @@ -614,7 +614,7 @@ impl Game<'_> { } fn draw_lock_question(&self, o: &WorldOptions, batch: &mut HudBatch) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); // Screen.extractTransparentBackground. batch.fill_gradient( @@ -656,7 +656,7 @@ impl Game<'_> { } fn draw_restrictions(&self, batch: &mut HudBatch) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); let title = Text::translate("restrictions_screen.title", &[]); @@ -687,7 +687,7 @@ impl Game<'_> { } fn draw_options_view(&self, o: &mut WorldOptions, batch: &mut HudBatch, cursor: (f32, f32)) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); o.scroll = o.scroll.clamp(0.0, o.scroll_limit(h)); // extractMenuBackground: the in-world background, the list @@ -810,7 +810,7 @@ impl Game<'_> { match o.view { View::Options => {} View::GameRules => { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let exit = o.rules.as_mut().and_then(|rules| { if rules.clicks_button(atlas, self.cursor, (w, h)) { self.audio.play_button_click(); @@ -824,7 +824,7 @@ impl Game<'_> { return; } View::LockQuestion => { - let p = Popup::lock_question(&self.atlas.font, o.difficulty, (w, h)); + let p = Popup::lock_question(&self.gui.atlas.font, o.difficulty, (w, h)); let hit = p .buttons .iter() @@ -842,7 +842,8 @@ impl Game<'_> { return; } View::Restrictions => { - let r = Restrictions::new(&self.atlas.font, self.settings.chat_visibility, (w, h)); + let r = + Restrictions::new(&self.gui.atlas.font, self.settings.chat_visibility, (w, h)); let in_body = self.cursor.1 >= r.area.0 && self.cursor.1 < r.area.1; let action = r.action.is_some_and(|(ax, ay)| { in_body && ui::hovered(self.cursor, ax, ay, 200.0, 20.0) diff --git a/crates/horizon-client/src/game/lan_trading.rs b/crates/horizon-client/src/game/lan_trading.rs index ee6b55d16..c7f8a94a6 100644 --- a/crates/horizon-client/src/game/lan_trading.rs +++ b/crates/horizon-client/src/game/lan_trading.rs @@ -133,7 +133,7 @@ impl Game<'_> { if let Some(name) = &state.name { return name.clone(); } - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let profession = state.session.profession.trim_start_matches("minecraft:"); if state.session.villager { e.translate(&format!("entity.minecraft.villager.{profession}")) @@ -245,15 +245,15 @@ impl Game<'_> { next_id: std::cell::Cell::new(next_map), }; let trade_env = merchant::TradeEnv { - trades: &self.res.stations.trades, - enchantments: &self.res.stations.enchantments, + trades: &self.res.stations().trades, + enchantments: &self.res.stations().enchantments, maps: Some(&maps), }; let env = Env { - items: &self.res.items, - recipes: &self.res.recipes, - brewing: &self.res.stations.brewing, - banners: &self.res.stations.banners, + items: self.res.items(), + recipes: self.res.recipes(), + brewing: &self.res.stations().brewing, + banners: &self.res.stations().banners, trade: Some(&trade_env), }; let mut menu = Menu::new(Kind::Merchant); diff --git a/crates/horizon-client/src/game/leads.rs b/crates/horizon-client/src/game/leads.rs index 3b8fc29c4..ae5d87fff 100644 --- a/crates/horizon-client/src/game/leads.rs +++ b/crates/horizon-client/src/game/leads.rs @@ -220,11 +220,11 @@ impl Game<'_> { }; let name = self .res - .facts + .facts() .get(self.world.block(hit.pos[0], hit.pos[1], hit.pos[2])); if !self .res - .items + .items() .block_tags .get("minecraft:fences") .is_some_and(|s| s.contains(&*name.name)) @@ -283,7 +283,7 @@ impl Game<'_> { } /// `LeashFeatureRenderer` for every lead and `LeashKnotRenderer` for the knots. pub(super) fn leash_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let white = atlas.font.white(); let uv = [ [white.u0, white.v1], diff --git a/crates/horizon-client/src/game/levels.rs b/crates/horizon-client/src/game/levels.rs index b4ad1c31a..bd2f84efb 100644 --- a/crates/horizon-client/src/game/levels.rs +++ b/crates/horizon-client/src/game/levels.rs @@ -105,7 +105,7 @@ impl Game<'_> { fn open_level(&self, dim: Dim) -> Result { let (streaming, save) = self.make_streaming(&self.world_root.clone(), dim, self.level.seed)?; - let mut world = World::new(self.res.facts.air, self.level.seed); + let mut world = World::new(self.res.facts().air, self.level.seed); world.fast_lava = dim == Dim::Nether; Ok(Parked { world, diff --git a/crates/horizon-client/src/game/lightning.rs b/crates/horizon-client/src/game/lightning.rs index 834925c57..7b480a8e6 100644 --- a/crates/horizon-client/src/game/lightning.rs +++ b/crates/horizon-client/src/game/lightning.rs @@ -50,7 +50,7 @@ impl Game<'_> { let difficulty = f64::from(self.ui.difficulty) * 0.75; let below = &self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1] - 1, pos[2])) .name; let trap = self.ui.rules.bool("spawn_mobs") @@ -160,11 +160,11 @@ impl Game<'_> { } for p in spots { let state = self.world.block(p[0], p[1], p[2]); - if !self.res.facts.is_air(state) { + if !self.res.facts().is_air(state) { continue; } // BaseFireBlock.getState: soul fire on soul soil and sand. - let below = self.res.facts.get(self.world.block(p[0], p[1] - 1, p[2])); + let below = self.res.facts().get(self.world.block(p[0], p[1] - 1, p[2])); let name = if matches!(&*below.name, "minecraft:soul_soil" | "minecraft:soul_sand") { "minecraft:soul_fire" } else { @@ -236,7 +236,7 @@ impl Game<'_> { at[2].floor() as i32, ]; let state = self.world.block(p[0], p[1], p[2]); - if !self.res.facts.get(state).name.ends_with("lightning_rod") { + if !self.res.facts().get(state).name.ends_with("lightning_rod") { return; } let registry = self.pack.assets.registry; @@ -348,7 +348,7 @@ impl Game<'_> { /// `LightningBoltRenderer`: 4 layers of a trunk and two branches, 8 /// segments of 16 blocks, from the bolt's seed. pub(super) fn bolt_geometry(&self, camera: glam::DVec3, out: &mut Vec) { - let white = self.atlas.font.white(); + let white = self.gui.atlas.font.white(); let uv = [white.u0, white.v0]; // ARGB 0.45, 0.45, 0.5 at 0.3 alpha, packed RGBA. let color = (76u32 << 24) | (127 << 16) | (114 << 8) | 114; diff --git a/crates/horizon-client/src/game/loom.rs b/crates/horizon-client/src/game/loom.rs index 541e4e6a9..f1ff1a300 100644 --- a/crates/horizon-client/src/game/loom.rs +++ b/crates/horizon-client/src/game/loom.rs @@ -192,14 +192,14 @@ impl Game<'_> { base: &str, layers: &[BannerLayer], ) { - let banners = &self.res.stations.banners; + let banners = &self.res.stations().banners; let layers: Vec<(String, String)> = layers .iter() .map(|l| (banners.banner_texture(&l.pattern), l.color.to_string())) .collect(); horizon_client::item_render::gui::draw_banner_result( &self.pack.item_renderer, - &self.atlas.sprites, + &self.gui.atlas.sprites, batch, x, y, @@ -217,7 +217,7 @@ impl Game<'_> { draws: &[ScreenDraw], background: bool, ) -> Option> { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let mut tooltip = None; let mut sheet: Option = None; for d in draws { @@ -317,7 +317,7 @@ impl Game<'_> { let l = &s.loom; let dye = s.inputs[1] .as_ref() - .and_then(|d| self.res.items.get(&d.item)) + .and_then(|d| self.res.items().get(&d.item)) .and_then(|i| i.dye.clone()) .unwrap_or_else(|| "white".to_owned()); let result = s @@ -342,7 +342,7 @@ impl Game<'_> { dye: &dye, mouse: local, }; - let draws = screen_layout::loom(&view, &self.res.stations.banners); + let draws = screen_layout::loom(&view, &self.res.stations().banners); self.paint_screen(batch, ox, oy, &draws, false) } } diff --git a/crates/horizon-client/src/game/mace.rs b/crates/horizon-client/src/game/mace.rs index 062d04525..46091a773 100644 --- a/crates/horizon-client/src/game/mace.rs +++ b/crates/horizon-client/src/game/mace.rs @@ -84,11 +84,11 @@ impl Game<'_> { direct_attacker: Some("minecraft:player"), is_direct: true, damage_type: Some("minecraft:mace_smash"), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; // EnchantmentHelper.modifyFallBasedDamage(..., 0) - let per_block = self.res.stations.enchantments.modify_value( + let per_block = self.res.stations().enchantments.modify_value( held.as_ref(), "minecraft:smash_damage_per_fallen_block", &ctx, @@ -111,10 +111,10 @@ impl Game<'_> { horizon_client::mobs::DamageKind::MaceSmash => "minecraft:mace_smash", _ => "minecraft:player_attack", }), - items: Some(&self.res.items), + items: Some(self.res.items()), ..Default::default() }; - let enchantments = &self.res.stations.enchantments; + let enchantments = &self.res.stations().enchantments; let random = &mut self.world.random; // CombatRules.getDamageAfterAbsorb: EnchantmentHelper.modifyArmorEffectiveness. let mut breach = |fraction: f32| { @@ -143,7 +143,7 @@ impl Game<'_> { }; let weapon = self .res - .items + .items() .get(&stack.item) .and_then(|i| i.weapon_damage.map(|d| (d, i.max_damage))); let smash = self.smash_attack(); diff --git a/crates/horizon-client/src/game/machines.rs b/crates/horizon-client/src/game/machines.rs index d46928060..ee2705c23 100644 --- a/crates/horizon-client/src/game/machines.rs +++ b/crates/horizon-client/src/game/machines.rs @@ -361,10 +361,10 @@ impl Game<'_> { fn containers(&self) -> Containers<'_> { Containers { world: &self.world, - behaviours: &self.res.behaviours, - items: &self.res.items, + behaviours: self.res.behaviours(), + items: self.res.items(), registry: self.pack.assets.registry, - brewing: Some(&self.res.stations.brewing), + brewing: Some(&self.res.stations().brewing), bone_meal: bone_meal(), } } @@ -502,7 +502,7 @@ impl Game<'_> { pub(super) fn tick_hopper(&mut self, pos: Pos) { let hopper = self .res - .facts + .facts() .get(self.world.block(pos.0, pos.1, pos.2)) .name .as_ref() @@ -626,12 +626,12 @@ impl Game<'_> { return false; } let above_state = self.world.block(above.0, above.1, above.2); - let blocked = self.res.facts.get(above_state).full_collision + let blocked = self.res.facts().get(above_state).full_collision && !self .res - .behaviours + .behaviours() .tag("minecraft:does_not_block_hoppers") - .is_some_and(|t| t.contains(self.res.behaviours.block(above_state))); + .is_some_and(|t| t.contains(self.res.behaviours().block(above_state))); if blocked { return false; } @@ -678,7 +678,7 @@ impl Game<'_> { /// `DispenserBlock.dispenseFrom` / `DropperBlock.dispenseFrom`. pub(super) fn dispense_from(&mut self, pos: BlockPos, state: BlockStateId) -> Result<()> { let key = (pos.x, pos.y, pos.z); - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); if &*name == "minecraft:crafter" { return self.crafter_dispense(pos, state); } @@ -775,7 +775,7 @@ impl Game<'_> { .then_some(Screen::Hopper); } let state = self.world.block(key.0, key.1, key.2); - match &*self.res.facts.get(state).name { + match &*self.res.facts().get(state).name { "minecraft:hopper" => Some(Screen::Hopper), "minecraft:dispenser" => Some(Screen::Dispenser), "minecraft:dropper" => Some(Screen::Dropper), @@ -832,7 +832,7 @@ impl Game<'_> { let Some(screen) = self.machine_screen() else { return false; }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let key_is_cart = self .container .is_some_and(|k| k.1 == super::minecarts::CART_KEY_Y); diff --git a/crates/horizon-client/src/game/machines/crafter.rs b/crates/horizon-client/src/game/machines/crafter.rs index 5642e5c2a..d87646fe0 100644 --- a/crates/horizon-client/src/game/machines/crafter.rs +++ b/crates/horizon-client/src/game/machines/crafter.rs @@ -94,7 +94,7 @@ impl Game<'_> { // RecipeCache.get: the first crafting recipe that matches, assembled. let found = self .res - .recipes + .recipes() .find(&grid, 3) .map(|(name, result)| (name.to_owned(), result)) .filter(|(_, result)| result.count > 0); @@ -120,7 +120,7 @@ impl Game<'_> { horizon_world::level::flags::UPDATE_CLIENTS, ); // The remainders come from the grid as it was before anything moved. - let remainders = self.res.recipes.remainders(&recipe, &grid, 3); + let remainders = self.res.recipes().remainders(&recipe, &grid, 3); self.crafter_eject(key, facing, result, &recipe); for rest in remainders.into_iter().flatten() { self.crafter_eject(key, facing, rest, &recipe); @@ -202,7 +202,7 @@ impl Game<'_> { pub(in crate::game) fn crafter_result(&self) -> Option { let key = self.container?; let c = self.crafter_at(key)?; - self.res.recipes.craft(&c.items, 3) + self.res.recipes().craft(&c.items, 3) } fn crafter_open(&self) -> bool { matches!(self.container_kind(), Some(BlockEntity::Crafter(_))) @@ -243,7 +243,7 @@ impl Game<'_> { // The background goes first, then the labels, then the slot decorations. let (background, rest) = draws.split_at(2.min(draws.len())); self.paint_screen(batch, ox, oy, background, true); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let grey = rgba(64, 64, 64, 255); let title = self.container_title(self.translate("container.crafter", "Crafter")); let tw = HudBatch::text_width(atlas, &title); diff --git a/crates/horizon-client/src/game/maps.rs b/crates/horizon-client/src/game/maps.rs index 2d7639260..855ef941a 100644 --- a/crates/horizon-client/src/game/maps.rs +++ b/crates/horizon-client/src/game/maps.rs @@ -673,17 +673,18 @@ impl Game<'_> { } else { loop { y -= 1; - color = self.res.facts.get(self.world.block(x, y, z)).map_color; + color = + self.res.facts().get(self.world.block(x, y, z)).map_color; if color != 0 || y <= min_y { break; } } - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if y > min_y && f.fluid != Fluid::None { let mut solid = y - 1; loop { let below = - self.res.facts.get(self.world.block(x, solid, z)); + self.res.facts().get(self.world.block(x, solid, z)); solid -= 1; water_depth += 1; if solid <= min_y || below.fluid == Fluid::None { @@ -789,6 +790,7 @@ impl Game<'_> { } let slot = self.maps.slots.last()?.1; let rect = self + .gui .atlas .sprites .get(&format!("horizon/map{slot}")) @@ -797,7 +799,7 @@ impl Game<'_> { if m.texture_dirty { m.texture_dirty = false; let rgba: Vec = m.colors.iter().flat_map(|&c| packed_rgba(c)).collect(); - let (w, h) = (self.atlas.width as f32, self.atlas.height as f32); + let (w, h) = (self.gui.atlas.width as f32, self.gui.atlas.height as f32); self.map_patches.push(horizon_client::font::Patch { x: (rect.u0 * w).round() as u32, y: (rect.v0 * h).round() as u32, @@ -855,7 +857,7 @@ impl Game<'_> { .map(|m| m.decorations.clone()) .unwrap_or_default(); for (i, d) in decorations.iter().enumerate() { - let Some(s) = self.atlas.sprites.get(d.sprite).copied() else { + let Some(s) = self.gui.atlas.sprites.get(d.sprite).copied() else { continue; }; let dm = glam::Mat4::from_translation(glam::Vec3::new( @@ -931,7 +933,7 @@ impl Game<'_> { } else { "map/map_background" }; - if let Some(r) = self.atlas.sprites.get(background).copied() { + if let Some(r) = self.gui.atlas.sprites.get(background).copied() { for (c, uv) in [ ([-7.0, 135.0, 0.0], [r.u0, r.v1]), ([135.0, 135.0, 0.0], [r.u1, r.v1]), diff --git a/crates/horizon-client/src/game/minecarts.rs b/crates/horizon-client/src/game/minecarts.rs index 1e0b42b50..367dc6aaf 100644 --- a/crates/horizon-client/src/game/minecarts.rs +++ b/crates/horizon-client/src/game/minecarts.rs @@ -218,7 +218,7 @@ impl CartModels { impl Game<'_> { pub(super) fn rail(&self, x: i32, y: i32, z: i32) -> Option { let state = self.world.block(x, y, z); - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); if !matches!( &*name, "minecraft:rail" @@ -247,11 +247,14 @@ impl Game<'_> { } } fn conductor(&self, x: i32, y: i32, z: i32) -> bool { - self.res.facts.get(self.world.block(x, y, z)).full_collision + self.res + .facts() + .get(self.world.block(x, y, z)) + .full_collision } fn cart_in_water(&self, c: &Minecart) -> bool { let p = c.position; - let f = self.res.facts.get(self.world.block( + let f = self.res.facts().get(self.world.block( p.x.floor() as i32, (p.y + 0.1).floor() as i32, p.z.floor() as i32, @@ -661,7 +664,7 @@ impl Game<'_> { stack.count = 0; } Some(s) if s.same_item_same_components(&stack) => { - let max = self.res.items.get(&s.item).map_or(64, |i| i.max_stack); + let max = self.res.items().get(&s.item).map_or(64, |i| i.max_stack); let moved = stack.count.min(max.saturating_sub(s.count)); s.count += moved; stack.count -= moved; @@ -889,9 +892,9 @@ impl Game<'_> { (-1, 1), ] { let (x, y, z) = (bx + dx, by + dy, bz + dz); - let below = self.res.facts.get(self.world.block(x, y - 1, z)); - let here = self.res.facts.get(self.world.block(x, y, z)); - let head = self.res.facts.get(self.world.block(x, y + 1, z)); + let below = self.res.facts().get(self.world.block(x, y - 1, z)); + let here = self.res.facts().get(self.world.block(x, y, z)); + let head = self.res.facts().get(self.world.block(x, y + 1, z)); if (below.full_collision || below.legacy_solid) && !here.full_collision && !head.full_collision @@ -1156,7 +1159,7 @@ impl Game<'_> { diffuse: bool, out: &mut Vec, ) { - let Ok(models) = self.pack.assets.model_catalog.collect_seeded(state, seed) else { + let Ok(models) = self.pack.render.model_catalog.collect_seeded(state, seed) else { return; }; for (_, model) in &models { @@ -1165,7 +1168,7 @@ impl Game<'_> { .pack .layer_names .get(&face.layer) - .and_then(|n| self.atlas.sprites.get(n)) + .and_then(|n| self.gui.atlas.sprites.get(n)) else { continue; }; @@ -1239,6 +1242,7 @@ impl Game<'_> { pub(super) fn cart_geometry(&self, camera: glam::DVec3, alpha: f64, out: &mut Vec) { let a = alpha as f32; let Some(uv) = self + .gui .atlas .sprites .get("entity/minecart/minecart") @@ -1382,15 +1386,15 @@ impl Game<'_> { game_time: self.world.game_time, max_y: self.dim.max_y(), world: &self.world, - sprites: &self.atlas.sprites, + sprites: &self.gui.atlas.sprites, nether: self.dim == super::Dim::Nether, lid: &lid, sign: &|_| None, banner: &|_| Vec::new(), - glyph: &|c| self.atlas.glyph_cell(c), + glyph: &|c| self.gui.atlas.glyph_cell(c), }; self.res - .block_entity_render + .block_entity_render() .render_state(&scene, state.0, m, light, out); } } diff --git a/crates/horizon-client/src/game/mob_blocks.rs b/crates/horizon-client/src/game/mob_blocks.rs index 8b2b2da40..27a60ca19 100644 --- a/crates/horizon-client/src/game/mob_blocks.rs +++ b/crates/horizon-client/src/game/mob_blocks.rs @@ -75,10 +75,10 @@ impl Game<'_> { if left <= 0 { return; } - let Some(kind) = self.res.mob_types.get("minecraft:elder_guardian") else { + let Some(kind) = self.res.mob_types().get("minecraft:elder_guardian") else { return; }; - let Some(r) = self.atlas.sprites.get("entity/guardian_elder").copied() else { + let Some(r) = self.gui.atlas.sprites.get("entity/guardian_elder").copied() else { return; }; let age = (APPARITION_TICKS - left) as f32 + alpha as f32; @@ -142,12 +142,12 @@ impl Game<'_> { return; }; let Some(head) = - render::part_transform(mob, alpha as f32, camera, &self.res.mob_data, "head") + render::part_transform(mob, alpha as f32, camera, self.res.mob_data(), "head") else { return; }; let m = banner_matrix(head); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let uv = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); // BannerRenderer: the flag sways with a per-banner phase. let phase = @@ -187,7 +187,7 @@ impl Game<'_> { ) { for (corners, shade, side) in FACES { let name = cube.sprites[usize::from(side)]; - let Some(r) = self.atlas.sprites.get(name).copied() else { + let Some(r) = self.gui.atlas.sprites.get(name).copied() else { continue; }; let tint = if side == 0 { cube.tint } else { 0xFF_FFFF }; @@ -261,7 +261,7 @@ impl Game<'_> { let Some(item) = item else { continue }; let left = off_hand != mob.extra.main_hand_left; let Some(t) = - render::held_item_transform(mob, alpha as f32, camera, &self.res.mob_data, left) + render::held_item_transform(mob, alpha as f32, camera, self.res.mob_data(), left) else { continue; }; diff --git a/crates/horizon-client/src/game/mob_gear.rs b/crates/horizon-client/src/game/mob_gear.rs index c4a77e38c..809b250dc 100644 --- a/crates/horizon-client/src/game/mob_gear.rs +++ b/crates/horizon-client/src/game/mob_gear.rs @@ -91,9 +91,9 @@ impl Game<'_> { let cost = random .next_int_between_inclusive(MIN_COST, top) .unwrap_or(MIN_COST); - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let pool = e.tag("minecraft:on_mob_spawn_equipment"); - let picked = e.select(&self.res.items, random, item, cost, pool); + let picked = e.select(self.res.items(), random, item, cost, pool); if let Some(m) = self.mobs.iter_mut().find(|m| m.id == id) { for (enchantment, level) in picked { gear::upgrade(m, slot, &enchantment, level); diff --git a/crates/horizon-client/src/game/mods.rs b/crates/horizon-client/src/game/mods.rs index 5a1131c3b..b6abf38ef 100644 --- a/crates/horizon-client/src/game/mods.rs +++ b/crates/horizon-client/src/game/mods.rs @@ -284,7 +284,7 @@ impl Game<'_> { let focused = self.screen == Screen::Chat; self.ui .chat - .add(&self.atlas, line, None, self.ticks, focused); + .add(&self.gui.atlas, line, None, self.ticks, focused); } } /// The mods' HUD panels, stacked with the extras in their corners. @@ -305,7 +305,7 @@ impl Game<'_> { .iter() .map(|l| (l.text.as_str(), l.color)) .collect(); - extras_hud::draw_lines(batch, &self.atlas, corners, corner, &lines); + extras_hud::draw_lines(batch, &self.gui.atlas, corners, corner, &lines); } } } diff --git a/crates/horizon-client/src/game/mount_menu.rs b/crates/horizon-client/src/game/mount_menu.rs index 55e9dde11..1db2210d3 100644 --- a/crates/horizon-client/src/game/mount_menu.rs +++ b/crates/horizon-client/src/game/mount_menu.rs @@ -283,7 +283,7 @@ impl Game<'_> { let Some(open) = self.mount_menu.open.as_ref() else { return; }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.sprite_region( atlas, "gui/container/horse", @@ -376,7 +376,7 @@ impl Game<'_> { m.hurt_time = 0; m.death_time = 0; let camera = glam::DVec3::new(m.position.x, m.position.y, m.position.z); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); let mut verts = Vec::new(); horizon_client::mobs::render::render_with( @@ -385,7 +385,7 @@ impl Game<'_> { camera, &lookup, 240 | 240 << 8, - &self.res.mob_data, + self.res.mob_data(), &[], &mut verts, ); diff --git a/crates/horizon-client/src/game/mounts.rs b/crates/horizon-client/src/game/mounts.rs index 869364176..42eac1e9b 100644 --- a/crates/horizon-client/src/game/mounts.rs +++ b/crates/horizon-client/src/game/mounts.rs @@ -90,7 +90,11 @@ impl Game<'_> { && let Some(stack) = self.inventory[self.selected].as_mut() { stack.damage += wear; - let max = self.res.items.get(&stack.item).map_or(25, |i| i.max_damage); + let max = self + .res + .items() + .get(&stack.item) + .map_or(25, |i| i.max_damage); if stack.damage >= max { self.inventory[self.selected] = Some(ItemStack::new("minecraft:fishing_rod", 1)); } @@ -406,7 +410,7 @@ impl Game<'_> { .find(|c| { let f = |dy: i32| { self.res - .facts + .facts() .get(self.world.block( c.x.floor() as i32, c.y.floor() as i32 + dy, @@ -457,7 +461,7 @@ impl Game<'_> { return (0, false); }; let m = &self.mobs[i]; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let hearts = horizon_client::hud_layout::vehicle_max_hearts(m.attrs.max_health); let draws = horizon_client::hud_layout::vehicle_health(w, h, hearts, m.health); horizon_client::hud_layout::paint(batch, atlas, &draws); diff --git a/crates/horizon-client/src/game/music.rs b/crates/horizon-client/src/game/music.rs index 381af21cf..9198a78a1 100644 --- a/crates/horizon-client/src/game/music.rs +++ b/crates/horizon-client/src/game/music.rs @@ -50,7 +50,7 @@ impl Game<'_> { let (background, probe_volume) = match eye { Some(eye) => { let (dimension, biome) = (self.dim.id(), self.biome_at(eye)); - let tables = &self.res.music; + let tables = self.res.music(); ( tables.background(dimension, biome), tables.volume(dimension, biome), @@ -81,7 +81,7 @@ impl Game<'_> { .chunks .get(&(x >> 4, z >> 4)) .map_or("minecraft:plains", |c| { - self.res.biomes.list[c.biome(x, y, z) as usize] + self.res.biomes().list[c.biome(x, y, z) as usize] .name .as_str() }) @@ -89,11 +89,11 @@ impl Game<'_> { /// `isEyeInFluid(WATER)`: the eye inside the water of its block column. fn eye_in_water(&self, x: f64, eye_y: f64, z: f64) -> bool { let (bx, by, bz) = (x.floor() as i32, eye_y.floor() as i32, z.floor() as i32); - let f = self.res.facts.get(self.world.block(bx, by, bz)); + let f = self.res.facts().get(self.world.block(bx, by, bz)); if f.fluid != Fluid::Water { return false; } - let above = self.res.facts.get(self.world.block(bx, by + 1, bz)); + let above = self.res.facts().get(self.world.block(bx, by + 1, bz)); let height = if above.fluid == Fluid::Water { 1.0 } else { @@ -111,7 +111,7 @@ impl Game<'_> { }; let feet = [p.position.x, p.position.y, p.position.z]; let eye_y = feet[1] + f64::from(p.dimensions.eye_height); - let sounds = self.res.ambient.get(self.dim.id(), self.biome_at(feet)); + let sounds = self.res.ambient().get(self.dim.id(), self.biome_at(feet)); let underwater = self.eye_in_water(feet[0], eye_y, feet[2]); let world = &self.world; let light = |b: [i32; 3]| { @@ -123,7 +123,7 @@ impl Game<'_> { f64::from(p.dimensions.height), ); let registry = &self.pack.assets.registry; - let facts = &self.res.facts; + let facts = self.res.facts(); let bubble_column = horizon_client::ambience::bubble_column_in( [ feet[0] - half, diff --git a/crates/horizon-client/src/game/names.rs b/crates/horizon-client/src/game/names.rs index 368c5c0f2..707b9df96 100644 --- a/crates/horizon-client/src/game/names.rs +++ b/crates/horizon-client/src/game/names.rs @@ -218,7 +218,7 @@ impl Game<'_> { let forward = glam::DVec3::from_array(view_vector(self.yaw, self.pitch)); let right = forward.cross(glam::DVec3::Y).normalize_or_zero(); let up = right.cross(forward).normalize_or_zero(); - let white = self.atlas.font.white(); + let white = self.gui.atlas.font.white(); let away = forward.as_vec3() * 0.002; for (text, lift) in lines { let o = (o + glam::DVec3::new(0.0, *lift, 0.0)).as_vec3(); @@ -240,7 +240,7 @@ impl Game<'_> { .collect(); let width: f32 = chars .iter() - .map(|(c, _)| self.atlas.glyph(*c).map_or(6.0, |g| g.1)) + .map(|(c, _)| self.gui.atlas.glyph(*c).map_or(6.0, |g| g.1)) .sum(); let x0 = -(width / 2.0).trunc(); let y0 = if text.plain() == "deadmau5" { @@ -278,7 +278,7 @@ impl Game<'_> { } let mut x = x0; for (ch, color) in chars { - let Some((g, advance)) = self.atlas.glyph(ch) else { + let Some((g, advance)) = self.gui.atlas.glyph(ch) else { x += 6.0; continue; }; diff --git a/crates/horizon-client/src/game/natural_spawning.rs b/crates/horizon-client/src/game/natural_spawning.rs index 846120eac..059437d7b 100644 --- a/crates/horizon-client/src/game/natural_spawning.rs +++ b/crates/horizon-client/src/game/natural_spawning.rs @@ -35,7 +35,7 @@ pub(super) struct GameLevel<'g, 'a> { impl GameLevel<'_, '_> { fn biome(&self, x: i32, y: i32, z: i32) -> Option<&BiomeInfo> { let chunk = self.game.world.chunks.get(&(x >> 4, z >> 4))?; - Some(self.game.res.biomes.get(chunk.biome(x, y, z))) + Some(self.game.res.biomes().get(chunk.biome(x, y, z))) } } impl SpawnLevel for GameLevel<'_, '_> { @@ -106,7 +106,7 @@ impl NaturalLevel for GameLevel<'_, '_> { self.game.dim == Dim::Nether } fn mob_type(&self, entity: &str) -> Option<(Species, f32, f32, Category)> { - let t = self.game.res.mob_types.get(entity)?; + let t = self.game.res.mob_types().get(entity)?; Some(( t.species, t.width as f32, @@ -238,7 +238,7 @@ impl horizon_client::mobs::spawner::SpawnerLevel for GameLevel<'_, '_> { self.game.ui.rules.bool("spawner_blocks_work") } fn entity_exists(&self, id: &str) -> bool { - self.game.res.mob_types.contains_key(id) || self.game.entity_type_exists(id) + self.game.res.mob_types().contains_key(id) || self.game.entity_type_exists(id) } fn count_entities(&self, id: &str, bounds: Aabb) -> usize { let mobs = self @@ -268,7 +268,7 @@ impl<'a> Game<'a> { /// Creates a mob the spawner accepted, finalized the game's way; the /// caller adds it with [`Game::add_spawned`]. fn finalize_spawned(&self, r: &SpawnRequest, pending: &mut Vec) -> Option { - let kind = self.res.mob_types.get(r.entity)?.clone(); + let kind = self.res.mob_types().get(r.entity)?.clone(); let [x, y, z] = r.position; let mut mob = Mob::new(0, kind, Vec3::new(x, y, z), r.yaw); let facts = self.biome_facts(x.floor() as i32, y.floor() as i32, z.floor() as i32); diff --git a/crates/horizon-client/src/game/nautili.rs b/crates/horizon-client/src/game/nautili.rs index c039b7d9a..e7f16ca18 100644 --- a/crates/horizon-client/src/game/nautili.rs +++ b/crates/horizon-client/src/game/nautili.rs @@ -11,7 +11,7 @@ use horizon_core::random::RandomSource; impl Game<'_> { fn item_tagged(&self, tag: &str, item: &str) -> bool { self.res - .items + .items() .item_tags .get(tag) .is_some_and(|t| t.contains(item)) @@ -43,7 +43,7 @@ impl Game<'_> { } let taming: Vec = self .res - .items + .items() .item_tags .get("minecraft:nautilus_taming_items") .map(|t| t.iter().cloned().collect()) diff --git a/crates/horizon-client/src/game/nether_portal.rs b/crates/horizon-client/src/game/nether_portal.rs index abfff5b53..94df10ec4 100644 --- a/crates/horizon-client/src/game/nether_portal.rs +++ b/crates/horizon-client/src/game/nether_portal.rs @@ -114,7 +114,7 @@ impl Game<'_> { Dim::Nether }; let state = self.world.block(entry.x, entry.y, entry.z); - let b = &self.res.behaviours; + let b = self.res.behaviours(); let (entry_x_axis, offset) = match b.portal_axis(state) { Some(x_axis) => { let area = largest_rectangle_around( @@ -152,7 +152,7 @@ impl Game<'_> { /// (the points of interest `PortalForcer` searches): loaded chunks as /// they are, the others as saved; chunks never generated have none. fn portal_blocks(&self, center: BlockPos, radius: i32) -> Vec { - let b = &self.res.behaviours; + let b = self.res.behaviours(); let chunk_radius = radius.div_euclid(16) + 1; let (cx, cz) = (center.x >> 4, center.z >> 4); let mut out = Vec::new(); @@ -163,7 +163,7 @@ impl Game<'_> { Some(c) => &**c, None => match self .save - .load(x, z, self.pack.assets.registry, &self.res.biomes) + .load(x, z, self.pack.assets.registry, self.res.biomes()) { Some(c) => { saved = c; @@ -213,7 +213,7 @@ impl Game<'_> { ); if let Some(found) = found { let state = self.world.block(found.x, found.y, found.z); - let x_axis = self.res.behaviours.portal_axis(state).unwrap_or(true); + let x_axis = self.res.behaviours().portal_axis(state).unwrap_or(true); return Some(largest_rectangle_around( found, if x_axis { Axis::X } else { Axis::Z }, @@ -234,7 +234,7 @@ impl Game<'_> { /// `NetherPortalBlock.createDimensionTransition`: the arrival position /// and the yaw turned by. pub(super) fn arrival(&self, plan: &Plan, exit: FoundRectangle) -> (Vec3, f32) { - let b = &self.res.behaviours; + let b = self.res.behaviours(); let corner = exit.min_corner; let exit_x_axis = b .portal_axis(self.world.block(corner.x, corner.y, corner.z)) @@ -540,7 +540,7 @@ impl Game<'_> { |p, _| { if self .res - .behaviours + .behaviours() .portal_axis(self.world.block(p.x, p.y, p.z)) .is_some() { @@ -584,7 +584,7 @@ impl Game<'_> { for sy in y0..=y1 { y_mask |= 1 << sy; } - let behaviours = &self.res.behaviours; + let behaviours = self.res.behaviours(); let chunks = &self.world.chunks; (x0..=x1).any(|cx| { (z0..=z1).any(|cz| { diff --git a/crates/horizon-client/src/game/options.rs b/crates/horizon-client/src/game/options.rs index d625f938b..12efde5be 100644 --- a/crates/horizon-client/src/game/options.rs +++ b/crates/horizon-client/src/game/options.rs @@ -111,7 +111,7 @@ impl Game<'_> { } pub(super) fn draw_options(&mut self, batch: &mut HudBatch) { let mut ui = std::mem::take(&mut self.ui.options); - ui.draw(&self.settings, batch, &self.atlas, self.cursor); + ui.draw(&self.settings, batch, &self.gui.atlas, self.cursor); self.ui.options = ui; } pub(super) fn options_mouse(&mut self, pressed: bool, right: bool) -> Result<()> { @@ -133,7 +133,7 @@ impl Game<'_> { let mut ui = std::mem::take(&mut self.ui.options); let events = ui.click( &mut self.settings, - &self.atlas, + &self.gui.atlas, self.cursor.0, self.cursor.1, size, @@ -152,7 +152,7 @@ impl Game<'_> { let mut ui = std::mem::take(&mut self.ui.options); let events = ui.click( &mut self.settings, - &self.atlas, + &self.gui.atlas, self.cursor.0, self.cursor.1, size, @@ -165,7 +165,7 @@ impl Game<'_> { } pub(super) fn options_key(&mut self, key: KeyCode, text: Option<&str>) -> Result<()> { let mut ui = std::mem::take(&mut self.ui.options); - let events = ui.key(&mut self.settings, &self.atlas, key, text); + let events = ui.key(&mut self.settings, &self.gui.atlas, key, text); self.ui.options = ui; self.handle_option_events(events) } @@ -176,7 +176,7 @@ impl Game<'_> { ) -> bool { self.ui .options - .shortcut(&self.atlas, shortcut, &mut self.clipboard) + .shortcut(&self.gui.atlas, shortcut, &mut self.clipboard) } pub(super) fn options_scroll(&mut self, amount: f32) { let size = self.gui_size(); @@ -238,7 +238,7 @@ impl Game<'_> { pub(super) fn load_language(&mut self, code: &str) { let root = self.options.resources.clone(); lang::set(lang::Language::load(&[&root], code)); - self.ui.chat.rescale(&self.atlas); + self.ui.chat.rescale(&self.gui.atlas); } /// Settings that Horizon applies beyond render distance, volume and GUI scale. pub(super) fn apply_ui_settings(&mut self) { @@ -269,14 +269,14 @@ impl Game<'_> { }; self.ui.chat.options = chat; if rescale { - self.ui.chat.rescale(&self.atlas); + self.ui.chat.rescale(&self.gui.atlas); } - let font = &mut self.atlas.font; + let font = &mut self.gui.atlas.font; if font.uniform != s.force_unicode || font.japanese != s.japanese_glyphs { font.uniform = s.force_unicode; font.japanese = s.japanese_glyphs; font.reset_cache(); - self.ui.chat.rescale(&self.atlas); + self.ui.chat.rescale(&self.gui.atlas); } // A new renderer (resource reload, first window) takes the loaded pack. let stale = self diff --git a/crates/horizon-client/src/game/packs.rs b/crates/horizon-client/src/game/packs.rs index febafc932..0f5a48312 100644 --- a/crates/horizon-client/src/game/packs.rs +++ b/crates/horizon-client/src/game/packs.rs @@ -74,6 +74,15 @@ fn vanilla_info() -> PackInfo { fixed: false, } } +/// Shared by the startup menu, which has no world resources yet. +pub(super) fn pack_infos(vanilla: &Path) -> Vec { + let mut infos: Vec = packs::discover(vanilla, &packs_dir()) + .iter() + .map(info) + .collect(); + infos.push(vanilla_info()); + infos +} impl Game<'_> { fn vanilla_root(&self) -> PathBuf { if self.ui.vanilla_root.as_os_str().is_empty() { @@ -85,9 +94,7 @@ impl Game<'_> { /// The packs the pack screen offers and the current selection /// (`PackSelectionScreen` makes its `PackSelectionModel` from them). pub(super) fn refresh_pack_lists(&mut self) { - let all = packs::discover(&self.vanilla_root(), &packs_dir()); - let mut infos: Vec = all.iter().map(info).collect(); - infos.push(vanilla_info()); + let infos = pack_infos(&self.vanilla_root()); let o = &mut self.ui.options; o.pack_infos = infos; o.pack_selection = self.settings.resource_packs.clone(); @@ -100,6 +107,12 @@ impl Game<'_> { /// particle and font textures), item models, sounds, languages, GUI /// metadata and the cloud and world border textures. pub(super) fn reload_packs(&mut self) { + // Pack reload updates tail-owned mob metadata. Keep menus responsive + // until those resources exist, then apply the latest selection once. + if self.rest_loader.is_some() { + self.pending_pack_reload = true; + return; + } let vanilla = self.vanilla_root(); if self.ui.vanilla_root.as_os_str().is_empty() { self.ui.vanilla_root = vanilla.clone(); @@ -119,14 +132,19 @@ impl Game<'_> { } } fn reload_resources(&mut self, root: &Path) -> horizon_client::Result<()> { - let assets = std::sync::Arc::new(self.pack.assets.reload(root)?); + let render = std::sync::Arc::new(self.pack.assets.reload(root)?); let mut atlas = HudAtlas::build(root)?; atlas.font.uniform = self.settings.force_unicode; atlas.font.japanese = self.settings.japanese_glyphs; + let gui = super::UiResources { + atlas, + panorama: std::sync::Arc::new(horizon_client::gfx::panorama::Faces::load(root)), + }; let pack = super::PackResources::load( root, - assets, - &self.res.facts, + self.pack.assets.clone(), + render, + self.res.facts(), self.pack.context.biomes.clone(), self.pack.context.light.clone(), )?; @@ -137,7 +155,7 @@ impl Game<'_> { let renderer = match self .window .clone() - .map(|window| self.renderer_for(window, &pack, &atlas)) + .map(|window| self.renderer_for(window, &pack, &gui)) .transpose() { Ok(renderer) => renderer, @@ -158,12 +176,12 @@ impl Game<'_> { self.options.resources = root.to_path_buf(); let context = pack.context.clone(); self.pack = pack; - self.atlas = atlas; + self.gui = gui; horizon_client::ui_theme::reset_atlas(); // Villager hats come from the pack's texture metadata (shared data, swapped in place). *self .res - .mob_data + .mob_data() .villager_hats .write() .unwrap_or_else(std::sync::PoisonError::into_inner) = @@ -179,7 +197,7 @@ impl Game<'_> { self.renderer = Some(renderer); self.apply_ui_settings(); } - self.ui.chat.rescale(&self.atlas); + self.ui.chat.rescale(&self.gui.atlas); Ok(()) } } diff --git a/crates/horizon-client/src/game/pad.rs b/crates/horizon-client/src/game/pad.rs index 0c988c3b7..216b547b0 100644 --- a/crates/horizon-client/src/game/pad.rs +++ b/crates/horizon-client/src/game/pad.rs @@ -477,7 +477,7 @@ impl Game<'_> { let attacking = match &self.mining { Some(m) if !self.creative => { let state = self.world.block(m.pos[0], m.pos[1], m.pos[2]); - TriggerFeel::Texture(self.res.facts.get(state).hardness) + TriggerFeel::Texture(self.res.facts().get(state).hardness) } _ => TriggerFeel::Free, }; diff --git a/crates/horizon-client/src/game/pad_menu.rs b/crates/horizon-client/src/game/pad_menu.rs index 5c623202b..257586572 100644 --- a/crates/horizon-client/src/game/pad_menu.rs +++ b/crates/horizon-client/src/game/pad_menu.rs @@ -939,7 +939,7 @@ impl Game<'_> { } else if self.screen == Screen::Options { let result = match text { Some(t) => { - self.ui.options.type_text(&self.atlas, t); + self.ui.options.type_text(&self.gui.atlas, t); Ok(()) } None => self.options_key(key.expect("a key"), None), @@ -983,7 +983,7 @@ impl Game<'_> { .focus .is_some_and(|f| f.center().1 > batch.height / 2.0) || self.screen == Screen::Chat; - let mut ui = horizon_client::ui_theme::Ui::new(&self.atlas, batch, self.cursor); + let mut ui = horizon_client::ui_theme::Ui::new(&self.gui.atlas, batch, self.cursor); keyboard.draw(&mut ui, at_top, self.ui.options.pad_style); ui.finish(); return; @@ -998,7 +998,7 @@ impl Game<'_> { return; } // An arrow, outlined, pointing up-left at (x, y). - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (x, y) = (x.floor(), y.floor()); const ROWS: [u8; 10] = [1, 2, 3, 4, 5, 6, 7, 4, 2, 1]; for (i, &w) in ROWS.iter().enumerate() { @@ -1043,7 +1043,7 @@ impl Game<'_> { }; if horizon { use horizon_client::ui_theme::{self as theme, Ui, color}; - let mut ui = Ui::new(&self.atlas, batch, self.cursor); + let mut ui = Ui::new(&self.gui.atlas, batch, self.cursor); let k = ui.batch.scale / ui.density; let (x, y, w, h) = (x * k, y * k, w * k, h * k); let radius = match focus.kind { @@ -1066,7 +1066,7 @@ impl Game<'_> { return; } if matches!(focus.kind, Kind::Row | Kind::Field) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let white = rgba(255, 255, 255, 255); batch.fill(atlas, x, y, w, 1.0, white); batch.fill(atlas, x, y + h - 1.0, w, 1.0, white); diff --git a/crates/horizon-client/src/game/paintings.rs b/crates/horizon-client/src/game/paintings.rs index c65dbbb89..bd2884575 100644 --- a/crates/horizon-client/src/game/paintings.rs +++ b/crates/horizon-client/src/game/paintings.rs @@ -94,7 +94,7 @@ impl Game<'_> { for x in slo[0].floor() as i32..=shi[0].floor() as i32 { for y in slo[1].floor() as i32..=shi[1].floor() as i32 { for z in slo[2].floor() as i32..=shi[2].floor() as i32 { - let f = self.res.facts.get(self.world.block(x, y, z)); + let f = self.res.facts().get(self.world.block(x, y, z)); if !(f.legacy_solid || f.has_class("DiodeBlock")) { return false; } @@ -249,7 +249,7 @@ impl Game<'_> { /// PaintingRenderer: the variant on the front, the back texture behind and /// on the edges. pub(super) fn painting_geometry(&self, camera: glam::DVec3, out: &mut Vec) { - let sprites = &self.atlas.sprites; + let sprites = &self.gui.atlas.sprites; let Some(back) = sprites.get("painting/back").copied() else { return; }; diff --git a/crates/horizon-client/src/game/passengers.rs b/crates/horizon-client/src/game/passengers.rs index 27d8a4af6..4e6ba339d 100644 --- a/crates/horizon-client/src/game/passengers.rs +++ b/crates/horizon-client/src/game/passengers.rs @@ -186,9 +186,9 @@ impl Game<'_> { at[2].floor() as i32, ); let frequent = self.world.chunks.get(&(x >> 4, z >> 4)).is_some_and(|c| { - let b = self.res.biomes.get(c.biome(x, y, z)); + let b = self.res.biomes().get(c.biome(x, y, z)); self.res - .mob_data + .mob_data() .biome_has("minecraft:more_frequent_drowned_spawns", &b.name) }); if frequent { diff --git a/crates/horizon-client/src/game/persist.rs b/crates/horizon-client/src/game/persist.rs index 53651dc6c..2574f45d7 100644 --- a/crates/horizon-client/src/game/persist.rs +++ b/crates/horizon-client/src/game/persist.rs @@ -215,7 +215,7 @@ impl Game<'_> { fall_distance, damage: horizon_client::falling_block::Damage::from_nbt( &tag, - self.res.facts.get(state).name.ends_with("anvil"), + self.res.facts().get(state).name.ends_with("anvil"), ), saved: uuid.map(|u| Box::new((u, tag.clone()))), }); @@ -321,7 +321,7 @@ impl Game<'_> { self.persist.unknown.entry(key).or_default().push(tag); } } - _ if self.res.mob_types.contains_key(&kind) => { + _ if self.res.mob_types().contains_key(&kind) => { self.load_mob(tag, None); } _ if !kind.is_empty() && entity_nbt::position(&tag).is_some() => { @@ -346,7 +346,7 @@ impl Game<'_> { if let Some(Tag::List(list)) = c.remove(&"Passengers".into()) { for p in list { let known = - entity_nbt::kind(&p).is_some_and(|k| self.res.mob_types.contains_key(&k)); + entity_nbt::kind(&p).is_some_and(|k| self.res.mob_types().contains_key(&k)); if known { riders.push(p); } else { @@ -358,7 +358,7 @@ impl Game<'_> { c.insert("Passengers".into(), Tag::List(unknown)); } } - let mut m = entity_nbt::mob_from_nbt(&tag, &self.res.mob_types, self.next_entity)?; + let mut m = entity_nbt::mob_from_nbt(&tag, self.res.mob_types(), self.next_entity)?; m.extra.mount = mount; m.extra.passenger = mount.is_some(); if finalize { diff --git a/crates/horizon-client/src/game/perspective.rs b/crates/horizon-client/src/game/perspective.rs index 4214bdd70..cdc7fa2d8 100644 --- a/crates/horizon-client/src/game/perspective.rs +++ b/crates/horizon-client/src/game/perspective.rs @@ -266,7 +266,7 @@ impl Game<'_> { binding: self.collision, subject: None, }, - facts: &self.res.facts, + facts: self.res.facts(), context, }; view.align_with_entity(&entity, partial, kind, |from, to| { @@ -296,7 +296,7 @@ impl Game<'_> { return; }; if self.player_model.is_none() { - let Some(kind) = self.res.player_type.clone() else { + let Some(kind) = self.res.player_type().clone() else { return; }; self.player_model = Some(Mob::new(0, kind, p.position, self.yaw)); @@ -430,7 +430,7 @@ impl Game<'_> { m.position.z.floor() as i32, ); let packed = (u32::from(light >> 4) * 16) | ((u32::from(light & 15) * 16) << 8); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); horizon_client::mobs::render::render_with( m, @@ -438,7 +438,7 @@ impl Game<'_> { camera, &lookup, packed, - &self.res.mob_data, + self.res.mob_data(), &self.player_armor_layers(), out, ); @@ -484,7 +484,7 @@ impl Game<'_> { m.position.y += 0.125 * f64::from(u8::from(m.extra.crouching)); m.previous = m.position; let camera = glam::DVec3::new(m.position.x, m.position.y, m.position.z); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); let mut verts = Vec::new(); horizon_client::mobs::render::render_with( @@ -493,7 +493,7 @@ impl Game<'_> { camera, &lookup, 240 | 240 << 8, - &self.res.mob_data, + self.res.mob_data(), &self.player_armor_layers(), &mut verts, ); @@ -546,7 +546,7 @@ impl Game<'_> { ) { let Some(asset) = self.armor[1] .as_ref() - .and_then(|s| self.res.items.get(&s.item)) + .and_then(|s| self.res.items().get(&s.item)) .and_then(|i| i.equip_asset.as_ref()) else { return; @@ -555,9 +555,10 @@ impl Game<'_> { let Some((texture, _)) = assets.equipment.get(asset).and_then(|k| k.get("wings")) else { return; }; - let (Some(model), Some(rect)) = - (assets.player.get("elytra"), self.atlas.sprites.get(texture)) - else { + let (Some(model), Some(rect)) = ( + assets.player.get("elytra"), + self.gui.atlas.sprites.get(texture), + ) else { return; }; let base = horizon_client::mobs::render::base_transform(m, partial, camera) diff --git a/crates/horizon-client/src/game/piglins.rs b/crates/horizon-client/src/game/piglins.rs index 3515b380b..9df5311aa 100644 --- a/crates/horizon-client/src/game/piglins.rs +++ b/crates/horizon-client/src/game/piglins.rs @@ -11,14 +11,18 @@ use horizon_core::random::RandomSource; impl Game<'_> { fn piglin_loved(&self, item: &str) -> bool { self.res - .items + .items() .item_tags .get("minecraft:piglin_loved") .is_some_and(|t| t.contains(item)) } /// `PiglinAi.isWearingSafeArmor`. pub(super) fn wearing_gold(&self) -> bool { - let tag = self.res.items.item_tags.get("minecraft:piglin_safe_armor"); + let tag = self + .res + .items() + .item_tags + .get("minecraft:piglin_safe_armor"); self.armor .iter() .flatten() @@ -119,7 +123,7 @@ impl Game<'_> { let m = &self.mobs[i]; let from = [m.position.x, m.position.y + 1.3, m.position.z]; let items = if &*item == "minecraft:gold_ingot" && !m.is_baby() { - self.res.items.loot_table( + self.res.items().loot_table( "minecraft:gameplay/piglin_bartering", false, None, @@ -191,7 +195,7 @@ impl Game<'_> { ]; !self .res - .facts + .facts() .get(self.world.block( p[0].floor() as i32, p[1].floor() as i32, @@ -203,7 +207,7 @@ impl Game<'_> { /// Whether breaking or opening this block angers piglins. pub(super) fn guarded_by_piglins(&self, name: &str) -> bool { self.res - .items + .items() .block_tags .get("minecraft:guarded_by_piglins") .is_some_and(|t| t.contains(name)) diff --git a/crates/horizon-client/src/game/potions.rs b/crates/horizon-client/src/game/potions.rs index bc4f3b6bc..51cb1fc0a 100644 --- a/crates/horizon-client/src/game/potions.rs +++ b/crates/horizon-client/src/game/potions.rs @@ -169,7 +169,7 @@ impl Game<'_> { return Ok(false); }; let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - if self.res.facts.get(state).fluid != horizon_client::blocks::Fluid::Water { + if self.res.facts().get(state).fluid != horizon_client::blocks::Fluid::Water { return Ok(false); } let at = [ @@ -369,11 +369,11 @@ impl Game<'_> { let armor: Vec> = self.armor.to_vec(); if self.potions.protection_for.as_ref() != Some(&armor) { let mut table = Vec::new(); - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let mut random = horizon_core::random::LegacyRandom::new(0); for (_, def) in self.motion.health.damage.entries() { let ctx = horizon_client::enchant::EffectContext { - items: Some(&self.res.items), + items: Some(self.res.items()), damage_type: Some(&def.name), this: Some("minecraft:player"), ..Default::default() @@ -429,7 +429,7 @@ impl Game<'_> { let state = self.world .block(p.x.floor() as i32, p.y.floor() as i32, p.z.floor() as i32); - if self.res.facts.get(state).full_collision + if self.res.facts().get(state).full_collision || self.mobs.iter().any(|m| { m.alive() && (m.position.x - p.x).abs() < m.kind.width / 2.0 + 0.125 @@ -587,7 +587,7 @@ impl Game<'_> { // `LivingEntity`s, the players among them). self.for_each_player(|g| g.splash_on_player(def.effects, at, scale)); // Mobs take the instant effects (undead invert healing and harming). - let undead = &self.res.stations.enchantments.entity_tags; + let undead = &self.res.stations().enchantments.entity_tags; let mut hits = Vec::new(); for (i, m) in self.mobs.iter().enumerate() { let d2 = (m.position.x - at.x).powi(2) @@ -644,7 +644,7 @@ impl Game<'_> { .map(hud_overlays::EffectIcon::from) .collect(); let draws = hud_overlays::effects(batch.width as i32, false, &icons); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } /// `EffectsInInventory`: panels to the right of survival/creative inventory. pub(super) fn draw_inventory_effects( @@ -660,11 +660,11 @@ impl Game<'_> { &self.potions.effects.list, self.clock.rate(), &|key| self.pack.names.get(key).map(str::to_owned), - &|text| self.atlas.font.width(text).ceil() as i32, + &|text| self.gui.atlas.font.width(text).ceil() as i32, ); if let Some(lines) = inventory_effects::paint( batch, - &self.atlas, + &self.gui.atlas, &panels, [self.cursor.0 as i32, self.cursor.1 as i32], ) { diff --git a/crates/horizon-client/src/game/powder_snow.rs b/crates/horizon-client/src/game/powder_snow.rs index 7d0a7770d..6a904706f 100644 --- a/crates/horizon-client/src/game/powder_snow.rs +++ b/crates/horizon-client/src/game/powder_snow.rs @@ -68,7 +68,7 @@ impl Game<'_> { pub(super) fn is_powder_snow(&self, pos: [i32; 3]) -> bool { &*self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1], pos[2])) .name == "minecraft:powder_snow" diff --git a/crates/horizon-client/src/game/raids.rs b/crates/horizon-client/src/game/raids.rs index 25a440af3..8c31ca25b 100644 --- a/crates/horizon-client/src/game/raids.rs +++ b/crates/horizon-client/src/game/raids.rs @@ -100,7 +100,7 @@ impl RaidLevel for Lvl<'_, '_> { let w = g.mob_world_base(&[]); spawn_rules::is_spawn_position_ok(Species::Ravager, &w, x, y, z) || w.block_name(x, y - 1, z) == "minecraft:snow" - && g.res.facts.is_air(g.world.block(x, y, z)) + && g.res.facts().is_air(g.world.block(x, y, z)) } fn player(&self) -> Option { let p = self.game.player.as_ref()?; @@ -221,7 +221,7 @@ impl Game<'_> { let top = if self.dim == Dim::Nether { 127 } else { 319 }; (horizon_client::chunk::MIN_Y..=top) .rev() - .find(|&y| !self.res.facts.is_air(self.world.block(x, y, z))) + .find(|&y| !self.res.facts().is_air(self.world.block(x, y, z))) .map_or(horizon_client::chunk::MIN_Y, |y| y + 1) } /// Every claimed village point of interest (job sites, beds, bells). @@ -356,7 +356,7 @@ impl Game<'_> { .get(&(at[0] >> 4, at[2] >> 4)) .map(|c| { self.res - .biomes + .biomes() .get(c.biome(at[0], at[1], at[2])) .name .clone() @@ -716,7 +716,7 @@ impl Game<'_> { leader: bool, reason: raider::Reason, ) -> Option { - let t = self.res.mob_types.get(kind).cloned()?; + let t = self.res.mob_types().get(kind).cloned()?; self.next_entity += 1; let mut mob = Mob::new(self.next_entity, t, Vec3::new(at[0], at[1], at[2]), 0.0); if leader { @@ -982,11 +982,11 @@ impl Game<'_> { for z in c[2] - 64..=c[2] + 64 { for x in c[0] - 64..=c[0] + 64 { let state = self.world.block(x, y, z); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { continue; } let bed = *known.entry(state.0).or_insert_with(|| { - self.res.facts.get(state).name.ends_with("_bed") + self.res.facts().get(state).name.ends_with("_bed") && self.pack.assets.registry.state(state).is_some_and(|s| { s.properties.get("part").map(String::as_str) == Some("head") }) @@ -1121,7 +1121,7 @@ impl Game<'_> { pub(super) fn throw_gift(&mut self, table: &str, from: [f64; 3], to: [f64; 3]) { let drops = self .res - .items + .items() .loot_table(table, false, None, &mut self.world.random); let d = Vec3::new(to[0] - from[0], to[1] - from[1], to[2] - from[2]).normalize(); for stack in drops { @@ -1163,7 +1163,7 @@ impl Game<'_> { .get(&(at[0] >> 4, at[2] >> 4)) .map(|c| { game.res - .biomes + .biomes() .get(c.biome(at[0], at[1], at[2])) .name .clone() diff --git a/crates/horizon-client/src/game/recipe_book.rs b/crates/horizon-client/src/game/recipe_book.rs index 706c8d73e..843c01476 100644 --- a/crates/horizon-client/src/game/recipe_book.rs +++ b/crates/horizon-client/src/game/recipe_book.rs @@ -205,7 +205,7 @@ impl Game<'_> { return; } self.ensure_book(); - let index = &self.res.stations.recipe_index; + let index = &self.res.stations().recipe_index; let book = self.recipe_ui.book.as_ref(); // SmithingTrimDemoSlotDisplay draws from a random of its own. let mut random = super::dispenser::entity_random(); @@ -224,8 +224,8 @@ impl Game<'_> { }) .or_else(|| index.result(id).map(|r| ItemStack::new(r, 1))) .or_else(|| { - self.res.stations.recipes.trim_demo( - &self.res.stations.enchantments, + self.res.stations().recipes.trim_demo( + &self.res.stations().enchantments, id, &mut |n| { horizon_core::random::RandomSource::next_int_bound( @@ -275,10 +275,10 @@ impl Game<'_> { Kind::Inventory }); let env = Env { - items: &self.res.items, - recipes: &self.res.recipes, - brewing: &self.res.stations.brewing, - banners: &self.res.stations.banners, + items: self.res.items(), + recipes: self.res.recipes(), + brewing: &self.res.stations().brewing, + banners: &self.res.stations().banners, trade: None, }; for i in 0..36 { @@ -306,7 +306,7 @@ impl Game<'_> { return; } let known = &self.level.recipe_book.recipes; - let index = &self.res.stations.recipe_index; + let index = &self.res.stations().recipe_index; let ui = &mut self.recipe_ui; match ui.client_known.as_ref() { Some(previous) if previous == known => return, @@ -336,8 +336,8 @@ impl Game<'_> { } fn ensure_book(&mut self) { if self.recipe_ui.book.is_none() { - let mut book = Book::build(&self.res.recipes, &self.res.items); - book.set_display_ids(&self.res.stations.recipe_index); + let mut book = Book::build(self.res.recipes(), self.res.items()); + book.set_display_ids(&self.res.stations().recipe_index); self.recipe_ui.book = Some(book); } if self.recipe_ui.search.is_none() { @@ -497,7 +497,7 @@ impl Game<'_> { && !book.collection_matches(&c.entries, &query, &|stack| { horizon_client::item_tooltip::lines( stack, - self.res.items.get(&stack.item), + self.res.items().get(&stack.item), &|k| self.pack.names.get(k).map(str::to_owned), ) }) @@ -660,7 +660,7 @@ impl Game<'_> { search.focused = true; search.reset_blink(); if !magnifier { - let idx = search.index_at(&self.atlas, cursor.0); + let idx = search.index_at(&self.gui.atlas, cursor.0); search.set_cursor(idx, false); } return true; @@ -895,7 +895,7 @@ impl Game<'_> { ui.client.highlight.insert(e.id); } if e.flags & 1 != 0 - && let Some(id) = self.res.stations.recipe_index.recipe_of_display(e.id) + && let Some(id) = self.res.stations().recipe_index.recipe_of_display(e.id) && !toast.iter().any(|t| t == id) { toast.push(id.to_owned()); @@ -959,7 +959,7 @@ impl Game<'_> { return; }; let ghost = book - .ghost(entry, book_type, grid, fuel_empty, &self.res.items) + .ghost(entry, book_type, grid, fuel_empty, self.res.items()) .into_iter() .map(|g| Ghost { slot: match (g.target, book_type) { @@ -992,7 +992,7 @@ impl Game<'_> { let (bx, by) = self.book_button_pos(book_type, ox, batch); let hover = inside(cursor, bx, by, 20.0, 18.0); batch.sprite( - &self.atlas, + &self.gui.atlas, &sprite(if hover { "button_highlighted" } else { @@ -1040,7 +1040,7 @@ impl Game<'_> { fn draw_book_panel(&mut self, batch: &mut HudBatch, book_type: BookType) { let (xo, yo) = self.book_origin(batch); let cursor = self.cursor; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let search = match self.recipe_ui.search.as_mut() { Some(edit) => { // The box's place, for clicks and typing. @@ -1163,7 +1163,7 @@ impl Game<'_> { let mut tooltip: Option> = None; for d in calls { let start = batch.vertices.len(); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; match &d.call { Call::Blit { x, y, w, h, u, v, .. diff --git a/crates/horizon-client/src/game/remote.rs b/crates/horizon-client/src/game/remote.rs index 441eaf3db..b0da6b078 100644 --- a/crates/horizon-client/src/game/remote.rs +++ b/crates/horizon-client/src/game/remote.rs @@ -179,6 +179,13 @@ fn number_format(f: &play::NumberFormat) -> horizon_client::scoreboard::NumberFo impl Game<'_> { /// Leave the title for a server (ConnectScreen): an empty world fed by the connection. pub(super) fn connect_server(&mut self, address: &str, name: &str) -> Result<()> { + if self.defer_world_entry(super::PendingWorldEntry::Server { + address: address.to_owned(), + name: name.to_owned(), + })? { + return Ok(()); + } + self.join_world_rest()?; if let Err(error) = self.join_server(address, name, None) { log::warn!("Horizon: could not join server: {error}"); if self.title.is_none() { @@ -235,12 +242,12 @@ impl Game<'_> { let mut streaming = Streaming::new( Arc::new(NoTerrain), self.pack.context.clone(), - self.res.threads, + self.res.threads(), ); streaming.remote = true; streaming.radius = self.settings.render_distance; self.streaming = streaming; - self.world = World::new(self.res.facts.air, 0); + self.world = World::new(self.res.facts().air, 0); self.save = Arc::new(SaveDir::new( std::env::temp_dir().join("horizon-remote-unused"), )); @@ -368,7 +375,7 @@ impl Game<'_> { self.score.board = Default::default(); self.streaming = Streaming::new(Arc::new(NoTerrain), self.pack.context.clone(), 1); self.streaming.paused = true; - self.world = World::new(self.res.facts.air, 0); + self.world = World::new(self.res.facts().air, 0); self.player = None; self.mobs.clear(); self.clear_remote_objects(); @@ -626,7 +633,7 @@ impl Game<'_> { .get("minecraft:worldgen/biome") .map(|list| { list.iter() - .map(|(name, _)| self.res.biomes.id(name)) + .map(|(name, _)| self.res.biomes().id(name)) .collect() }) .unwrap_or_default(); @@ -653,7 +660,7 @@ impl Game<'_> { let mut streaming = Streaming::new( Arc::new(NoTerrain), self.pack.context.clone(), - self.res.threads, + self.res.threads(), ); streaming.remote = true; streaming.radius = self.streaming.radius; @@ -663,7 +670,7 @@ impl Game<'_> { self.world.day_time, self.world.weather, ); - self.world = World::new(self.res.facts.air, spawn.seed); + self.world = World::new(self.res.facts().air, spawn.seed); self.world.game_time = time; self.world.day_time = day; self.world.weather = weather; @@ -957,7 +964,7 @@ impl Game<'_> { } /// Keep the renderable block entities (chests, furnaces) in step with blocks. fn sync_block_entity(&mut self, pos: (i32, i32, i32), state: BlockStateId) { - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); match BlockEntity::for_block(&name) { Some(entity) => { let same = self @@ -1020,9 +1027,9 @@ impl Game<'_> { // A block we just placed: play its place sound (the server skips the placer). if let Some((target, _)) = self.remote.as_ref().and_then(|r| r.placing) && target == pos - && !self.res.facts.is_air(state) + && !self.res.facts().is_air(state) { - let s = self.res.facts.get(state).sounds.clone(); + let s = self.res.facts().get(state).sounds.clone(); let at = [ f64::from(pos[0]) + 0.5, f64::from(pos[1]) + 0.5, @@ -1043,7 +1050,7 @@ impl Game<'_> { let mob_type = if kind == "minecraft:player" { self.remote.as_ref().and_then(|r| r.player_type.clone()) } else { - self.res.mob_types.get(kind).cloned() + self.res.mob_types().get(kind).cloned() }; if kind == "minecraft:experience_orb" { // Its value (ExperienceOrb.DATA_VALUE) follows in SetEntityData. @@ -1315,7 +1322,7 @@ impl Game<'_> { // shulker boxes, bells) when the block is still the one it names. C::BlockEvent(p) => { let state = self.world.block(p.pos[0], p.pos[1], p.pos[2]); - let block = &self.res.facts.get(state).name; + let block = &self.res.facts().get(state).name; let named = self.remote.as_ref().and_then(|r| { r.builtin .get("minecraft:block")? @@ -1335,7 +1342,7 @@ impl Game<'_> { C::LevelEvent(p) if p.kind == 2001 => { // LevelEvent.PARTICLES_DESTROY_BLOCK: someone else broke a block. let state = BlockStateId(p.data.max(0) as u32); - let s = self.res.facts.get(state).sounds.clone(); + let s = self.res.facts().get(state).sounds.clone(); let at = [ f64::from(p.pos[0]) + 0.5, f64::from(p.pos[1]) + 0.5, @@ -2184,10 +2191,11 @@ impl Game<'_> { self.skin_slots.len() } else { let (old, slot) = self.skin_slots.remove(0); - self.atlas.sprites.remove(&old); + self.gui.atlas.sprites.remove(&old); slot }; let Some(rect) = self + .gui .atlas .sprites .get(&format!("horizon/skin{slot}")) @@ -2195,7 +2203,7 @@ impl Game<'_> { else { return; }; - let (w, h) = (self.atlas.width as f32, self.atlas.height as f32); + let (w, h) = (self.gui.atlas.width as f32, self.gui.atlas.height as f32); self.map_patches.push(horizon_client::font::Patch { x: (rect.u0 * w).round() as u32, y: (rect.v0 * h).round() as u32, @@ -2203,7 +2211,7 @@ impl Game<'_> { height: 64, rgba, }); - self.atlas.sprites.insert(location.clone(), rect); + self.gui.atlas.sprites.insert(location.clone(), rect); self.skin_slots.push((location, slot)); } /// Whether a downloaded skin is in the atlas, marking it recently shown. @@ -2504,7 +2512,7 @@ impl Game<'_> { horizon_client::motion::MotionEvent::Emission { state, in_water, .. } if !crouching => { - let sounds = self.res.facts.get(state).sounds.clone(); + let sounds = self.res.facts().get(state).sounds.clone(); // Player.playStepSound: muffled under the swim sound in water. let (volume, pitch) = if in_water { (sounds.volume * 0.05, sounds.pitch * 0.8) @@ -2860,7 +2868,7 @@ impl Game<'_> { }; let face = face_direction(hit.face); let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - if self.res.facts.is_air(state) { + if self.res.facts().is_air(state) { return; } if self.remote.as_ref().is_some_and(|r| r.destroy_delay > 0) { @@ -2882,14 +2890,17 @@ impl Game<'_> { } return; } - let facts = self.res.facts.get(state).clone(); + let facts = self.res.facts().get(state).clone(); let held = self.held().cloned(); - let mut speed = self.res.items.mining_speed(held.as_ref(), &facts.name); + let mut speed = self.res.items().mining_speed(held.as_ref(), &facts.name); if self.player.as_ref().is_some_and(|p| !p.ground.on_ground) { speed /= 5.0; } - let harvest = - !facts.requires_tool || self.res.items.correct_for_drops(held.as_ref(), &facts.name); + let harvest = !facts.requires_tool + || self + .res + .items() + .correct_for_drops(held.as_ref(), &facts.name); let progress = if facts.hardness < 0.0 { 0.0 } else if facts.hardness == 0.0 { @@ -2996,7 +3007,7 @@ impl Game<'_> { .and_modify(|p| p.0 = sequence) .or_insert((sequence, state.0 as i32)); } - let s = self.res.facts.get(state).sounds.clone(); + let s = self.res.facts().get(state).sounds.clone(); let at = [ f64::from(pos[0]) + 0.5, f64::from(pos[1]) + 0.5, @@ -3020,7 +3031,7 @@ impl Game<'_> { fn remote_use(&mut self) { let held_block = self .held() - .and_then(|h| self.res.items.get(&h.item)) + .and_then(|h| self.res.items().get(&h.item)) .is_some_and(|i| i.block.is_some()); let sneaking = self.keys.contains(&KeyCode::ShiftLeft); // Entities first (interact), like the hit result order. @@ -3084,7 +3095,7 @@ impl Game<'_> { })); // MultiPlayerGameMode.useItem runs the use here too: food starts // being eaten (Consumable.startConsuming). - if let Some(info) = self.res.items.get(&held.item).cloned() { + if let Some(info) = self.res.items().get(&held.item).cloned() { self.start_eating(&info); } } @@ -3099,7 +3110,7 @@ impl Game<'_> { let stack = self.stack_in(slot).cloned(); let consumable = stack .as_ref() - .and_then(|s| self.res.items.get(&s.item)) + .and_then(|s| self.res.items().get(&s.item)) .and_then(|i| i.consumable.clone()); let (Some(stack), Some(consumable)) = (stack, consumable) else { self.using = None; @@ -3595,7 +3606,7 @@ impl Game<'_> { // an ender chest's or a double chest's slots are no one block's, // so they go under a key no block has. let holds = |k: &(i32, i32, i32)| { - let name = &self.res.facts.get(self.world.block(k.0, k.1, k.2)).name; + let name = &self.res.facts().get(self.world.block(k.0, k.1, k.2)).name; BlockEntity::for_block(name).is_some_and(|e| { e.id() == entity.id() && e.slots().len() == entity.slots().len() }) @@ -3638,7 +3649,7 @@ impl Game<'_> { if self.player.is_some() { return false; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); batch.fill(atlas, 0.0, 0.0, w, h, rgba(20, 20, 20, 255)); let shown = horizon_client::net::shown_address(&r.session.address); @@ -3663,7 +3674,7 @@ impl Game<'_> { /// Chat (ChatComponent), the chat input line and the action bar. pub(super) fn remote_hud(&self, batch: &mut HudBatch) { let Some(r) = &self.remote else { return }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); let open = self.screen == Screen::Chat; let now = Instant::now(); diff --git a/crates/horizon-client/src/game/render_control.rs b/crates/horizon-client/src/game/render_control.rs index 21a5aee46..c8355a395 100644 --- a/crates/horizon-client/src/game/render_control.rs +++ b/crates/horizon-client/src/game/render_control.rs @@ -120,7 +120,7 @@ impl Game<'_> { let key = (int(1)?, int(2)?, int(3)?); let name = self .res - .facts + .facts() .get(self.world.block(key.0, key.1, key.2)) .name .clone(); diff --git a/crates/horizon-client/src/game/render_tick.rs b/crates/horizon-client/src/game/render_tick.rs index 4ee10e6d2..b990869a5 100644 --- a/crates/horizon-client/src/game/render_tick.rs +++ b/crates/horizon-client/src/game/render_tick.rs @@ -66,15 +66,21 @@ impl Game<'_> { ) -> FogData { let forward = self.forward(); let at = [camera.x, camera.y, camera.z]; - let fog_type = fog_type(&self.world, &self.res.facts, at, forward); - let water = self.res.biomes.get(biome).water_fog; + let fog_type = fog_type(&self.world, self.res.facts(), at, forward); + let water = self.res.biomes().get(biome).water_fog; let (rain, thunder) = if self.dim == Dim::Overworld { self.world.weather.levels(self.clock.fraction() as f32) } else { (0.0, 0.0) }; + let title_fog = horizon_client::fog::FogTables::default(); + let tables = if self.title.is_some() { + &title_fog + } else { + self.res.fog() + }; horizon_client::fog::setup_fog( - &self.res.fog, + tables, &self.fog, &FogInputs { fog_type, @@ -117,7 +123,7 @@ impl Game<'_> { horizon_client::gfx::ShaderInputs { rain, thunder, - submerged: match fog_type(&self.world, &self.res.facts, at, self.forward()) { + submerged: match fog_type(&self.world, self.res.facts(), at, self.forward()) { FogType::Atmospheric => 0, FogType::Water => 1, FogType::Lava => 2, @@ -139,7 +145,7 @@ impl Game<'_> { camera.y < 63.0 && fog_type( &self.world, - &self.res.facts, + self.res.facts(), [camera.x, camera.y, camera.z], self.forward(), ) != FogType::Water @@ -170,7 +176,7 @@ impl Game<'_> { t[1].floor() as i32, t[2].floor() as i32, ); - let f = self.res.facts.get(state); + let f = self.res.facts().get(state); if f.render_shape != horizon_client::blocks::RenderShape::Invisible && f.solid_render && f.full_collision @@ -180,7 +186,7 @@ impl Game<'_> { } } let in_water = - fog_type(&self.world, &self.res.facts, eye, self.forward()) == FogType::Water; + fog_type(&self.world, self.res.facts(), eye, self.forward()) == FogType::Water; let water = (in_water && !spectator).then(|| (self.eye_brightness(eye), self.yaw, self.pitch)); // Hud.extractCameraOverlays; the spyglass scope (and its easing) is @@ -211,7 +217,7 @@ impl Game<'_> { let gui_overlays = hud_overlays::camera_overlays(size[0] as i32, size[1] as i32, &overlays, &mut scope); self.screen_fx.build(&ScreenInputs { - sprites: &self.atlas.sprites, + sprites: &self.gui.atlas.sprites, aspect: size[0] as f32 / size[1].max(1) as f32, partial, block_overlay, @@ -243,7 +249,7 @@ impl Game<'_> { self.screen_fx.tick(brightness, inside_portal); // LocalPlayer water vision and AtmosphericFogEnvironment rain fog. let in_water = - fog_type(&self.world, &self.res.facts, e, self.forward()) == FogType::Water; + fog_type(&self.world, self.res.facts(), e, self.forward()) == FogType::Water; self.fog.tick(in_water); let b = [ e[0].floor() as i32, @@ -260,7 +266,7 @@ impl Game<'_> { .chunks .get(&(b[0] >> 4, b[2] >> 4)) .map_or(0, |c| c.biome(b[0], b[1], b[2])); - let rains = self.res.biomes.get(biome).precipitation; + let rains = self.res.biomes().get(biome).precipitation; update_rain_fog( &mut self.fog, rain, @@ -278,8 +284,8 @@ impl Game<'_> { (0.0, 0.0) }; let world = &self.world; - let facts = &self.res.facts; - let biomes = &self.res.biomes; + let facts = self.res.facts(); + let biomes = self.res.biomes(); let raining = rain > 0.2; let raining_at = |p: [i32; 3]| { raining @@ -300,7 +306,7 @@ impl Game<'_> { e[1].floor() as i32, e[2].floor() as i32, ]; - animate_tick(&self.res.animate, &mut self.particles, &ctx, block); + animate_tick(self.res.animate(), &mut self.particles, &ctx, block); if rain > 0.0 { // ClientLevel.tickWeatherEffects: rain splashes (weather radius 10). let mut random = LegacyRandom::new(self.world.game_time.wrapping_mul(312_987_231)); @@ -336,7 +342,7 @@ impl Game<'_> { let smoke = f.fluid == Fluid::Lava || &*f.name == "minecraft:magma_block" || (f.name.ends_with("campfire") - && self.res.animate.is_lit_campfire(state.0)); + && self.res.animate().is_lit_campfire(state.0)); let ty = if smoke { ParticleType::Smoke } else { @@ -354,7 +360,7 @@ impl Game<'_> { } if let Some(r) = &self.renderer { campfire_particles( - &self.res.animate, + self.res.animate(), &mut self.particles, &ctx, r.block_entities(), diff --git a/crates/horizon-client/src/game/respawn_anchor.rs b/crates/horizon-client/src/game/respawn_anchor.rs index aa94d5b17..4604c076f 100644 --- a/crates/horizon-client/src/game/respawn_anchor.rs +++ b/crates/horizon-client/src/game/respawn_anchor.rs @@ -63,7 +63,7 @@ pub(super) enum AnchorUse { impl Game<'_> { fn is_anchor(&self, state: BlockStateId) -> bool { - &*self.res.facts.get(state).name == "minecraft:respawn_anchor" + &*self.res.facts().get(state).name == "minecraft:respawn_anchor" } fn anchor_charges(&self, state: BlockStateId) -> i32 { self.pack @@ -177,7 +177,7 @@ impl Game<'_> { } /// `RespawnAnchorBlock.isWaterThatWouldFlow`. fn water_would_flow(&self, p: [i32; 3]) -> bool { - let f = self.res.facts.get(self.world.block(p[0], p[1], p[2])); + let f = self.res.facts().get(self.world.block(p[0], p[1], p[2])); if f.fluid != Fluid::Water { return false; } @@ -188,7 +188,7 @@ impl Game<'_> { return false; } self.res - .facts + .facts() .get(self.world.block(p[0], p[1] - 1, p[2])) .fluid != Fluid::Water @@ -203,7 +203,7 @@ impl Game<'_> { .any(|d| self.water_would_flow([pos[0] + d[0], pos[1], pos[2] + d[2]])); let above = self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1] + 1, pos[2])) .fluid == Fluid::Water; @@ -225,7 +225,7 @@ impl Game<'_> { /// halves and explodes; `StrawBedBlock` just falls apart. pub(super) fn destroy_bed_on_use(&mut self, head: [i32; 3]) -> Result<()> { let state = self.world.block(head[0], head[1], head[2]); - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); let center = [ f64::from(head[0]) + 0.5, f64::from(head[1]) + 0.5, @@ -259,7 +259,7 @@ impl Game<'_> { let foot = [head[0] + back[0], head[1], head[2] + back[2]]; if self .res - .facts + .facts() .get(self.world.block(foot[0], foot[1], foot[2])) .name == name @@ -297,7 +297,7 @@ impl Game<'_> { /// climbable blocks and open trapdoors. fn non_climbable_shape(&self, p: [i32; 3]) -> VoxelShape { let state = self.world.block(p[0], p[1], p[2]); - let name = &self.res.facts.get(state).name; + let name = &self.res.facts().get(state).name; let open_trapdoor = name.ends_with("_trapdoor") && self .pack @@ -326,7 +326,7 @@ impl Game<'_> { } pub(super) fn block_in_tag(&self, tag: &str, block: &str) -> bool { self.res - .items + .items() .block_tags .get(tag) .is_some_and(|s| s.contains(block)) @@ -334,7 +334,7 @@ impl Game<'_> { /// `EntityType.isBlockDangerous` for the player. fn dangerous_for_player(&self, p: [i32; 3]) -> bool { let state = self.world.block(p[0], p[1], p[2]); - let name = &*self.res.facts.get(state).name; + let name = &*self.res.facts().get(state).name; let lit_campfire = (name == "minecraft:campfire" || name == "minecraft:soul_campfire") && self .pack @@ -397,7 +397,7 @@ impl Game<'_> { } let name = |q: [i32; 3]| { self.res - .facts + .facts() .get(self.world.block(q[0], q[1], q[2])) .name .clone() diff --git a/crates/horizon-client/src/game/scoreboard.rs b/crates/horizon-client/src/game/scoreboard.rs index 4e715c7b7..f0f508e62 100644 --- a/crates/horizon-client/src/game/scoreboard.rs +++ b/crates/horizon-client/src/game/scoreboard.rs @@ -584,11 +584,11 @@ impl Game<'_> { batch.height as i32, board, objective, - &self.atlas.font, + &self.gui.atlas.font, self.settings.text_background(0.3), self.settings.text_background(0.4), ); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } } @@ -648,8 +648,8 @@ impl Game<'_> { ), upside_down: &up, }; - let draws = self.tab_list.layout(&inputs, &self.atlas.font); - horizon_client::hud_layout::paint(batch, &self.atlas, &draws); + let draws = self.tab_list.layout(&inputs, &self.gui.atlas.font); + horizon_client::hud_layout::paint(batch, &self.gui.atlas, &draws); } } diff --git a/crates/horizon-client/src/game/screens.rs b/crates/horizon-client/src/game/screens.rs index 365dd5992..e84c194f6 100644 --- a/crates/horizon-client/src/game/screens.rs +++ b/crates/horizon-client/src/game/screens.rs @@ -92,7 +92,7 @@ impl Game<'_> { let (world, quit) = self.pause_labels(); self.tick_friends(); let friends = self.friends_view(); - let mut ui = horizon_client::ui_theme::Ui::new(&self.atlas, batch, self.cursor); + let mut ui = horizon_client::ui_theme::Ui::new(&self.gui.atlas, batch, self.cursor); horizon_client::front::pause::draw( &mut ui, &world, @@ -104,7 +104,7 @@ impl Game<'_> { ui.finish(); return; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); let title = Text::translate("menu.game", &[]); @@ -156,7 +156,7 @@ impl Game<'_> { let mut b = HudBatch::new(size); let (world, quit) = self.pause_labels(); horizon_client::front::pause::click( - &self.atlas, + &self.gui.atlas, &mut b, self.cursor.0, self.cursor.1, @@ -197,7 +197,7 @@ impl Game<'_> { } /// DeathScreen: gradient, the title at double size, the cause and score. pub(super) fn draw_death_screen(&mut self, batch: &mut HudBatch) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); // fillGradient(0x60500000 -> 0xA0803030). let rows = h.ceil() as i32; diff --git a/crates/horizon-client/src/game/sculk.rs b/crates/horizon-client/src/game/sculk.rs index 72a91d7da..fc6c03f9e 100644 --- a/crates/horizon-client/src/game/sculk.rs +++ b/crates/horizon-client/src/game/sculk.rs @@ -277,7 +277,7 @@ impl Game<'_> { let n = registry.len(); let tag = |name: &str| { self.res - .items + .items() .block_tags .get(name) .cloned() @@ -296,7 +296,7 @@ impl Game<'_> { resonator: vec![false; n], }; for i in 0..n { - let facts = self.res.facts.get(BlockStateId(i as u32)); + let facts = self.res.facts().get(BlockStateId(i as u32)); let name: &str = &facts.name; t.kinds[i] = match name { "minecraft:sculk_sensor" => KIND_SENSOR, @@ -614,7 +614,7 @@ impl Game<'_> { }; !own && !calibrated_out && frequency != 0 - && self.res.behaviours.sculk_sensor_can_activate(state) + && self.res.behaviours().sculk_sensor_can_activate(state) } SculkKind::Shrieker => !self.shrieker_shrieking(state) && ctx.player, SculkKind::Catalyst => false, @@ -775,7 +775,7 @@ impl Game<'_> { match kind { SculkKind::Sensor | SculkKind::Calibrated => { let state = self.world.block(key.0, key.1, key.2); - if self.res.behaviours.sculk_sensor_can_activate(state) { + if self.res.behaviours().sculk_sensor_can_activate(state) { let frequency = sculk::frequency(info.event); if let Some(e) = self.sculk_entity(key) { e.last_frequency = frequency; @@ -865,7 +865,7 @@ impl Game<'_> { if self.mobs.iter().any(|m| m.id == id && m.species() == Species::Warden)); match self.kind_of_state(state.0) { KIND_SENSOR | KIND_CALIBRATED => { - if is_warden || !self.res.behaviours.sculk_sensor_can_activate(state) { + if is_warden || !self.res.behaviours().sculk_sensor_can_activate(state) { continue; } let calibrated = self.kind_of_state(state.0) == KIND_CALIBRATED; @@ -1008,7 +1008,7 @@ impl Game<'_> { if warning < 4 { return false; } - let Some(kind) = self.res.mob_types.get("minecraft:warden").cloned() else { + let Some(kind) = self.res.mob_types().get("minecraft:warden").cloned() else { return false; }; for _ in 0..20 { @@ -1051,7 +1051,7 @@ impl Game<'_> { /// `SpawnUtil.moveToPossibleSpawnPosition` with `ON_TOP_OF_COLLIDER`. fn spawn_position(&self, x: i32, y: i32, z: i32, range: i32) -> Option<(i32, i32, i32)> { use horizon_client::mobs::data; - let flags = |b: BlockStateId| self.res.mob_data.state(b); + let flags = |b: BlockStateId| self.res.mob_data().state(b); let mut search = y; let mut above = self.world.block(x, search, z); for _ in (-range..=range).rev() { @@ -1170,7 +1170,7 @@ impl Game<'_> { && let Some(eye) = self.eye_position() { let in_water = - horizon_client::fog::fog_type(&self.world, &self.res.facts, eye, self.forward()) + horizon_client::fog::fog_type(&self.world, self.res.facts(), eye, self.forward()) == FogType::Water; return self.fog.water_vision(in_water); } @@ -1335,7 +1335,7 @@ impl Game<'_> { .play("minecraft:block.sculk.charge", Some(c), 1.0, 1.0); let solid = self .res - .facts + .facts() .get(self.world.block(pos.x, pos.y, pos.z)) .full_collision; let (particles, spread) = if solid { (40, 0.45f32) } else { (20, 0.25f32) }; @@ -1543,7 +1543,8 @@ impl Game<'_> { at[1].floor() as i32, at[2].floor() as i32, ); - self.res.facts.get(self.world.block(x, y, z)).fluid == horizon_client::blocks::Fluid::Water + self.res.facts().get(self.world.block(x, y, z)).fluid + == horizon_client::blocks::Fluid::Water } /// `Entity.move`'s emission: footsteps, swimming, landing and splashes. fn entity_motion_events( @@ -1590,13 +1591,13 @@ impl Game<'_> { at[2].floor() as i32, ); let state = self.world.block(block.0, block.1, block.2); - let air = self.res.facts.is_air(state); + let air = self.res.facts().is_air(state); let climbable = self .res - .items + .items() .block_tags .get("minecraft:climbable") - .is_some_and(|t| t.contains(&*self.res.facts.get(state).name)); + .is_some_and(|t| t.contains(&*self.res.facts().get(state).name)); let travelled = if climbable { ((dx * dx + dy * dy + dz * dz).sqrt() * f64::from(0.6f32)) as f32 } else { diff --git a/crates/horizon-client/src/game/sculk_fixture.rs b/crates/horizon-client/src/game/sculk_fixture.rs index 2ebdbcb2b..b57f559b6 100644 --- a/crates/horizon-client/src/game/sculk_fixture.rs +++ b/crates/horizon-client/src/game/sculk_fixture.rs @@ -303,8 +303,8 @@ impl Game<'_> { } fn sculk_fixture_reset(&mut self, s: &Scenario) -> Result<()> { - self.world = World::new(self.res.facts.air, 0); - let plains = u32::from(self.res.biomes.id("minecraft:plains")); + self.world = World::new(self.res.facts().air, 0); + let plains = u32::from(self.res.biomes().id("minecraft:plains")); let layers = [ self.fixture_state("minecraft:bedrock")?, self.fixture_state("minecraft:dirt")?, @@ -439,7 +439,7 @@ impl Game<'_> { for spec in &s.mobs { let kind = self .res - .mob_types + .mob_types() .get(&spec.kind) .cloned() .ok_or_else(|| format!("unknown mob {}", spec.kind))?; diff --git a/crates/horizon-client/src/game/shield.rs b/crates/horizon-client/src/game/shield.rs index 849c62958..c4f7f98d1 100644 --- a/crates/horizon-client/src/game/shield.rs +++ b/crates/horizon-client/src/game/shield.rs @@ -34,7 +34,7 @@ impl Game<'_> { &self, stack: &ItemStack, ) -> Option<&horizon_client::items::BlocksAttacks> { - self.res.items.get(&stack.item)?.blocks_attacks.as_ref() + self.res.items().get(&stack.item)?.blocks_attacks.as_ref() } /// `ShieldItem.use` (ItemUtils.startUsingInstantly) for the hand at `slot`; /// false when that hand holds no blocking item or it is on cooldown. @@ -64,7 +64,7 @@ impl Game<'_> { if (ticks as i32) < (component.delay_seconds * 20.0).round() as i32 { return None; } - let tags = &self.res.stations.enchantments.damage_tags; + let tags = &self.res.stations().enchantments.damage_tags; let matches = |spec: &str| match spec.strip_prefix('#') { Some(tag) => tags.get(tag).is_some_and(|t| t.contains(damage_type)), None => spec == damage_type, @@ -150,7 +150,11 @@ impl Game<'_> { }; if item_damage > 0 && !self.creative { let loss = self.durability_loss(&stack, item_damage as u32); - let max = self.res.items.get(&stack.item).map_or(0, |i| i.max_damage); + let max = self + .res + .items() + .get(&stack.item) + .map_or(0, |i| i.max_damage); let cell = self.stack_in_mut(slot); if let Some(s) = cell.as_mut() && max > 0 @@ -182,7 +186,7 @@ impl Game<'_> { .extra .main_hand .as_deref() - .and_then(|item| self.res.items.get(item)) + .and_then(|item| self.res.items().get(item)) .map_or(0.0, |i| i.disable_blocking_seconds); // Ravager.blockedByItem: stunned half the time (the defender pushed // apart), else the defender flung away; no roar in progress. diff --git a/crates/horizon-client/src/game/sign_edit.rs b/crates/horizon-client/src/game/sign_edit.rs index c0a780063..c679bad69 100644 --- a/crates/horizon-client/src/game/sign_edit.rs +++ b/crates/horizon-client/src/game/sign_edit.rs @@ -88,7 +88,7 @@ impl Game<'_> { return; }; let line = edit.line; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let width = |s: &str| HudBatch::text_width(atlas, s); let Some(key) = self.sign_edit.as_ref().map(|e| e.pos) else { return; @@ -130,7 +130,7 @@ impl Game<'_> { } else { &mut sign.back }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; self.text_selection.apply( sign_line_id(front, line), &mut text.lines[line], @@ -163,7 +163,7 @@ impl Game<'_> { let Some(BlockEntity::Sign(sign)) = self.world.block_entities.get(&edit.pos) else { return; }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (w, h) = (batch.width, batch.height); batch.fill(atlas, 0.0, 0.0, w, h, rgba(16, 16, 16, 160)); let title = if sign.hanging { @@ -175,7 +175,7 @@ impl Game<'_> { batch.text(atlas, title, (w - tw) / 2.0, 40.0, u32::MAX, true); let name = self .res - .facts + .facts() .get(self.world.block(edit.pos.0, edit.pos.1, edit.pos.2)) .name .clone(); diff --git a/crates/horizon-client/src/game/sniffers.rs b/crates/horizon-client/src/game/sniffers.rs index 61325ede6..a30c0ba5c 100644 --- a/crates/horizon-client/src/game/sniffers.rs +++ b/crates/horizon-client/src/game/sniffers.rs @@ -93,7 +93,7 @@ impl Game<'_> { self.particles.push(particle); } if self.mobs[i].age.is_multiple_of(10) { - let hit = self.res.facts.get(below).sounds.hit.clone(); + let hit = self.res.facts().get(below).sounds.hit.clone(); self.audio.play(&hit, Some(at), 0.5, 0.5); } } diff --git a/crates/horizon-client/src/game/spawner.rs b/crates/horizon-client/src/game/spawner.rs index a2131f9b0..538cb39e7 100644 --- a/crates/horizon-client/src/game/spawner.rs +++ b/crates/horizon-client/src/game/spawner.rs @@ -68,7 +68,7 @@ impl Game<'_> { /// (`client_tick_spawners`). pub(super) fn tick_spawner(&mut self, key: Pos) -> Result<()> { let state = self.world.block(key.0, key.1, key.2); - if &*self.res.facts.get(state).name != "minecraft:spawner" { + if &*self.res.facts().get(state).name != "minecraft:spawner" { return Ok(()); } let Some(BlockEntity::Spawner(mut spawner)) = self.world.block_entities.take(&key) else { @@ -145,7 +145,7 @@ impl Game<'_> { r: &SpawnerSpawn, planned: &mut Vec, ) -> Option { - let kind = self.res.mob_types.get(r.id)?.clone(); + let kind = self.res.mob_types().get(r.id)?.clone(); let [x, y, z] = r.position; let at = Vec3::new(x, y, z); let bounds = if r.finalize { @@ -195,7 +195,7 @@ impl Game<'_> { tag.insert("PersistenceRequired".into(), Tag::Byte(1)); } let tag = Tag::Compound(tag); - let mob = horizon_client::entity_nbt::mob_from_nbt(&tag, &self.res.mob_types, 0)?; + let mob = horizon_client::entity_nbt::mob_from_nbt(&tag, self.res.mob_types(), 0)?; let bounds = mob.bounds(); planned.push(Planned::Loaded(tag)); bounds @@ -331,7 +331,7 @@ impl Game<'_> { .get(&key) .is_none_or(|(k, _)| *k != kind) { - let Some(t) = self.res.mob_types.get(&kind).cloned() else { + let Some(t) = self.res.mob_types().get(&kind).cloned() else { return false; }; let mob = Mob::new(u32::MAX, t, Vec3::ZERO, 0.0); @@ -351,7 +351,7 @@ impl Game<'_> { } _ => return None, }; - self.res.mob_types.contains_key(&id).then_some(id) + self.res.mob_types().contains_key(&id).then_some(id) } /// `SpawnEggItem.useOn` on a spawner: the egg sets its mob. None when the /// clicked block has no spawner. @@ -393,7 +393,7 @@ impl Game<'_> { alpha: f64, out: &mut Vec, ) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let lookup = |name: &str| atlas.sprites.get(name).map(|r| [r.u0, r.v0, r.u1, r.v1]); for (key, (_, mob)) in &self.spawners.displays { let at = glam::DVec3::new(f64::from(key.0), f64::from(key.1), f64::from(key.2)); @@ -436,7 +436,7 @@ impl Game<'_> { origin, &lookup, packed, - &self.res.mob_data, + self.res.mob_data(), out, ); } diff --git a/crates/horizon-client/src/game/startup_menu.rs b/crates/horizon-client/src/game/startup_menu.rs new file mode 100644 index 000000000..9531b0f38 --- /dev/null +++ b/crates/horizon-client/src/game/startup_menu.rs @@ -0,0 +1,782 @@ +//! The interactive title before world resources exist. Uses only the menu +//! atlas/panorama; transfers the actual screen and queued entry to Game. +use super::*; +use horizon_client::{ + clipboard::{self, AppendSelection, SystemClipboard}, + options_ui::{Event, OptionsUi, Page}, +}; +use winit::{event::KeyEvent, keyboard::ModifiersState}; + +#[derive(Default)] +pub(super) struct StartupMenu { + title: Option, + options: OptionsUi, + options_open: bool, + root: PathBuf, + cursor: (f32, f32), + pointer: (f64, f64), + modifiers: ModifiersState, + physical_keys: HashSet<KeyCode>, + dragging: bool, + clipboard: SystemClipboard, + selection: AppendSelection, + pub pending: Option<PendingWorldEntry>, + pub reload_packs: bool, + pub perf: horizon_client::telemetry::Session, +} + +impl StartupMenu { + pub fn new(options: &Options, pack_error: Option<&str>) -> Result<Self> { + let pending = if let Some(address) = &options.server { + Some(PendingWorldEntry::Server { + address: address.clone(), + name: options.player_name(), + }) + } else { + options + .world + .as_ref() + .map(|folder| PendingWorldEntry::Local { + folder: folder.clone(), + name: None, + seed: Some(options.seed), + creative: options.creative, + create: None, + }) + }; + let mut menu = Self { + pending, + ..Default::default() + }; + menu.root = options.resources.clone(); + if let Some(error) = pack_error { + menu.options.open_at(false, Page::Packs); + menu.options.resource_error = Some(error.to_owned()); + menu.options_open = true; + } + if menu.pending.is_some() { + menu.perf.world_opening(); + } + Ok(menu) + } + + pub(super) fn set_root(&mut self, root: PathBuf, settings: &Settings) { + horizon_client::ui::load_metadata(&root); + horizon_client::lang::set(horizon_client::lang::Language::load( + &[&root], + &settings.language, + )); + self.root = root; + if self.title.is_none() { + let mut title = Title::new( + std::env::current_dir().unwrap_or_default().join("saves"), + &self.root, + ); + title.last_server = settings.file.string("lastServer"); + if horizon_client::ui_theme::horizon() { + title + .opening + .set(Some(horizon_client::front::Opening::new())); + } + self.title = Some(title); + } + } + + pub(super) fn handoff(&mut self, game: &mut Game<'_>) { + game.title = self.title.take(); + game.pending_entry = self.pending.take(); + game.cursor = self.cursor; + game.modifiers = self.modifiers; + game.physical_keys = std::mem::take(&mut self.physical_keys); + game.clipboard = std::mem::take(&mut self.clipboard); + game.text_selection = std::mem::take(&mut self.selection); + game.perf = std::mem::take(&mut self.perf); + // Preserve an existing resource-error screen opened by start_game. + if self.options_open { + let resource_error = game.ui.options.resource_error.take(); + game.ui.options = std::mem::take(&mut self.options); + game.ui.options.resource_error = + game.ui.options.resource_error.take().or(resource_error); + game.screen = Screen::Options; + game.options_from_title = true; + game.dragging = self.dragging; + } + } + + fn queue_entry(&mut self, action: Action, player_name: String) { + let entry = match action { + Action::Play { folder } => PendingWorldEntry::Local { + folder, + name: None, + seed: None, + creative: false, + create: None, + }, + Action::Create { + folder, + name, + seed, + creative, + options, + } => PendingWorldEntry::Local { + folder, + name: Some(name), + seed, + creative, + create: Some(Box::new(options)), + }, + Action::Connect { address } => PendingWorldEntry::Server { + address, + name: player_name, + }, + _ => return, + }; + self.pending = Some(entry); + self.perf.world_opening(); + } + + fn shortcut(&mut self, event: &KeyEvent) -> Option<clipboard::EditShortcut> { + let edit = if cfg!(target_os = "macos") { + self.modifiers.super_key() + } else { + self.modifiers.control_key() + }; + clipboard::edit_shortcut( + clipboard::shortcut_letter(&event.logical_key, event.physical_key), + edit, + self.modifiers.shift_key(), + self.modifiers.alt_key(), + ) + } + + fn title_key(&mut self, event: &KeyEvent) { + let shortcut = self.shortcut(event); + let Some(title) = &mut self.title else { return }; + if title.skip_opening() { + return; + } + if let Some(shortcut) = shortcut { + if title.has_caret_field() { + title.field_shortcut(shortcut, &mut self.clipboard); + } else if let Some((id, value, max)) = title.focused_field() + && self + .selection + .apply(id, value, shortcut, &mut self.clipboard, |v, t| { + clipboard::append_limited(v, t, max) + }) + { + title.search_changed(); + } + return; + } + match event.physical_key { + PhysicalKey::Code(KeyCode::Escape) => title.escape(), + PhysicalKey::Code(KeyCode::Tab) => title.tab(), + PhysicalKey::Code(KeyCode::Enter | KeyCode::NumpadEnter) => title.confirm_edit(), + PhysicalKey::Code( + key @ (KeyCode::Backspace + | KeyCode::Delete + | KeyCode::ArrowLeft + | KeyCode::ArrowRight + | KeyCode::Home + | KeyCode::End), + ) if title.has_caret_field() => { + title.field_key( + key, + self.modifiers.control_key(), + self.modifiers.shift_key(), + ); + } + _ => { + let cleared = !title.has_caret_field() + && title + .focused_field() + .is_some_and(|(id, value, _)| self.selection.take(id, value)); + if cleared { + title.search_changed(); + } + if event.physical_key == PhysicalKey::Code(KeyCode::Backspace) { + if !cleared { + title.backspace(); + } + } else if let Some(text) = &event.text { + title.type_text(text); + } + } + } + } +} + +/// Each generation has its own channel and progress. Pack changes wait for the +/// old tail before starting another generation, including cache/global writes. +pub(super) fn spawn_loader( + options: &Options, + settings: &Settings, + vanilla_root: &std::path::Path, + started: Instant, + progress: &Progress, +) -> Result<(Receiver<LoaderMsg>, JoinHandle<()>)> { + let (sender, receiver) = std::sync::mpsc::channel(); + let settings = settings.clone(); + let vanilla_root = vanilla_root.to_path_buf(); + let dev_mods = options.dev_mods.clone(); + let progress = progress.clone(); + let handle = std::thread::Builder::new() + .name("resource-loader".into()) + .spawn(move || { + let mut pack_error = None; + let root = packs::startup_root(&vanilla_root, &settings.resource_packs).unwrap_or_else( + |error| { + pack_error = Some(error.to_string()); + vanilla_root.clone() + }, + ); + let root = mods::content_root(&root, &settings.mods.enabled, &dev_mods); + let result = load_resources( + root, + &vanilla_root, + &settings, + started, + true, + &progress, + &mut |gui, root| { + let _ = sender.send(LoaderMsg::Ui(gui, root.to_path_buf())); + }, + ) + .map(|mut loaded| { + loaded.pack_error = loaded.pack_error.or(pack_error); + loaded + }) + .map_err(|error| error.to_string()); + let _ = sender.send(LoaderMsg::Done(result)); + })?; + Ok((receiver, handle)) +} + +impl Loading { + pub(super) fn poll_menu_resources(&mut self) -> Result<()> { + if self.loaded.is_none() { + loop { + match self.receiver.try_recv() { + Ok(LoaderMsg::Ui(gui, root)) => self.set_ui(gui, root), + Ok(LoaderMsg::Done(result)) => { + self.loaded = Some(result); + break; + } + Err(TryRecvError::Empty) => break, + Err(TryRecvError::Disconnected) => { + if let Some(handle) = self.handle.take() { + let _ = handle.join(); + } + return Err("resource loader stopped before finishing".into()); + } + } + } + } + self.restart_menu_resources() + } + pub(super) fn apply_menu_settings(&mut self) { + if let Some(renderer) = &mut self.renderer { + self.settings + .clamp_gui_scale([renderer.config.width as i32, renderer.config.height as i32]); + renderer.gamma = self.settings.gamma; + renderer.set_present_mode(self.settings.vsync, self.settings.horizon.present_mode); + } + horizon_client::hud::GUI_SCALE.store(self.settings.gui_scale, Ordering::Relaxed); + if let Some(gui) = &mut self.gui { + gui.atlas.font.uniform = self.settings.force_unicode; + gui.atlas.font.japanese = self.settings.japanese_glyphs; + } + if let Some(window) = &self.window + && let Some(want) = self.fullscreen.request(self.settings.fullscreen) + { + window.set_fullscreen(want.then_some(winit::window::Fullscreen::Borderless(None))); + } + self.update_menu_cursor(); + } + + fn update_menu_cursor(&mut self) { + let batch = HudBatch::new(self.menu_size()); + self.menu.cursor = ( + self.menu.pointer.0 as f32 / batch.scale, + self.menu.pointer.1 as f32 / batch.scale, + ); + } + + fn menu_size(&self) -> [u32; 2] { + self.renderer + .as_ref() + .map_or([1280, 720], |r| [r.config.width, r.config.height]) + } + + fn save_menu_address(&mut self) { + if self + .menu + .title + .as_ref() + .is_some_and(|title| title.last_server != self.settings.file.string("lastServer")) + { + self.save_menu_settings(); + } + } + + fn save_menu_settings(&mut self) { + if let Some(title) = &self.menu.title { + self.settings.file.set( + "lastServer", + horizon_client::options_file::V::Str(title.last_server.clone()), + ); + } + self.settings.save(&Game::options_path()); + } + + fn open_menu_options(&mut self, page: Page) { + self.menu.options.open_at(false, page); + self.menu.options.languages = horizon_client::lang::available(&[&self.menu.root]); + self.menu.options.pack_infos = packs::pack_infos(&self.vanilla_root); + self.menu.options.pack_selection = self.settings.resource_packs.clone(); + self.menu.options.pack_screen = None; + self.menu.options_open = true; + } + + fn menu_option_events(&mut self, events: Vec<Event>) { + for event in events { + match event { + Event::Changed => { + self.save_menu_settings(); + self.apply_menu_settings(); + } + Event::Close if self.menu.options.resource_error.is_some() => {} + Event::Close => { + self.menu.options_open = false; + self.menu.dragging = false; + self.save_menu_settings(); + } + Event::Language(code) => { + horizon_client::lang::set(horizon_client::lang::Language::load( + &[&self.menu.root], + &code, + )); + self.save_menu_settings(); + } + Event::Packs(_) => { + self.save_menu_settings(); + self.menu.reload_packs = true; + } + Event::OpenPackFolder => { + let dir = packs::packs_dir(); + let _ = std::fs::create_dir_all(&dir); + packs::open_folder(&dir); + } + Event::OpenModFolder => { + let dir = Game::options_path().with_file_name(horizon_client::mod_list::DIR); + let _ = std::fs::create_dir_all(&dir); + packs::open_folder(&dir); + } + Event::ButtonClick => {} + } + } + } + + fn menu_options_click(&mut self, drag: bool, right: bool) { + let size = self.menu_size(); + let batch = HudBatch::new(size); + let Some(gui) = &self.gui else { return }; + let events = self.menu.options.click( + &mut self.settings, + &gui.atlas, + self.menu.cursor.0, + self.menu.cursor.1, + (batch.width, batch.height), + [size[0] as i32, size[1] as i32], + drag, + right, + ); + self.menu_option_events(events); + } + + fn menu_action(&mut self, event_loop: &ActiveEventLoop, action: Action) { + match action { + Action::Quit => event_loop.exit(), + Action::Options => self.open_menu_options(Page::Main), + Action::Accessibility => self.open_menu_options(Page::Accessibility), + Action::Language => self.open_menu_options(Page::Language), + action => { + let name = self + .options + .as_ref() + .map_or_else(|| "Player".into(), |o| o.player_name()); + self.menu.queue_entry(action, name); + } + } + self.save_menu_address(); + } + + pub(super) fn menu_event( + &mut self, + event_loop: &ActiveEventLoop, + event: WindowEvent, + ) -> Result<()> { + if let WindowEvent::MouseInput { + state, + button: MouseButton::Left, + .. + } = &event + { + horizon_client::ui_theme::set_pressed(*state == ElementState::Pressed); + } + if let WindowEvent::KeyboardInput { event, .. } = &event + && let PhysicalKey::Code(key) = event.physical_key + { + if event.state == ElementState::Pressed { + self.menu.physical_keys.insert(key); + } else { + self.menu.physical_keys.remove(&key); + } + } + match event { + WindowEvent::CloseRequested => { + self.save_menu_settings(); + event_loop.exit(); + } + WindowEvent::Resized(size) => { + if let Some(r) = &mut self.renderer { + r.resize(size.width, size.height); + } + self.apply_menu_settings(); + } + WindowEvent::RedrawRequested => self.draw(), + WindowEvent::ModifiersChanged(modifiers) => self.menu.modifiers = modifiers.state(), + WindowEvent::Focused(false) => { + self.menu.modifiers = ModifiersState::empty(); + self.menu.physical_keys.clear(); + horizon_client::ui_theme::set_pressed(false); + self.menu.dragging = false; + if let Some(title) = &mut self.menu.title { + title.release(); + title.release_field(); + } + let events = self.menu.options.release(); + self.menu_option_events(events); + } + WindowEvent::KeyboardInput { event, .. } + if event.state == ElementState::Pressed && self.menu.pending.is_some() => + { + if event.physical_key == PhysicalKey::Code(KeyCode::Escape) { + self.menu.pending = None; + self.menu.perf.cancel_world_opening(); + } + } + _ if self.gui.is_none() || self.menu.pending.is_some() => {} + WindowEvent::CursorMoved { position, .. } => { + self.menu.pointer = (position.x, position.y); + self.update_menu_cursor(); + if self.menu.options_open && self.menu.dragging { + self.menu_options_click(true, false); + } else if let Some(title) = &mut self.menu.title { + let size = self + .renderer + .as_ref() + .map_or([1280, 720], |r| [r.config.width, r.config.height]); + let b = HudBatch::new(size); + title.drag(self.menu.cursor, (b.width, b.height)); + title.drag_field(&self.gui.as_ref().unwrap().atlas, self.menu.cursor.0); + } + } + WindowEvent::MouseInput { state, button, .. } if self.menu.options_open => { + if state == ElementState::Pressed && self.menu.options.selected_key.is_some() { + let events = self.menu.options.bind_mouse(&mut self.settings, button); + self.menu_option_events(events); + } else if matches!(button, MouseButton::Left | MouseButton::Right) { + if state == ElementState::Pressed { + self.menu.dragging = button == MouseButton::Left; + self.menu_options_click(false, button == MouseButton::Right); + } else if button == MouseButton::Left { + self.menu.dragging = false; + let events = self.menu.options.release(); + self.menu_option_events(events); + } + } + } + WindowEvent::MouseInput { + state, + button: MouseButton::Left, + .. + } => { + let mut batch = HudBatch::new(self.menu_size()); + if let (Some(title), Some(gui)) = (&mut self.menu.title, &self.gui) { + if state == ElementState::Released { + title.release(); + title.release_field(); + } else { + let action = if horizon_client::ui_theme::horizon() { + let action = title.click_horizon( + &gui.atlas, + &mut batch, + self.menu.cursor.0, + self.menu.cursor.1, + ); + // Horizon's deeper world-management pages use classic fields. + title.press_field( + &gui.atlas, + self.menu.cursor, + (batch.width, batch.height), + self.menu.modifiers.shift_key(), + ); + action + } else { + let (action, _) = title.click( + self.menu.cursor.0, + self.menu.cursor.1, + (batch.width, batch.height), + ); + title.press_field( + &gui.atlas, + self.menu.cursor, + (batch.width, batch.height), + self.menu.modifiers.shift_key(), + ); + action + }; + self.menu_action(event_loop, action); + } + } + } + WindowEvent::MouseWheel { delta, .. } => { + let raw = match delta { + MouseScrollDelta::LineDelta(_, y) => y, + MouseScrollDelta::PixelDelta(p) => (p.y / 30.0) as f32, + }; + let amount = if self.settings.discrete_scroll { + horizon_client::mouse::java_signum(f64::from(raw)) as f32 + } else { + raw + } * self.settings.mouse_wheel_sensitivity; + let batch = HudBatch::new(self.menu_size()); + if self.menu.options_open { + self.menu.options.scroll_at( + &self.settings, + (batch.width, batch.height), + self.menu.cursor, + amount, + ); + } else if let Some(title) = &mut self.menu.title { + title.scroll_worlds(amount, self.menu.cursor, (batch.width, batch.height)); + } + } + WindowEvent::KeyboardInput { event, .. } if event.state == ElementState::Pressed => { + if event.physical_key == PhysicalKey::Code(KeyCode::F11) { + self.settings.fullscreen = !self.settings.fullscreen; + self.apply_menu_settings(); + self.save_menu_settings(); + } else if self.menu.options_open { + let shortcut = self.menu.shortcut(&event); + let atlas = &self.gui.as_ref().unwrap().atlas; + let handled = shortcut.is_some_and(|s| { + self.menu + .options + .shortcut(atlas, s, &mut self.menu.clipboard) + }); + if !handled && let PhysicalKey::Code(key) = event.physical_key { + let events = self.menu.options.key( + &mut self.settings, + atlas, + key, + event.text.as_deref(), + ); + self.menu_option_events(events); + } + } else { + self.menu.title_key(&event); + self.save_menu_address(); + } + } + _ => {} + } + Ok(()) + } + + pub(super) fn draw_menu(&mut self, batch: &mut HudBatch) { + let Some(gui) = &self.gui else { return }; + if self.menu.pending.is_some() { + horizon_client::level_loading::draw_progress( + batch, + &gui.atlas, + self.progress.line(), + self.progress.fraction(), + ); + } else if self.menu.options_open { + self.menu + .options + .draw(&self.settings, batch, &gui.atlas, self.menu.cursor); + } else if let Some(title) = &mut self.menu.title { + title.poll_backup(); + let _ = title.update_toast(self.settings.notification_display_time); + if horizon_client::ui_theme::horizon() { + let mut ui = horizon_client::ui_theme::Ui::new(&gui.atlas, batch, self.menu.cursor); + title.draw_horizon(&mut ui, 0.0); + ui.finish(); + } else { + title.draw( + &gui.atlas, + batch, + self.menu.cursor, + self.settings.file.bool("hideSplashTexts"), + ); + } + } + } + + pub(super) fn restart_menu_resources(&mut self) -> Result<()> { + if !self.menu.reload_packs || self.loaded.is_none() { + return Ok(()); + } + if let Some(Ok(loaded)) = &mut self.loaded { + if let Some(loader) = &loaded.rest_loader + && !loader.ready()? + { + return Ok(()); + } + if let Some(loader) = loaded.rest_loader.take() + && let Err(error) = loader.finish() + { + log::warn!("Horizon: replaced resource generation failed: {error}"); + } + } + self.loaded = None; + if let Some(handle) = self.handle.take() { + handle.join().map_err(|_| "resource loader panicked")?; + } + self.progress = Progress::new(); + let options = self.options.as_ref().ok_or("loading already finished")?; + let (receiver, handle) = spawn_loader( + options, + &self.settings, + &self.vanilla_root, + self.started, + &self.progress, + )?; + self.receiver = receiver; + self.handle = Some(handle); + self.menu.reload_packs = false; + Ok(()) + } +} + +#[cfg(test)] +mod tests { + use super::*; + + fn gui(root: &std::path::Path) -> UiResources { + UiResources { + atlas: HudAtlas::fonts(root).unwrap(), + panorama: Arc::new(horizon_client::gfx::panorama::Faces { + size: 1, + pixels: [96, 110, 111, 255].repeat(6), + }), + } + } + + fn loading(receiver: Receiver<LoaderMsg>) -> Loading { + Loading { + window: None, + renderer: None, + gui: None, + settings: Settings::default(), + fullscreen: horizon_client::window::FullscreenState::new(false), + options: None, + vanilla_root: PathBuf::new(), + pack_error: None, + started: Instant::now(), + progress: Progress::new(), + receiver, + loaded: None, + handle: None, + shown: false, + menu: StartupMenu::default(), + error: None, + } + } + + #[test] + fn menu_is_usable_while_the_core_worker_is_blocked() { + let root = std::env::temp_dir().join("horizon-startup-menu-no-world-resources"); + let (sender, receiver) = std::sync::mpsc::channel(); + let (release, wait) = std::sync::mpsc::channel(); + let (published, published_rx) = std::sync::mpsc::channel(); + let worker_root = root.clone(); + let worker = std::thread::spawn(move || { + sender + .send(LoaderMsg::Ui(gui(&worker_root), worker_root)) + .unwrap(); + published.send(()).unwrap(); + wait.recv().unwrap(); + sender + .send(LoaderMsg::Done(Err("core failure".into()))) + .unwrap(); + }); + published_rx.recv().unwrap(); + let mut loading = loading(receiver); + loading.poll_menu_resources().unwrap(); + assert!(loading.gui.is_some()); + assert!(loading.loaded.is_none()); + assert!(!worker.is_finished()); + // Navigate and enter a world name without a registry, biomes, pack + // tables or a Game. Replacing fallback artwork preserves this state. + let title = loading.menu.title.as_mut().unwrap(); + title.opening.set(None); + title.mode = horizon_client::title::Mode::Create { + name: String::new(), + seed: "42".into(), + creative: true, + focus: 0, + options: Default::default(), + }; + title.type_text("My world"); + loading.set_ui(gui(&root), root); + let action = loading.menu.title.as_ref().unwrap().create_action(); + loading.menu.queue_entry(action, "Player".into()); + assert!( + matches!(&loading.menu.pending, Some(PendingWorldEntry::Local { + name: Some(name), seed: Some(42), creative: true, create: Some(_), .. + }) if name == "My world") + ); + let mut batch = HudBatch::new([1280, 720]); + loading.draw_menu(&mut batch); + assert!( + !batch.vertices.is_empty(), + "queued entry draws loading progress" + ); + release.send(()).unwrap(); + worker.join().unwrap(); + loading.poll_menu_resources().unwrap(); + assert!(matches!(loading.loaded, Some(Err(ref error)) if error == "core failure")); + } + + #[test] + fn queued_server_keeps_address_and_player_identity() { + let mut menu = StartupMenu::default(); + menu.queue_entry( + Action::Connect { + address: "localhost:25565".into(), + }, + "Guest".into(), + ); + assert!( + matches!(menu.pending.take(), Some(PendingWorldEntry::Server { address, name }) + if address == "localhost:25565" && name == "Guest") + ); + assert!(menu.pending.take().is_none(), "an entry is consumed once"); + } + + #[test] + fn disconnected_core_worker_is_reported_instead_of_waiting_forever() { + let (sender, receiver) = std::sync::mpsc::channel(); + drop(sender); + let mut loading = loading(receiver); + assert_eq!( + loading.poll_menu_resources().unwrap_err().to_string(), + "resource loader stopped before finishing" + ); + } +} diff --git a/crates/horizon-client/src/game/station_control.rs b/crates/horizon-client/src/game/station_control.rs index 680939a4f..75ad9225e 100644 --- a/crates/horizon-client/src/game/station_control.rs +++ b/crates/horizon-client/src/game/station_control.rs @@ -126,7 +126,7 @@ impl Game<'_> { "enchant" => { let e = id(arg(1)?); let level: u32 = arg(2)?.parse()?; - if self.res.stations.enchantments.get(&e).is_none() { + if self.res.stations().enchantments.get(&e).is_none() { return Err(format!("unknown enchantment {e}").into()); } let held = self.inventory[self.selected] diff --git a/crates/horizon-client/src/game/stations.rs b/crates/horizon-client/src/game/stations.rs index 7b70cb1f1..03045b403 100644 --- a/crates/horizon-client/src/game/stations.rs +++ b/crates/horizon-client/src/game/stations.rs @@ -263,7 +263,7 @@ fn argb(c: i32) -> u32 { impl Game<'_> { fn data(&self) -> &stations::StationData { - &self.res.stations + self.res.stations() } pub(super) fn translate(&self, key: &str, fallback: &str) -> String { self.data() @@ -376,9 +376,13 @@ impl Game<'_> { } } fn count_bookshelves(&self, pos: [i32; 3]) -> i32 { - let tags = &self.res.items.block_tags; + let tags = &self.res.items().block_tags; let is = |p: [i32; 3], tag: &str| { - let name = &self.res.facts.get(self.world.block(p[0], p[1], p[2])).name; + let name = &self + .res + .facts() + .get(self.world.block(p[0], p[1], p[2])) + .name; tags.get(tag).is_some_and(|t| t.contains(&**name)) }; stations::bookshelf_offsets() @@ -412,8 +416,8 @@ impl Game<'_> { return; }; let creative = self.creative; - let data = &self.res.stations; - let items = &self.res.items; + let data = self.res.stations(); + let items = self.res.items(); match s.kind { Kind::Enchanting => { s.bookcases = self.count_bookshelves(s.pos); @@ -494,7 +498,10 @@ impl Game<'_> { self.station = Some(s); } pub(super) fn max_stack(&self, stack: &ItemStack) -> u32 { - self.res.items.get(&stack.item).map_or(64, |i| i.max_stack) + self.res + .items() + .get(&stack.item) + .map_or(64, |i| i.max_stack) } /// `Slot.mayPlace` and `getMaxStackSize` for station and brewing slots. fn slot_rules(&self, slot: usize, stack: &ItemStack) -> (bool, u32) { @@ -518,7 +525,7 @@ impl Game<'_> { 3 => (data.brewing.is_reagent(stack), 64), _ => ( self.res - .items + .items() .get(&stack.item) .is_some_and(|i| i.brewing_fuel.is_some()), 64, @@ -548,7 +555,7 @@ impl Game<'_> { 64, ), Kind::Enchanting => (&*stack.item == "minecraft:lapis_lazuli", 64), - Kind::Grindstone => (stations::grindstone_accepts(&self.res.items, stack), 64), + Kind::Grindstone => (stations::grindstone_accepts(self.res.items(), stack), 64), Kind::Smithing => (data.recipes.smithing_accepts(i, stack), 64), _ => (true, 64), } @@ -667,7 +674,7 @@ impl Game<'_> { let data = self.data(); let fuel = self .res - .items + .items() .get(&stack.item) .is_some_and(|i| i.brewing_fuel.is_some()); let (reagent, bottle) = ( @@ -818,7 +825,7 @@ impl Game<'_> { if !self.creative && self.world.random.next_float() < 0.12 { // AnvilBlock.damage let state = self.world.block(pos[0], pos[1], pos[2]); - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); let next = match &*name { "minecraft:anvil" => Some("minecraft:chipped_anvil"), "minecraft:chipped_anvil" => Some("minecraft:damaged_anvil"), @@ -848,7 +855,7 @@ impl Game<'_> { let (a, b) = (s.inputs[0].take(), s.inputs[1].take()); let mut random = LegacyRandom::new(self.world.random.next_long()); let xp = stations::grindstone_experience( - &self.res.stations.enchantments, + &self.res.stations().enchantments, &mut random, a.as_ref(), b.as_ref(), @@ -945,7 +952,7 @@ impl Game<'_> { Some(c) if c.same_item_same_components(&result) && c.count + result.count - <= self.res.items.get(&c.item).map_or(64, |i| i.max_stack) => + <= self.res.items().get(&c.item).map_or(64, |i| i.max_stack) => { c.count += result.count } @@ -988,8 +995,8 @@ impl Game<'_> { return; } let Some(enchanted) = stations::apply_enchantment( - &self.res.stations.enchantments, - &self.res.items, + &self.res.stations().enchantments, + self.res.items(), self.level.xp_seed, button, cost, @@ -1249,7 +1256,7 @@ impl Game<'_> { } /// Text in the Standard Galactic alphabet (`minecraft:alt`), cut to `max` pixels. fn galactic(&self, batch: &mut HudBatch, text: &str, x: f32, y: f32, max: f32, color: u32) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let Some(sheet) = atlas.sprites.get("font/ascii_sga").copied() else { batch.text(atlas, text, x, y, color, false); return; @@ -1325,7 +1332,7 @@ impl Game<'_> { let local = (self.cursor.0 - ox, self.cursor.1 - oy); let mut tooltip: Option<Vec<(String, u32)>> = None; { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; batch.fill( atlas, 0.0, @@ -1342,7 +1349,7 @@ impl Game<'_> { }; let (fuel, total_fuel, brew, total_brew) = (b.fuel, b.total_fuel, b.brew_time, b.total_brew_time); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; Self::part( batch, atlas, @@ -1417,7 +1424,7 @@ impl Game<'_> { if self.slot_mut(i).is_none() { let (sx, sy) = self.station_slot_position(i).unwrap_or_default(); batch.sprite( - &self.atlas, + &self.gui.atlas, &format!("gui/sprites/container/slot/{icon}"), ox + sx, oy + sy, @@ -1427,7 +1434,7 @@ impl Game<'_> { } else if let Some(kind) = self.station.as_ref().map(|s| s.kind) { let title = self.translate(kind.title_key(), ""); { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; Self::part( batch, atlas, @@ -1446,7 +1453,7 @@ impl Game<'_> { if kind == Kind::Loom { tooltip = self.draw_loom(batch, ox, oy, local); } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let s = self.station.as_ref().expect("open station"); let has_input = s.inputs.iter().any(Option::is_some); match kind { @@ -1552,7 +1559,7 @@ impl Game<'_> { ); -8323296 }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let cw = HudBatch::text_width(atlas, &cost_text); batch.text( atlas, @@ -1566,7 +1573,7 @@ impl Game<'_> { if inside(local, bx, by, bw, 17.0) && let Some((id, l)) = &offers.clues[i] { - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let (name, _) = e.full_name(id, *l); let clue = self .translate("container.enchant.clue", "%s . . . ?") @@ -1679,7 +1686,7 @@ impl Game<'_> { ) }; if let Some(line) = line { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let tw = HudBatch::text_width(atlas, &line); let tx = 176.0 - 8.0 - tw - 2.0; batch.fill( @@ -1766,7 +1773,7 @@ impl Game<'_> { i, ItemStack { count: 1, - ..self.res.stations.recipes.stonecutting[s.recipes[i]] + ..self.res.stations().recipes.stonecutting[s.recipes[i]] .result .clone() }, @@ -1788,7 +1795,7 @@ impl Game<'_> { "recipe" }; batch.sprite_scaled( - &self.atlas, + &self.gui.atlas, &format!("gui/sprites/container/stonecutter/{sprite}"), ox + x, oy + y - 1.0, @@ -1816,7 +1823,7 @@ impl Game<'_> { if let Some(slot) = self.slot_at(batch, self.cursor.0, self.cursor.1) { let (sx, sy) = self.slot_position(slot); batch.fill( - &self.atlas, + &self.gui.atlas, ox + sx, oy + sy, 16.0, @@ -1858,7 +1865,7 @@ impl Game<'_> { /// `ItemStack.getTooltipLines` subset: name in rarity colour, potion /// effects, enchantments (gray, curses red), stored enchantments, trims. pub(super) fn stack_tooltip(&self, stack: &ItemStack) -> Vec<(String, u32)> { - let e: &Enchantments = &self.res.stations.enchantments; + let e: &Enchantments = &self.res.stations().enchantments; let props = e.props(&stack.item); let rarity = horizon_client::item_tooltip::rarity( stack, @@ -1968,7 +1975,7 @@ impl Game<'_> { // BannerPatternLayers.addToTooltip: up to six layer names. if display.shows("minecraft:banner_patterns") { for layer in horizon_client::banner::tooltip_layers(stack).iter().take(6) { - let key = self.res.stations.banners.layer_key(layer); + let key = self.res.stations().banners.layer_key(layer); lines.push((self.translate(&key, &key), rgba(170, 170, 170, 255))); } } @@ -1996,7 +2003,7 @@ impl Game<'_> { } } if display.shows("minecraft:attribute_modifiers") - && let Some(info) = self.res.items.get(&stack.item) + && let Some(info) = self.res.items().get(&stack.item) { let base = |name: &str, default| { self.player @@ -2026,7 +2033,7 @@ impl Game<'_> { )); } if display.shows("minecraft:damage") - && let Some(info) = self.res.items.get(&stack.item) + && let Some(info) = self.res.items().get(&stack.item) && info.max_damage > 0 && stack.damage > 0 && self.options_advanced_tooltips() @@ -2068,7 +2075,7 @@ impl Game<'_> { _ => serde_json::Value::Null, }; }; - let recipes = &self.res.stations.recipes.stonecutting; + let recipes = &self.res.stations().recipes.stonecutting; serde_json::json!({ "costs": s.offers.costs, "clues": s.offers.clues.iter().map(|c| c.as_ref().map(|(e, l)| format!("{e} {l}"))).collect::<Vec<_>>(), @@ -2094,7 +2101,7 @@ impl Game<'_> { if lines.is_empty() { return; } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let w = lines .iter() .map(|(t, _)| HudBatch::text_width(atlas, t)) @@ -2183,9 +2190,9 @@ impl Game<'_> { return Ok(()); }; let out = b.tick( - &self.res.stations.brewing, - &self.res.items, - &self.res.providers, + &self.res.stations().brewing, + self.res.items(), + self.res.providers(), ); if out != brewing::BrewTick::default() { let (x, y, z) = pos; diff --git a/crates/horizon-client/src/game/stats.rs b/crates/horizon-client/src/game/stats.rs index c36b99eaa..8f642d97a 100644 --- a/crates/horizon-client/src/game/stats.rs +++ b/crates/horizon-client/src/game/stats.rs @@ -216,14 +216,14 @@ impl Game<'_> { p.position.y.floor() as i32, p.position.z.floor() as i32, ]; - let eye_in_water = self.res.facts.get(self.world.block( + let eye_in_water = self.res.facts().get(self.world.block( feet[0], (p.position.y + f64::from(p.dimensions.eye_height)).floor() as i32, feet[2], )); let in_water = self .res - .facts + .facts() .get(self.world.block(feet[0], feet[1], feet[2])) .fluid == horizon_client::blocks::Fluid::Water; @@ -317,7 +317,11 @@ impl Game<'_> { pos[1] + 20 + r.next_int_bound(15).unwrap_or(0), pos[2] - 10 + r.next_int_bound(21).unwrap_or(10), ]; - if !self.res.facts.is_air(self.world.block(at[0], at[1], at[2])) { + if !self + .res + .facts() + .is_air(self.world.block(at[0], at[1], at[2])) + { return; } let group = 1 + self.world.random.next_int_bound(3).unwrap_or(0); @@ -335,7 +339,7 @@ impl Game<'_> { } fn can_see_sky(&self, pos: [i32; 3]) -> bool { (pos[1] + 1..pos[1] + 256).all(|y| { - let f = self.res.facts.get(self.world.block(pos[0], y, pos[2])); + let f = self.res.facts().get(self.world.block(pos[0], y, pos[2])); !f.full_collision && f.fluid == horizon_client::blocks::Fluid::None }) } diff --git a/crates/horizon-client/src/game/stats_screen.rs b/crates/horizon-client/src/game/stats_screen.rs index 40b151453..5505d423d 100644 --- a/crates/horizon-client/src/game/stats_screen.rs +++ b/crates/horizon-client/src/game/stats_screen.rs @@ -222,7 +222,7 @@ impl Game<'_> { } pub(super) fn draw_stats(&mut self, batch: &mut HudBatch) { let (w, h) = (batch.width, batch.height); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; ui::menu_background(batch, atlas, 0.0, 0.0, w, h, true); let (top, bottom) = (TAB_H, h - FOOTER); ui::separators(batch, atlas, top, bottom, true); @@ -333,13 +333,13 @@ impl Game<'_> { } let stack = ItemStack::new(item, 1); batch.sprite( - &self.atlas, + &self.gui.atlas, "gui/sprites/container/slot", left + 1.0, y + 1.0, ); self.draw_item(batch, &stack, left + 2.0, y + 2.0); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let color = if (i + 1) % 2 == 0 { u32::MAX } else { @@ -347,8 +347,12 @@ impl Game<'_> { }; for (c, (ty, _)) in COLUMNS.iter().enumerate() { let x = left + 75.0 + 40.0 * c as f32; - let block = - c == 0 && self.res.items.get(item).is_some_and(|i| i.block.is_some()); + let block = c == 0 + && self + .res + .items() + .get(item) + .is_some_and(|i| i.block.is_some()); let text = if c == 0 && !block { Text::translate("stats.none", &[]).plain() } else { @@ -400,7 +404,7 @@ impl Game<'_> { } } } - let atlas = &self.atlas; + let atlas = &self.gui.atlas; ui::scrollbar( batch, atlas, @@ -413,7 +417,7 @@ impl Game<'_> { self.draw_stats_footer(batch, w, h); } fn draw_stats_footer(&self, batch: &mut HudBatch, w: f32, h: f32) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let (bx, by) = ((w / 2.0 - 100.0).floor(), h - FOOTER + 6.0); let hover = ui::hovered(self.cursor, bx, by, 200.0, 20.0); ui::button( diff --git a/crates/horizon-client/src/game/storage.rs b/crates/horizon-client/src/game/storage.rs index 44b62e276..9b28ce26b 100644 --- a/crates/horizon-client/src/game/storage.rs +++ b/crates/horizon-client/src/game/storage.rs @@ -22,7 +22,7 @@ impl Game<'_> { (300..400).contains(&slot) && is_shulker_box(&stack.item) && self.container.is_some_and(|k| { - is_shulker_box(&self.res.facts.get(self.world.block(k.0, k.1, k.2)).name) + is_shulker_box(&self.res.facts().get(self.world.block(k.0, k.1, k.2)).name) }) } /// Opening an ender chest shows the player's ender inventory in its place. @@ -160,7 +160,7 @@ impl Game<'_> { let k = self.container?; Some( self.res - .facts + .facts() .get(self.world.block(k.0, k.1, k.2)) .name .clone(), @@ -211,7 +211,7 @@ impl Game<'_> { oy: f32, ) { use horizon_client::hud::rgba; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let grey = rgba(64, 64, 64, 255); if self .container_block() diff --git a/crates/horizon-client/src/game/subtitle_hud.rs b/crates/horizon-client/src/game/subtitle_hud.rs index cf89a4b15..f54ca874d 100644 --- a/crates/horizon-client/src/game/subtitle_hud.rs +++ b/crates/horizon-client/src/game/subtitle_hud.rs @@ -47,7 +47,7 @@ impl Game<'_> { width: batch.width as i32, height: batch.height as i32, }; - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let draws = self .subtitles .overlay diff --git a/crates/horizon-client/src/game/sulfur_cubes.rs b/crates/horizon-client/src/game/sulfur_cubes.rs index c4cee6319..d1bf9def9 100644 --- a/crates/horizon-client/src/game/sulfur_cubes.rs +++ b/crates/horizon-client/src/game/sulfur_cubes.rs @@ -52,7 +52,7 @@ impl Game<'_> { } // shortcut: the body slot retains only an item id; preserve the stack // before supporting its block-state components here. - let Some(state) = self.res.items.get(item).and_then(|item| item.block) else { + let Some(state) = self.res.items().get(item).and_then(|item| item.block) else { return; }; let start = out.len(); @@ -60,7 +60,7 @@ impl Game<'_> { state, 42, block_transform(base, mob.is_baby()), - block_light(light, self.res.facts.get(state).emission), + block_light(light, self.res.facts().get(state).emission), true, out, ); diff --git a/crates/horizon-client/src/game/titles.rs b/crates/horizon-client/src/game/titles.rs index 459aab503..70ade5595 100644 --- a/crates/horizon-client/src/game/titles.rs +++ b/crates/horizon-client/src/game/titles.rs @@ -16,10 +16,10 @@ impl Game<'_> { let (w, h) = (batch.width as i32, batch.height as i32); let partial = self.clock.fraction() as f32; let background = self.settings.text_background(0.0); - let font = &self.atlas.font; + let font = &self.gui.atlas.font; let mut draws = self.titles.overlay_message(w, h, partial, font, background); draws.extend(self.titles.title(w, h, partial, font, background)); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } /// The selected stack as `Hud.tick` compares it for the name highlight. fn held_name(&self) -> Option<HeldName> { @@ -54,9 +54,9 @@ impl Game<'_> { batch.width as i32, batch.height as i32, can_hurt, - &self.atlas.font, + &self.gui.atlas.font, self.settings.text_background(0.0), ); - hud_layout::paint(batch, &self.atlas, &draws); + hud_layout::paint(batch, &self.gui.atlas, &draws); } } diff --git a/crates/horizon-client/src/game/tnt.rs b/crates/horizon-client/src/game/tnt.rs index c47c17de9..92da4a0bb 100644 --- a/crates/horizon-client/src/game/tnt.rs +++ b/crates/horizon-client/src/game/tnt.rs @@ -162,7 +162,7 @@ impl Game<'_> { &self.world, self.collision, &self.pack.assets, - &self.res.facts, + self.res.facts(), )?; if t.fuse <= 0 { let center = [ @@ -189,7 +189,7 @@ impl Game<'_> { return Ok(false); }; let state = self.world.block(hit.pos[0], hit.pos[1], hit.pos[2]); - if &*self.res.facts.get(state).name != "minecraft:tnt" { + if &*self.res.facts().get(state).name != "minecraft:tnt" { return Ok(false); } let pos = BlockPos::new(hit.pos[0], hit.pos[1], hit.pos[2]); @@ -219,7 +219,7 @@ impl Game<'_> { // Face sprites from the block model: up, down, north, south, west, east. let Ok(models) = self .pack - .assets + .render .model_catalog .collect(state, BlockPos::new(0, 0, 0)) else { @@ -241,7 +241,7 @@ impl Game<'_> { .pack .layer_names .get(&face.layer) - .and_then(|name| self.atlas.sprites.get(name).copied()); + .and_then(|name| self.gui.atlas.sprites.get(name).copied()); } } let range = super::entity_culling::default_range( @@ -487,9 +487,10 @@ mod tests { return; } let assets = horizon_client::assets::Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let facts = horizon_client::blocks::BlockFacts::load(&root, assets.registry).unwrap(); let collision = horizon_client::collisions::load(&root, assets.registry).unwrap(); - let mut world = horizon_client::world::World::test_scene(&assets, 3).unwrap(); + let mut world = horizon_client::world::World::test_scene(&assets, &render, 3).unwrap(); let stone = assets.registry.default_state("minecraft:stone").unwrap(); let water = assets.registry.default_state("minecraft:water").unwrap(); let mut state = assets.registry.state(water).unwrap().clone(); diff --git a/crates/horizon-client/src/game/trading.rs b/crates/horizon-client/src/game/trading.rs index ce389ac84..87e0c18c6 100644 --- a/crates/horizon-client/src/game/trading.rs +++ b/crates/horizon-client/src/game/trading.rs @@ -147,7 +147,7 @@ impl Game<'_> { variant: &str, origin: [f64; 3], ) -> Vec<MerchantOffer> { - let Some(sequence) = self.res.stations.trades.sequence(set) else { + let Some(sequence) = self.res.stations().trades.sequence(set) else { return Vec::new(); }; let mut random = self.rand_sequences.lend(&sequence, self.level.seed); @@ -160,15 +160,15 @@ impl Game<'_> { next_id: std::cell::Cell::new(next_map), }; let ctx = TradeContext { - items: &self.res.items, - enchantments: &self.res.stations.enchantments, + items: self.res.items(), + enchantments: &self.res.stations().enchantments, variant, origin, maps: Some(&maps), }; let offers = self .res - .stations + .stations() .trades .offers_from_set(&ctx, set, &mut random); let made = maps.made.into_inner(); @@ -205,7 +205,7 @@ impl Game<'_> { let profession = PROFESSIONS[m.extra.variant2 as usize % PROFESSIONS.len()]; let level = i32::from(m.extra.variant3.max(1)); let set = merchant::Trades::set_for(profession, level); - if self.res.stations.trades.sets.contains_key(&set) { + if self.res.stations().trades.sets.contains_key(&set) { self.offers_from_set(&set, &variant, origin) } else { Vec::new() @@ -284,7 +284,7 @@ impl Game<'_> { session.reputation = self.villager_reputation(id); session.hero = self.hero_amplifier(); for seq in merchant::Session::sequences_needed( - &self.res.stations.trades, + &self.res.stations().trades, &session.profession, level, ) { @@ -547,8 +547,8 @@ impl Game<'_> { m.focused, ); let offers = m.session.offers.clone(); - let costs: Vec<ItemStack> = offers.iter().map(|o| o.cost_a(&self.res.items)).collect(); - let atlas = &self.atlas; + let costs: Vec<ItemStack> = offers.iter().map(|o| o.cost_a(self.res.items())).collect(); + let atlas = &self.gui.atlas; batch.fill( atlas, 0.0, @@ -563,7 +563,7 @@ impl Game<'_> { r.v1 = r.v0 + 166.0 * dv; batch.rect_uv(ox + SHIFT, oy, 276.0, 166.0, r, u32::MAX); } - let e = &self.res.stations.enchantments; + let e = &self.res.stations().enchantments; let tr = |k: &str, f: &str| e.translate(k).unwrap_or(f).to_owned(); let name = custom.unwrap_or_else(|| { if progress { @@ -687,7 +687,7 @@ impl Game<'_> { } else { "gui/sprites/widget/button" }; - batch.sprite_scaled(&self.atlas, sprite, bx, by, 88.0, 20.0, u32::MAX); + batch.sprite_scaled(&self.gui.atlas, sprite, bx, by, 88.0, 20.0, u32::MAX); let y = oy + 16.0 + 1.0 + 20.0 * row as f32 + 2.0; let base = offer.base_cost_a.stack.clone(); let cost_a = costs[index].clone(); @@ -705,7 +705,7 @@ impl Game<'_> { x, y, ); - let atlas = &self.atlas; + let atlas = &self.gui.atlas; let t = base.count.to_string(); batch.text( atlas, @@ -740,7 +740,7 @@ impl Game<'_> { "trade_arrow" }; batch.sprite( - &self.atlas, + &self.gui.atlas, &format!("gui/sprites/container/villager/{arrow}"), ox + SHIFT + 60.0, y + 3.0, @@ -770,7 +770,7 @@ impl Game<'_> { if let Some(slot) = self.slot_at(batch, self.cursor.0, self.cursor.1) { let (sx, sy) = self.slot_position(slot); batch.fill( - &self.atlas, + &self.gui.atlas, ox + sx, oy + sy, 16.0, @@ -794,7 +794,7 @@ impl Game<'_> { } else if deprecated { let text = self .res - .stations + .stations() .enchantments .translate("merchant.deprecated") .unwrap_or("Villagers restock up to two times per day.") diff --git a/crates/horizon-client/src/game/trident.rs b/crates/horizon-client/src/game/trident.rs index 0dee8d22a..b24f4540e 100644 --- a/crates/horizon-client/src/game/trident.rs +++ b/crates/horizon-client/src/game/trident.rs @@ -98,7 +98,7 @@ impl Game<'_> { } let max = self .res - .items + .items() .get(&stack.item) .map_or(250, |i| i.max_damage); let riptide = stack.enchantment_level("minecraft:riptide") > 0; @@ -117,7 +117,7 @@ impl Game<'_> { p.position.y.floor() as i32, p.position.z.floor() as i32, ); - let water = self.res.facts.get(self.world.block(x, y, z)).fluid + let water = self.res.facts().get(self.world.block(x, y, z)).fluid == horizon_client::blocks::Fluid::Water; let sky = self.world.light(x, y + 1, z) >> 4 == 15; water || (self.world.weather.raining && sky) @@ -372,6 +372,7 @@ impl Game<'_> { return; }; let Some(uv) = self + .gui .atlas .sprites .get("entity/trident/trident") diff --git a/crates/horizon-client/src/game/tweaks.rs b/crates/horizon-client/src/game/tweaks.rs index f15aa9ea7..681368cab 100644 --- a/crates/horizon-client/src/game/tweaks.rs +++ b/crates/horizon-client/src/game/tweaks.rs @@ -323,7 +323,7 @@ impl Game<'_> { /// The sort buttons: a bordered square with three bars, lighter under /// the cursor. pub(super) fn draw_sort_buttons(&self, batch: &mut HudBatch, ox: f32, oy: f32) { - let atlas = &self.atlas; + let atlas = &self.gui.atlas; for ((x, y), _) in self.sort_buttons() { let (x, y) = (ox + x, oy + y); let (cx, cy) = self.cursor; diff --git a/crates/horizon-client/src/game/villagers.rs b/crates/horizon-client/src/game/villagers.rs index 72fa2839a..5c6bed394 100644 --- a/crates/horizon-client/src/game/villagers.rs +++ b/crates/horizon-client/src/game/villagers.rs @@ -40,7 +40,7 @@ impl Game<'_> { .position(|m| m.id == id && m.species() == Species::Villager) } fn item_max_stack(&self, item: &str) -> u32 { - self.res.items.get(item).map_or(64, |i| i.max_stack) + self.res.items().get(item).map_or(64, |i| i.max_stack) } /// `BehaviorUtils.throwItem`: toss a stack from a villager's hand toward /// a point. @@ -57,7 +57,7 @@ impl Game<'_> { return; }; let now = self.world.game_time; - let items = &self.res.items; + let items = self.res.items(); let meeting = villager::meet(&mut self.mobs, ia, ib, now, |item| { items.get(item).map_or(64, |i| i.max_stack) }); @@ -121,13 +121,13 @@ impl Game<'_> { for _ in 0..=12 { y -= 1; let here = self.world.block(x, y, z); - let f = self.res.facts.get(here); - let above_f = self.res.facts.get(above); - let air_or_liquid = self.res.facts.is_air(above) + let f = self.res.facts().get(here); + let above_f = self.res.facts().get(above); + let air_or_liquid = self.res.facts().is_air(above) || above_f.fluid != horizon_client::blocks::Fluid::None; - let solid = self.res.mob_data.state(here).flags & horizon_client::mobs::data::SOLID - != 0 - || f.name.as_ref() == "minecraft:powder_snow"; + let solid = + self.res.mob_data().state(here).flags & horizon_client::mobs::data::SOLID != 0 + || f.name.as_ref() == "minecraft:powder_snow"; if golem_floor_ok(&f.name) && air_or_liquid && solid { found = Some(y + 1); break; @@ -137,7 +137,7 @@ impl Game<'_> { let Some(y) = found else { continue }; // IronGolem.checkSpawnRules: a floor and three free blocks. let free = |g: &Self, yy: i32| { - g.res.mob_data.state(g.world.block(x, yy, z)).flags + g.res.mob_data().state(g.world.block(x, yy, z)).flags & horizon_client::mobs::data::VALID_EMPTY_SPAWN != 0 }; @@ -260,7 +260,7 @@ impl Game<'_> { } let picks_up = self .res - .items + .items() .item_tags .get("minecraft:villager_picks_up") .cloned(); diff --git a/crates/horizon-client/src/game/wandering_trader.rs b/crates/horizon-client/src/game/wandering_trader.rs index b336cdf0b..d42ac662f 100644 --- a/crates/horizon-client/src/game/wandering_trader.rs +++ b/crates/horizon-client/src/game/wandering_trader.rs @@ -126,14 +126,14 @@ impl Game<'_> { } let biome = self.world.chunks.get(&(pos[0] >> 4, pos[2] >> 4)).map(|c| { self.res - .biomes + .biomes() .get(c.biome(pos[0], pos[1], pos[2])) .name .clone() }); if biome.is_some_and(|b| { self.res - .mob_data + .mob_data() .biome_has("minecraft:without_wandering_trader_spawns", &b) }) { return false; @@ -214,7 +214,7 @@ impl Game<'_> { (0..=1).all(|dz| { !self .res - .facts + .facts() .get(self.world.block(pos[0] + dx, pos[1] + dy, pos[2] + dz)) .full_collision }) @@ -230,7 +230,7 @@ impl Game<'_> { continue; } for y in (from[1] - range).max(horizon_client::chunk::MIN_Y)..=from[1] + range { - if &*self.res.facts.get(self.world.block(x, y, z)).name != "minecraft:bell" { + if &*self.res.facts().get(self.world.block(x, y, z)).name != "minecraft:bell" { continue; } let d = (x - from[0]).pow(2) + (y - from[1]).pow(2) + (z - from[2]).pow(2); diff --git a/crates/horizon-client/src/game/wind.rs b/crates/horizon-client/src/game/wind.rs index 07759944f..355b5b877 100644 --- a/crates/horizon-client/src/game/wind.rs +++ b/crates/horizon-client/src/game/wind.rs @@ -141,7 +141,7 @@ impl Game<'_> { fn wind_positions(&mut self, center: [f64; 3], radius: f32) -> Vec<[i32; 3]> { let stops = self .res - .items + .items() .block_tags .get("minecraft:blocks_wind_charge_explosions") .cloned() @@ -176,7 +176,7 @@ impl Game<'_> { } let name = &self .res - .facts + .facts() .get(self.world.block(pos[0], pos[1], pos[2])) .name; if stops.contains(&**name) { @@ -402,7 +402,7 @@ impl Game<'_> { /// buttons, levers and bells react as if used; candles go out. fn wind_trigger_block(&mut self, pos: [i32; 3]) -> Result<()> { let state = self.world.block(pos[0], pos[1], pos[2]); - let name = self.res.facts.get(state).name.clone(); + let name = self.res.facts().get(state).name.clone(); let prop = |game: &Self, key: &str| { game.pack .assets @@ -478,6 +478,7 @@ impl Game<'_> { }); let Some(model) = model else { return }; let Some(r) = self + .gui .atlas .sprites .get("entity/projectiles/wind_charge") diff --git a/crates/horizon-client/src/game/wither.rs b/crates/horizon-client/src/game/wither.rs index dfd215814..7b86dc527 100644 --- a/crates/horizon-client/src/game/wither.rs +++ b/crates/horizon-client/src/game/wither.rs @@ -10,14 +10,22 @@ use horizon_client::{ impl Game<'_> { fn is_wither_skull(&self, p: [i32; 3]) -> bool { - let name = &*self.res.facts.get(self.world.block(p[0], p[1], p[2])).name; + let name = &*self + .res + .facts() + .get(self.world.block(p[0], p[1], p[2])) + .name; matches!( name, "minecraft:wither_skeleton_skull" | "minecraft:wither_skeleton_wall_skull" ) } fn is_soul_base(&self, p: [i32; 3]) -> bool { - let name = &*self.res.facts.get(self.world.block(p[0], p[1], p[2])).name; + let name = &*self + .res + .facts() + .get(self.world.block(p[0], p[1], p[2])) + .name; matches!(name, "minecraft:soul_sand" | "minecraft:soul_soil") } /// After a wither skeleton skull is placed: the T of soul sand (or soul @@ -36,7 +44,7 @@ impl Game<'_> { && self.is_soul_base(at(1, 2)) && [0, 2].iter().all(|&c| { let p = at(c, 2); - self.res.facts.is_air(self.world.block(p[0], p[1], p[2])) + self.res.facts().is_air(self.world.block(p[0], p[1], p[2])) }); if !ok { continue; diff --git a/crates/horizon-client/src/mesher.rs b/crates/horizon-client/src/mesher.rs index 5e657e82c..2a4efd592 100644 --- a/crates/horizon-client/src/mesher.rs +++ b/crates/horizon-client/src/mesher.rs @@ -7,7 +7,7 @@ mod facing; mod fluid; mod lighting; use crate::{ - assets::Assets, + assets::{Assets, RenderAssets}, biome::Biomes, blocks::{BlockFacts, RenderShape}, chunk::{Chunk, MIN_Y}, @@ -302,18 +302,19 @@ fn redstone_color(power: u8) -> u32 { impl MeshTables { pub fn new( assets: &Assets, + render: &RenderAssets, facts: &BlockFacts, visibility: FaceVisibility, ) -> crate::Result<Self> { // Terrain vertices keep the sprite layer below `OPAQUE_LAYER`. - let layers = assets.sprite_layers.values().max().map_or(0, |l| l + 1); + let layers = render.sprite_layers.values().max().map_or(0, |l| l + 1); if layers > u32::from(OPAQUE_LAYER) { return Err( format!("{layers} block sprites, terrain vertices index {OPAQUE_LAYER}").into(), ); } let layer = |name: &str| -> crate::Result<u16> { - assets + render .sprite_layers .get(name) .map(|&l| l as u16) @@ -638,6 +639,7 @@ pub struct Mesher<'a> { /// CardinalLighting.NETHER: brighter up/down faces. pub nether_shading: bool, pub assets: &'a Assets, + pub render: &'a RenderAssets, pub tables: &'a MeshTables, pub biomes: &'a Biomes, pub visibility: FaceVisibility, @@ -707,7 +709,7 @@ impl Mesher<'_> { continue; } let world = BlockPos::new(center.x * 16 + x, base_y + y, center.z * 16 + z); - let Ok(models) = self.assets.model_catalog.collect(BlockStateId(id), world) + let Ok(models) = self.render.model_catalog.collect(BlockStateId(id), world) else { continue; }; diff --git a/crates/horizon-client/src/mesher/leaf_culling_tests.rs b/crates/horizon-client/src/mesher/leaf_culling_tests.rs index 9369a1ba2..679b19090 100644 --- a/crates/horizon-client/src/mesher/leaf_culling_tests.rs +++ b/crates/horizon-client/src/mesher/leaf_culling_tests.rs @@ -9,9 +9,10 @@ fn leaf_culling_removes_only_internal_leaf_and_root_faces() { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let facts = BlockFacts::load(&root, assets.registry).unwrap(); let visibility = crate::models::load_visibility(&root, assets.registry).unwrap(); - let tables = MeshTables::new(&assets, &facts, visibility.clone()).unwrap(); + let tables = MeshTables::new(&assets, &render, &facts, visibility.clone()).unwrap(); let biomes = Biomes::load(&root).unwrap(); let state = |name| assets.registry.default_state(name).unwrap().0; let oak = state("minecraft:oak_leaves"); @@ -31,6 +32,7 @@ fn leaf_culling_removes_only_internal_leaf_and_root_faces() { Mesher { nether_shading: false, assets: &assets, + render: &render, tables: &tables, biomes: &biomes, visibility: visibility.clone(), @@ -49,7 +51,7 @@ fn leaf_culling_removes_only_internal_leaf_and_root_faces() { // preserving every other quad and its full vertex attributes. let without_face = |at: [i32; 3], id, direction| { let vertices = mesh(&[(at, id)], false, true); - let models = assets + let models = render .model_catalog .collect(BlockStateId(id), BlockPos::new(at[0], at[1], at[2])) .unwrap(); diff --git a/crates/horizon-client/src/motion.rs b/crates/horizon-client/src/motion.rs index 05806f93e..293aa61a2 100644 --- a/crates/horizon-client/src/motion.rs +++ b/crates/horizon-client/src/motion.rs @@ -2059,9 +2059,10 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); - let mut scene = World::test_scene(&assets, 1).unwrap(); + let mut scene = World::test_scene(&assets, &render, 1).unwrap(); let entities = [Aabb::new( Vec3::new(10.0, 80.0, 10.0), Vec3::new(14.0, 84.0, 14.0), @@ -2129,10 +2130,11 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); let run = |name: &str, spectator: bool| { - let mut scene = World::test_scene(&assets, 2).unwrap(); + let mut scene = World::test_scene(&assets, &render, 2).unwrap(); let state = assets.registry.default_state(name).unwrap(); for x in 19..=23 { for y in 10..=17 { @@ -2368,10 +2370,11 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); for wet in [false, true] { - let mut scene = World::test_scene(&assets, 2).unwrap(); + let mut scene = World::test_scene(&assets, &render, 2).unwrap(); if wet { let water = assets.registry.default_state("minecraft:water").unwrap(); for x in 19..=21 { @@ -2414,9 +2417,10 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); - let mut scene = World::test_scene(&assets, 3).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 4.0, 20.5)).unwrap(); let water = assets.registry.default_state("minecraft:water").unwrap(); for x in 19..=21 { @@ -2668,9 +2672,10 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); - let mut scene = World::test_scene(&assets, 3).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); let water = assets.registry.default_state("minecraft:water").unwrap(); for y in 4..=6 { scene.set(20, y, 20, water).unwrap(); @@ -2740,10 +2745,11 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); for name in ["minecraft:lava", "minecraft:water"] { - let mut scene = World::test_scene(&assets, 3).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); let fluid = assets.registry.default_state(name).unwrap(); scene.set(20, 4, 20, fluid).unwrap(); let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 4.0, 20.5)).unwrap(); @@ -2791,9 +2797,10 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); - let mut scene = World::test_scene(&assets, 3).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); let water = assets.registry.default_state("minecraft:water").unwrap(); scene.set(20, 4, 20, water).unwrap(); scene.set(20, 5, 20, water).unwrap(); @@ -2860,10 +2867,11 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); + let render = assets.reload(&root).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); for (water_level, lava_level, ground_jump) in [(0, 6, true), (6, 0, false)] { - let mut scene = World::test_scene(&assets, 3).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); for (name, level, x) in [ ("minecraft:water", water_level, 20), ("minecraft:lava", lava_level, 21), @@ -2908,7 +2916,8 @@ mod tests { return; } let assets = Assets::load(&root).unwrap(); - let mut scene = World::test_scene(&assets, 3).unwrap(); + let render = assets.reload(&root).unwrap(); + let mut scene = World::test_scene(&assets, &render, 3).unwrap(); let binding = crate::collisions::load(&root, assets.registry).unwrap(); let resources = MotionResources::load(&root, &assets).unwrap(); let mut player = PlayerMotion::new(&resources, Vec3::new(20.5, 4.0, 20.5)).unwrap(); diff --git a/crates/horizon-client/src/streaming.rs b/crates/horizon-client/src/streaming.rs index e82faa908..1a592e21b 100644 --- a/crates/horizon-client/src/streaming.rs +++ b/crates/horizon-client/src/streaming.rs @@ -335,6 +335,7 @@ impl GenerationScan { } pub struct WorkerContext { pub assets: Arc<crate::assets::Assets>, + pub render: Arc<crate::assets::RenderAssets>, pub tables: Arc<MeshTables>, pub biomes: Arc<crate::biome::Biomes>, pub light: Arc<LightTables>, @@ -424,6 +425,7 @@ impl Streaming { cutout_leaves: settings.cutout_leaves, cull_leaves: settings.cull_leaves, assets: &context.assets, + render: &context.render, tables: &context.tables, biomes: &context.biomes, visibility, diff --git a/crates/horizon-client/src/telemetry.rs b/crates/horizon-client/src/telemetry.rs index 9e83655fa..d0140f941 100644 --- a/crates/horizon-client/src/telemetry.rs +++ b/crates/horizon-client/src/telemetry.rs @@ -3,6 +3,7 @@ //! summary, in the outbox. It never sends anything itself: the launcher does, at its next start. //! Without the player's yes for that kind nothing is kept, and crash-reports/ stays local. use std::path::Path; +use std::sync::atomic::{AtomicU32, Ordering}; use std::sync::{Mutex, OnceLock}; use std::time::Instant; @@ -18,6 +19,11 @@ const MIN_SECONDS: f32 = 60.0; const CRASH_DETAILS: [&str; 3] = ["Horizon Version", "Graphics Adapter", "Render Settings"]; static STARTED: OnceLock<Instant> = OnceLock::new(); +/// When the menu bundle became ready, so the time to the title screen measures +/// the menu and not the world bundle loaded behind it. +static UI_READY_MS: AtomicU32 = AtomicU32::new(u32::MAX); +static CORE_READY_MS: AtomicU32 = AtomicU32::new(u32::MAX); +static REST_READY_MS: AtomicU32 = AtomicU32::new(u32::MAX); /// The GPU's name, driver and backend, once the renderer has its adapter. static GPU: Mutex<Option<(String, String, String)>> = Mutex::new(None); @@ -26,6 +32,34 @@ pub fn mark_start() { STARTED.get_or_init(Instant::now); } +/// The menu bundle is ready: the title backdrop can draw. The first writer wins. +pub fn mark_ui_ready() { + if let Some(started) = STARTED.get() { + let ms = started.elapsed().as_millis() as u32; + let _ = UI_READY_MS.compare_exchange(u32::MAX, ms, Ordering::Relaxed, Ordering::Relaxed); + } +} + +pub fn mark_core_ready() { + mark_ready(&CORE_READY_MS); +} + +pub fn mark_rest_ready() { + mark_ready(&REST_READY_MS); +} + +fn mark_ready(mark: &AtomicU32) { + if let Some(started) = STARTED.get() { + let ms = started.elapsed().as_millis().min(u128::from(u32::MAX - 1)) as u32; + let _ = mark.compare_exchange(u32::MAX, ms, Ordering::Relaxed, Ordering::Relaxed); + } +} + +fn readiness_ms(mark: &AtomicU32) -> Option<u32> { + let ms = mark.load(Ordering::Relaxed); + (ms != u32::MAX).then_some(ms) +} + pub fn set_gpu(name: &str, driver: String, backend: String) { *GPU.lock().unwrap_or_else(|e| e.into_inner()) = Some((name.to_owned(), driver, backend)); } @@ -138,7 +172,12 @@ impl Session { pub fn title_shown(&mut self) { if !self.title_measured { self.title_measured = true; - self.to_title_ms = STARTED.get().map(|s| s.elapsed().as_millis() as u32); + let ui_ms = UI_READY_MS.load(Ordering::Relaxed); + self.to_title_ms = if ui_ms != u32::MAX { + Some(ui_ms) + } else { + STARTED.get().map(|s| s.elapsed().as_millis() as u32) + }; } } @@ -147,6 +186,11 @@ impl Session { self.opening.get_or_insert_with(Instant::now); } + /// An entry queued during startup was cancelled before opening a world. + pub fn cancel_world_opening(&mut self) { + self.opening = None; + } + /// A frame drawn while playing (not in menus or loading). pub fn frame(&mut self, ms: f32) { if let Some(opening) = self.opening.take() @@ -175,6 +219,8 @@ impl Session { peak_ram_mb: peak_ram_mb(), to_title_ms: self.to_title_ms, to_world_ms: self.to_world_ms, + to_core_ms: self.to_title_ms.and_then(|_| readiness_ms(&CORE_READY_MS)), + to_rest_ms: self.to_title_ms.and_then(|_| readiness_ms(&REST_READY_MS)), }) } @@ -377,6 +423,20 @@ mod tests { assert_eq!(pending[0].1.kind(), Kind::Crash); } + #[test] + fn cancelled_startup_entry_does_not_time_menu_browsing() { + let mut session = Session::default(); + session.world_opening(); + assert!(session.opening.is_some()); + session.cancel_world_opening(); + assert!(session.opening.is_none()); + session.frame(16.0); + assert!(session.to_world_ms.is_none()); + session.world_opening(); + session.frame(16.0); + assert!(session.to_world_ms.is_some()); + } + #[test] fn a_session_is_kept_only_with_consent_and_once_long_enough() { let home = home("session"); diff --git a/crates/horizon-client/src/world.rs b/crates/horizon-client/src/world.rs index 49e621f48..af7c1671b 100644 --- a/crates/horizon-client/src/world.rs +++ b/crates/horizon-client/src/world.rs @@ -183,7 +183,11 @@ impl World { } /// A controlled blockstate scene for the native scene probes: material /// layers, a stepped pyramid and the model gallery. Not generated terrain. - pub fn test_scene(assets: &crate::assets::Assets, radius: i32) -> crate::Result<Self> { + pub fn test_scene( + assets: &crate::assets::Assets, + render: &crate::assets::RenderAssets, + radius: i32, + ) -> crate::Result<Self> { let air = assets .registry .default_state("minecraft:air") @@ -228,7 +232,7 @@ impl World { } } } - for (position, state) in &assets.model_placements { + for (position, state) in &render.model_placements { world.set(position.x, position.y, position.z, *state)?; } world.revision = 0; diff --git a/crates/horizon-client/tests/generation_saves.rs b/crates/horizon-client/tests/generation_saves.rs index 26da11efe..ce91a1096 100644 --- a/crates/horizon-client/tests/generation_saves.rs +++ b/crates/horizon-client/tests/generation_saves.rs @@ -170,13 +170,15 @@ fn chunks_left_behind_keep_their_decoration() { return; }; let assets = Arc::new(Assets::load(&root).unwrap()); + let render = Arc::new(assets.reload(&root).unwrap()); let facts = BlockFacts::load(&root, assets.registry).unwrap(); let visibility = models::load_visibility(&root, assets.registry).unwrap(); let context = Arc::new(WorkerContext { - tables: Arc::new(MeshTables::new(&assets, &facts, visibility).unwrap()), + tables: Arc::new(MeshTables::new(&assets, &render, &facts, visibility).unwrap()), light: Arc::new(LightTables::load(&root, assets.registry, &facts).unwrap()), biomes: Arc::new(Biomes::load(&root).unwrap()), assets, + render: render.clone(), }); let generator = Arc::new(Recorder::default()); let mut session = Session::new(generator.clone(), context.clone()); diff --git a/crates/horizon-client/tests/streaming_meshes.rs b/crates/horizon-client/tests/streaming_meshes.rs index 3c76b3e89..3aa30a330 100644 --- a/crates/horizon-client/tests/streaming_meshes.rs +++ b/crates/horizon-client/tests/streaming_meshes.rs @@ -55,13 +55,15 @@ fn columns_loaded_past_the_render_distance_mesh_when_they_come_in_range() { return; }; let assets = Arc::new(Assets::load(&root).unwrap()); + let render = Arc::new(assets.reload(&root).unwrap()); let facts = BlockFacts::load(&root, assets.registry).unwrap(); let visibility = models::load_visibility(&root, assets.registry).unwrap(); let context = Arc::new(WorkerContext { - tables: Arc::new(MeshTables::new(&assets, &facts, visibility).unwrap()), + tables: Arc::new(MeshTables::new(&assets, &render, &facts, visibility).unwrap()), light: Arc::new(LightTables::load(&root, assets.registry, &facts).unwrap()), biomes: Arc::new(Biomes::load(&root).unwrap()), assets, + render: render.clone(), }); let mut streaming = Streaming::new(Arc::new(Saved), context, 3); streaming.radius = 4; @@ -135,13 +137,15 @@ fn relit_columns_keep_every_mesh_current() { return; }; let assets = Arc::new(Assets::load(&root).unwrap()); + let render = Arc::new(assets.reload(&root).unwrap()); let facts = BlockFacts::load(&root, assets.registry).unwrap(); let visibility = models::load_visibility(&root, assets.registry).unwrap(); let context = Arc::new(WorkerContext { - tables: Arc::new(MeshTables::new(&assets, &facts, visibility).unwrap()), + tables: Arc::new(MeshTables::new(&assets, &render, &facts, visibility).unwrap()), light: Arc::new(LightTables::load(&root, assets.registry, &facts).unwrap()), biomes: Arc::new(Biomes::load(&root).unwrap()), assets: assets.clone(), + render: render.clone(), }); let state = |name: &str| assets.registry.default_state(name).unwrap().0; let (stone, glowstone, torch) = ( @@ -211,6 +215,7 @@ fn relit_columns_keep_every_mesh_current() { cutout_leaves: true, cull_leaves: false, assets: &context.assets, + render: &context.render, tables: &context.tables, biomes: &context.biomes, visibility: context.tables.visibility.clone(), diff --git a/crates/horizon-telemetry/src/payload.rs b/crates/horizon-telemetry/src/payload.rs index 1429a7116..2ed0ba88d 100644 --- a/crates/horizon-telemetry/src/payload.rs +++ b/crates/horizon-telemetry/src/payload.rs @@ -179,6 +179,10 @@ pub struct Perf { /// From start to the title screen. #[serde(skip_serializing_if = "Option::is_none")] pub to_title_ms: Option<u32>, + #[serde(skip_serializing_if = "Option::is_none")] + pub to_core_ms: Option<u32>, + #[serde(skip_serializing_if = "Option::is_none")] + pub to_rest_ms: Option<u32>, /// From choosing a world to playing in it, the first time this session. #[serde(skip_serializing_if = "Option::is_none")] pub to_world_ms: Option<u32>, diff --git a/docs/performance/startup-stage-3.md b/docs/performance/startup-stage-3.md new file mode 100644 index 000000000..28013e87c --- /dev/null +++ b/docs/performance/startup-stage-3.md @@ -0,0 +1,39 @@ +# Progressive world resources (#712) + +Stage 3a changes shared resource storage and accessors. Pack resources keep their existing per-game ownership for pack reloads. Stage 3b publishes core before the simulation tail, builds the real renderer using the previous device after releasing its surface, and gates backdrop streaming on that renderer. Stage 3c queues an early Play or Connect action and draws the existing level-loading progress screen while polling the worker each event-loop turn. Close and resize events continue to work. After the worker completes, the queued local/server action resumes; integrated servers receive the resource handle only after that join. The synchronous harness and dedicated path returns only fully loaded resources. + +Startup logs distinguish `core-ready`, `world renderer ready`, `starting title backdrop`, and `rest-ready`. Opt-in performance summaries carry `to_core_ms` and `to_rest_ms` separately from the existing UI-driven `to_title_ms`. Loader failures and panics propagate to the client; a tail taking more than 120 seconds fails rather than waiting indefinitely. + +## Stage 3d: interactive menu before core + +An ordinary launch now owns a `StartupMenu` inside `Loading`. The first menu atlas and panorama message makes the existing title screens interactive; assets, facts, biomes, pack tables, collision and motion continue on the resource worker. Pack-overlay and mod-content preparation also run on that worker. The live landscape still starts only after the core renderer exists. + +World browsing, world creation, server address entry and options use the existing title/options widgets. Play and Connect queue a `PendingWorldEntry`; the progress screen covers both the core and tail waits. Escape cancels the queued entry in either phase. Close and resize continue to work. The handoff transfers the title object, options screen, settings, cursor, clipboard selection, timing session and pending action instead of rebuilding the user's screen. + +Pack changes during core loading request another loader generation. The old core and tail finish before replacement begins so cache writes and tail registry initialization cannot overlap. Each generation has its own message channel and progress counter. Language/GUI metadata publication stays on the event-loop thread, using the current language selection rather than the worker's stale settings snapshot. Pack changes after the core handoff also wait for the tail before touching mob metadata. + +The menu still needs its own artwork and renderer before interaction. The core handoff still builds the full renderer and starts audio on the main thread; menu click sounds and controller navigation start with `Game`. This stage does not change synchronous harness/dedicated startup or introduce a render-facts export. + +Regression coverage publishes menu artwork while a fake core worker is blocked, edits a world draft, replaces fallback artwork without losing it, queues entry and draws progress, and checks that loader failure reaches the app. Additional checks cover server identity and cancelled-entry timing. + +## Render facts assessment + +`MeshTables::new` reads names, registry properties, class membership, collision shape flags, fluid and render properties from `BlockFacts`. `LightTables::new/load` reads emission, dampening, occlusion and shape-occlusion flags; geometry comes from `occlusion.nbt`. Neither table needs recipes, item data, AI or the other tail tables. + +A render subset is possible, but the current facts decoder also validates registry order and builds the gameplay projection from the same document. Meshing additionally depends on class chains from `block-behaviours.json`. Avoiding the 54 MB read requires an exported render-facts artifact (and its prepare/cache/version checks), or another decoder plus a second full read at world entry. This is beyond a cheap startup ownership change. Stage 4 can add that artifact and compare the resulting mesh/light tables against the full loader before moving facts out of core. + +## Measurement + +Measurements on this machine are warm runs with `HORIZON_NO_AUDIO=1`. Other compilation and parity jobs were running, so elapsed times are diagnostic rather than a controlled benchmark. + +Before phasing (3a, `42d65465`), `--offscreen --frames 3 --smoke-report` completed successfully with peak RSS 762,536 KiB. The report contained 3 frames, no chunks, no generated or meshed sections, no player, and no error. This is the synchronous harness path; the progressive path is measured separately after 3c. + +After phasing, the same warm three-frame synchronous smoke completed successfully with peak RSS 774,080 KiB, up 11,544 KiB (1.5%) from the 3a measurement. Both reports had 3 frames, no chunks, no generated or meshed sections, no player, and no error. Elapsed time is intentionally excluded from the comparison because the machine was running concurrent builds. + +The progressive checks used an overlay of the prepared resources with `mob-data.json` replaced by a FIFO. This holds WorldRest without a production delay hook. Core and the real renderer became ready, Options → Video opened, and the backdrop logged `title backdrop ready; world rest ready: false` before the FIFO was released. In an unblocked Horizon launch, core was ready at 4,776 ms, the renderer at 5,260 ms, and rest at 6,282 ms under compilation load. Backdrop generation and fade-in still take their own time; these marks measure bundle readiness separately. + +A direct singleplayer launch while the FIFO was held displayed `Loading items` and handled a window resize. Releasing the FIFO resumed entry; the run exited cleanly with a player, 85 chunks, 529 meshed sections and no error. That delayed-entry run peaked at 1,142,560 KiB, including the loaded world. Integrated-server entry also joined after release and rendered a world. Dedicated startup reached `Done`, handled `list` and `stop`, saved and exited with status 0 without constructing a renderer. + +The full parity selection against `origin/main` also includes the unmerged Stage 2 ancestors (313 harnesses). The local run was bounded at 30 minutes; its log recorded passes for `active_effects`, `active_effect_tick` and `anchor`. The remainder needs CI or a longer dedicated run. The client Rust tests, focused startup probes and memory measurements are separate from that incomplete parity run. + +Progressive-title RSS was measured separately with audio disabled, render distance 4 and a 30 FPS cap, using separate temporary game directories. The first 30-second pair measured 1,055,132 KiB before and 1,721,772 KiB after. A warm 60-second repeat in reverse order measured 1,031,948 KiB before and 1,145,776 KiB after: an increase of 113,828 KiB (about 111 MiB, 11%). These launches ran during compilation and did not advance through startup/streaming identically. They establish a memory cost to investigate, not a claim of RSS parity; a quiet-machine cold/warm comparison remains needed before merging the stack.