Build the game in Game::new instead of inside run()

run() loads the shared resources and the pack, then hands them to a
constructor that builds a game with no world open. The same constructor will
build an integrated server's game on its own thread. The struct literal moves
unchanged; Options derives Clone so a server can start from the client's.

No behaviour change.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Ludovic Marie
2026-10-16 17:04:10 +02:00
parent c57c409f40
commit c2f4ecc188
+319 -302
View File
@@ -203,6 +203,7 @@ use winit::{
window::{CursorGrabMode, Window, WindowId},
};
#[derive(Clone)]
struct Options {
resources: PathBuf,
distance: i32,
@@ -9779,6 +9780,323 @@ fn load_forcefield(root: &std::path::Path) -> (u32, u32, Vec<u8>) {
.filter(|(w, h, _)| w == h && w.is_power_of_two())
.unwrap_or((1, 1, vec![0; 4]))
}
impl<'a> Game<'a> {
/// A game with no world open, over the loaded resources: the window's,
/// or an integrated server's on its own thread.
fn new(
res: &'a Arc<Resources>,
pack: PackResources,
atlas: HudAtlas,
options: Options,
settings: Settings,
audio: Audio,
) -> Result<Self> {
let root = options.resources.clone();
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)?),
pack.context.clone(),
1,
);
streaming.paused = true;
let level = Level::default();
let save = Arc::new(SaveDir::new(
std::env::current_dir()?
.join("saves")
.join(".horizon-title"),
));
// These batches share the exported document instead of reparsing it per layer.
let (armor_stand_assets, boat_models, cart_models) = {
let document = horizon_client::mobs::EntityModelDocument::load(&root).ok();
(
armor_stands::ArmorStandAssets::load(&root, document.as_ref()),
boats::BoatModels::load(document.as_ref()),
minecarts::CartModels::load(document.as_ref()),
)
};
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);
Ok(Game {
res: res.clone(),
collision: &res.collision,
motion: &res.motion,
pack,
atlas,
fog: Default::default(),
screen_fx: Default::default(),
world,
streaming,
options,
player: None,
spawn: None,
clock: FixedStep::default(),
previous_position: Vec3::ZERO,
eye: 1.62,
previous_eye: 1.62,
yaw: look.map_or(level.rotation[0], |l| l.0),
pitch: look.map_or(level.rotation[1], |l| l.1),
inventory,
selected: 0,
carried: None,
craft_grid: vec![None; 9],
craft_size: 2,
inv_drag: None,
tweaks: Default::default(),
inv_clicks: Default::default(),
last_inv_click: None,
last_quick_moved: None,
container: None,
station: None,
potions: Default::default(),
scratch_slot: None,
mining: None,
destroy_delay: 0,
use_delay: 0,
creative,
mode: if creative {
horizon_client::command::args::GameMode::Creative
} else {
horizon_client::command::args::GameMode::Survival
},
keys: HashSet::new(),
physical_keys: HashSet::new(),
left: false,
right: false,
cursor: (0.0, 0.0),
captured: false,
focused: true,
modifiers: winit::keyboard::ModifiersState::empty(),
fullscreen: horizon_client::window::FullscreenState::new(false),
shader_packs: Default::default(),
mouse: MouseLook::default(),
agent_pointer: false,
smooth_camera: false,
toggles: Default::default(),
was_playing: false,
pause: false,
debug: false,
screen: Screen::Playing,
window: None,
renderer: None,
entity_vertices: Vec::new(),
see_through_vertices: Vec::new(),
health_hud: hud_layout::HealthHud::default(),
started: now,
previous: now,
last_input: now,
pad: Default::default(),
frames: 0,
world_frames: 0,
fps: 0.0,
fps_frames: 0,
fps_at: now,
ticks: 0,
error: None,
message: None,
save,
level,
session_lock: None,
audio,
music: Default::default(),
ambience: Default::default(),
sound_paused: false,
cart_sounds: HashSet::new(),
riding_cart_sounds: None,
dropped: Vec::new(),
next_entity: 0,
particles,
pickups: Default::default(),
sign_edit: None,
book: None,
lectern_pulses: Vec::new(),
loading_progress: 0.0,
spawn_origin: None,
spawn_spiral: Default::default(),
player_spawn: None,
mobs: Vec::new(),
creatures: Default::default(),
sculk: Default::default(),
raiding: Default::default(),
attack_ticks: 100,
last_hurt_by_player: HashSet::new(),
died: HashSet::new(),
be_anims: {
let mut anims = horizon_client::block_entity_anim::BlockEntityAnims::default();
anims.classify(registry);
anims
},
using: None,
view: Default::default(),
limiter: horizon_client::window::FramerateLimiter::new(0),
frame_clock: Default::default(),
scope_scale: 0.5,
frame_ticks: 0.0,
title: None,
armor: [None, None, None, None],
offhand: None,
hand: Hand::Main,
shield_cooldown: 0,
command_source: None,
titles: Default::default(),
tool_highlight: Default::default(),
applied_modifiers: Vec::new(),
experience: Experience::default(),
orbs: Vec::new(),
xp_delay: 0,
last_level_up: 0,
swing: Default::default(),
swings_started: 0,
heights: Default::default(),
sway: Default::default(),
visible_hands: [(0, None), (0, None)],
clicks: Default::default(),
attack_clicks: 0,
hand_strength: Default::default(),
settings,
options_from_title: false,
backdrop: Default::default(),
pause_since: None,
dragging: false,
avatar: Default::default(),
flash: 0,
sleeping: None,
dim: Dim::Overworld,
world_root: PathBuf::new(),
travelling: None,
portals: Default::default(),
end_travel: false,
respawn_config: None,
respawn_travel: None,
end_portal_travel: false,
end: Default::default(),
block_ticks: Ticks::new(0),
tick_chunks: Default::default(),
random_tick_sections: Default::default(),
level_events: Vec::new(),
falling: Vec::new(),
paintings: Vec::new(),
painting_variants: paintings::PaintingVariants::load(&root),
item_frames: Vec::new(),
frame_model: frames::bake_frame(&root, "item_frame"),
glow_frame_model: frames::bake_frame(&root, "glow_item_frame"),
map_frame_model: frames::bake_frame(&root, "item_frame_map"),
glow_map_frame_model: frames::bake_frame(&root, "glow_item_frame_map"),
armor_stands: Vec::new(),
others: Vec::new(),
armor_stand_assets,
boats: Vec::new(),
boat_models,
crystal_model: horizon_client::mobs::load_model(&root, "minecraft:end_crystal#main"),
carts: Vec::new(),
jukebox_sounds: HashMap::new(),
bolts: Vec::new(),
maps: maps::Maps::default(),
fight: dragon::Fight::default(),
dragon: None,
crystals: Vec::new(),
dragon_fireballs: Vec::new(),
breath_clouds: Vec::new(),
dragon_model: horizon_client::mobs::load_model(&root, "minecraft:ender_dragon#main"),
map_patches: Vec::new(),
skin_downloads: horizon_client::skins::Downloader::new(
std::env::current_dir()
.unwrap_or_default()
.join("assets/skins"),
),
skin_slots: Vec::new(),
cart_models,
riding: None,
ender_items: vec![None; 27],
ender_open: None,
pending: Default::default(),
spill: Default::default(),
recipe_ui: Default::default(),
mount_menu: Default::default(),
hook: None,
tridents: Vec::new(),
rockets: Vec::new(),
ominous_spawners: Vec::new(),
creaking: Default::default(),
spawners: Default::default(),
trident_model: horizon_client::mobs::load_model(&root, "minecraft:trident#main"),
arrow_model: horizon_client::mobs::load_model(&root, "minecraft:arrow#main"),
tnts: Vec::new(),
hoppers: HashMap::new(),
creative_screen: Creative::load(&root)?,
control: None,
frame_stats: Default::default(),
perf: Default::default(),
pending_screenshot: None,
pending_bench: None,
flight: None,
ui_wait: Default::default(),
events: Default::default(),
agent: agent::Agent::default(),
view_frustum: None,
entity_culler: None,
pending_uploads: Vec::new(),
frame_graph: Default::default(),
extras: Default::default(),
mods: Default::default(),
sky_darken_memo: Default::default(),
persist: Default::default(),
remote: None,
lan: None,
world_options: None,
options_to_world_options: false,
command_block_screen: None,
friends: None,
debug_keys: Default::default(),
debug_charts: Default::default(),
show_hitboxes: false,
show_chunk_borders: false,
pause_menu: true,
previous_mode: None,
gamemode_switcher: None,
clipboard: Default::default(),
text_selection: Default::default(),
saved_for_exit: false,
forced_hit: None,
lan_item_only: false,
lan_events: Vec::new(),
lan_block_events: Vec::new(),
lan_entity_events: Vec::new(),
lid_openers: HashMap::new(),
lan_acting: None,
lan_acting_name: None,
lan_acting_uuid: None,
chat_capture: None,
cmds: Default::default(),
ui: Default::default(),
combat: Default::default(),
mount: Default::default(),
stats: Default::default(),
score: Default::default(),
fns: Default::default(),
bosses: Default::default(),
exec: Default::default(),
rand_sequences: Default::default(),
border: Default::default(),
border_renderer: Default::default(),
border_state: Default::default(),
tab_list: Default::default(),
subtitles: Default::default(),
adv: Default::default(),
restore_player_environment: true,
stats_ui: Default::default(),
adv_ui: Default::default(),
camera_type: Default::default(),
fangs: Default::default(),
player_model: None,
})
}
}
pub fn run() -> Result<()> {
let Some(mut options) = Options::read()? else {
return Ok(());
@@ -9847,26 +10165,11 @@ pub fn run() -> Result<()> {
biomes.list.len(),
threads
);
// Until a world is opened the streamer is idle.
let mut streaming = Streaming::new(
Arc::new(TestTerrain::new(assets.registry, &biomes)?),
pack.context.clone(),
1,
);
streaming.paused = true;
let level = Level::default();
let save = Arc::new(SaveDir::new(
std::env::current_dir()?
.join("saves")
.join(".horizon-title"),
));
let audio = if options.dedicated.is_some() {
Audio::silent(&root)
} else {
Audio::new(&root)
};
let world = World::new(facts.air, 0);
let creative = options.creative;
let stations = horizon_client::stations::StationData::load(&root, &items);
let animate =
horizon_client::animate_tick::AnimateTables::load(&root, registry_owner.registry, &biomes)?;
@@ -9904,18 +10207,6 @@ pub fn run() -> Result<()> {
player_arm: horizon_client::mobs::load_model(&root, "minecraft:player#main")
.and_then(|m| m.children.into_iter().find(|c| c.name == "right_arm")),
});
// These batches share the exported document instead of reparsing it per layer.
let (armor_stand_assets, boat_models, cart_models) = {
let document = horizon_client::mobs::EntityModelDocument::load(&root).ok();
(
armor_stands::ArmorStandAssets::load(&root, document.as_ref()),
boats::BoatModels::load(document.as_ref()),
minecarts::CartModels::load(document.as_ref()),
)
};
let inventory = vec![None; 36];
let now = Instant::now();
let game_root = options.resources.clone();
let mut settings = Settings::load(&std::env::current_dir()?.join("options.txt"));
horizon_client::ui_theme::load_preferences(&std::env::current_dir()?);
// Scripted and frame-limited runs (the parity harnesses) see vanilla's
@@ -9928,281 +10219,7 @@ pub fn run() -> Result<()> {
if let Some(d) = options.distance_override {
settings.render_distance = d;
}
let look = options.look;
let particles = horizon_client::particles::ParticleEngine::new(&root, &atlas.sprites);
let mut game = Game {
res: resources.clone(),
collision: &resources.collision,
motion: &resources.motion,
pack,
atlas,
fog: Default::default(),
screen_fx: Default::default(),
world,
streaming,
options,
player: None,
spawn: None,
clock: FixedStep::default(),
previous_position: Vec3::ZERO,
eye: 1.62,
previous_eye: 1.62,
yaw: look.map_or(level.rotation[0], |l| l.0),
pitch: look.map_or(level.rotation[1], |l| l.1),
inventory,
selected: 0,
carried: None,
craft_grid: vec![None; 9],
craft_size: 2,
inv_drag: None,
tweaks: Default::default(),
inv_clicks: Default::default(),
last_inv_click: None,
last_quick_moved: None,
container: None,
station: None,
potions: Default::default(),
scratch_slot: None,
mining: None,
destroy_delay: 0,
use_delay: 0,
creative,
mode: if creative {
horizon_client::command::args::GameMode::Creative
} else {
horizon_client::command::args::GameMode::Survival
},
keys: HashSet::new(),
physical_keys: HashSet::new(),
left: false,
right: false,
cursor: (0.0, 0.0),
captured: false,
focused: true,
modifiers: winit::keyboard::ModifiersState::empty(),
fullscreen: horizon_client::window::FullscreenState::new(false),
shader_packs: Default::default(),
mouse: MouseLook::default(),
agent_pointer: false,
smooth_camera: false,
toggles: Default::default(),
was_playing: false,
pause: false,
debug: false,
screen: Screen::Playing,
window: None,
renderer: None,
entity_vertices: Vec::new(),
see_through_vertices: Vec::new(),
health_hud: hud_layout::HealthHud::default(),
started: now,
previous: now,
last_input: now,
pad: Default::default(),
frames: 0,
world_frames: 0,
fps: 0.0,
fps_frames: 0,
fps_at: now,
ticks: 0,
error: None,
message: None,
save,
level,
session_lock: None,
audio,
music: Default::default(),
ambience: Default::default(),
sound_paused: false,
cart_sounds: HashSet::new(),
riding_cart_sounds: None,
dropped: Vec::new(),
next_entity: 0,
particles,
pickups: Default::default(),
sign_edit: None,
book: None,
lectern_pulses: Vec::new(),
loading_progress: 0.0,
spawn_origin: None,
spawn_spiral: Default::default(),
player_spawn: None,
mobs: Vec::new(),
creatures: Default::default(),
sculk: Default::default(),
raiding: Default::default(),
attack_ticks: 100,
last_hurt_by_player: HashSet::new(),
died: HashSet::new(),
be_anims: {
let mut anims = horizon_client::block_entity_anim::BlockEntityAnims::default();
anims.classify(registry_owner.registry);
anims
},
using: None,
view: Default::default(),
limiter: horizon_client::window::FramerateLimiter::new(0),
frame_clock: Default::default(),
scope_scale: 0.5,
frame_ticks: 0.0,
title: None,
armor: [None, None, None, None],
offhand: None,
hand: Hand::Main,
shield_cooldown: 0,
command_source: None,
titles: Default::default(),
tool_highlight: Default::default(),
applied_modifiers: Vec::new(),
experience: Experience::default(),
orbs: Vec::new(),
xp_delay: 0,
last_level_up: 0,
swing: Default::default(),
swings_started: 0,
heights: Default::default(),
sway: Default::default(),
visible_hands: [(0, None), (0, None)],
clicks: Default::default(),
attack_clicks: 0,
hand_strength: Default::default(),
settings,
options_from_title: false,
backdrop: Default::default(),
pause_since: None,
dragging: false,
avatar: Default::default(),
flash: 0,
sleeping: None,
dim: Dim::Overworld,
world_root: PathBuf::new(),
travelling: None,
portals: Default::default(),
end_travel: false,
respawn_config: None,
respawn_travel: None,
end_portal_travel: false,
end: Default::default(),
block_ticks: Ticks::new(0),
tick_chunks: Default::default(),
random_tick_sections: Default::default(),
level_events: Vec::new(),
falling: Vec::new(),
paintings: Vec::new(),
painting_variants: paintings::PaintingVariants::load(&root),
item_frames: Vec::new(),
frame_model: frames::bake_frame(&root, "item_frame"),
glow_frame_model: frames::bake_frame(&root, "glow_item_frame"),
map_frame_model: frames::bake_frame(&root, "item_frame_map"),
glow_map_frame_model: frames::bake_frame(&root, "glow_item_frame_map"),
armor_stands: Vec::new(),
others: Vec::new(),
armor_stand_assets,
boats: Vec::new(),
boat_models,
crystal_model: horizon_client::mobs::load_model(&root, "minecraft:end_crystal#main"),
carts: Vec::new(),
jukebox_sounds: HashMap::new(),
bolts: Vec::new(),
maps: maps::Maps::default(),
fight: dragon::Fight::default(),
dragon: None,
crystals: Vec::new(),
dragon_fireballs: Vec::new(),
breath_clouds: Vec::new(),
dragon_model: horizon_client::mobs::load_model(&root, "minecraft:ender_dragon#main"),
map_patches: Vec::new(),
skin_downloads: horizon_client::skins::Downloader::new(
std::env::current_dir()
.unwrap_or_default()
.join("assets/skins"),
),
skin_slots: Vec::new(),
cart_models,
riding: None,
ender_items: vec![None; 27],
ender_open: None,
pending: Default::default(),
spill: Default::default(),
recipe_ui: Default::default(),
mount_menu: Default::default(),
hook: None,
tridents: Vec::new(),
rockets: Vec::new(),
ominous_spawners: Vec::new(),
creaking: Default::default(),
spawners: Default::default(),
trident_model: horizon_client::mobs::load_model(&root, "minecraft:trident#main"),
arrow_model: horizon_client::mobs::load_model(&root, "minecraft:arrow#main"),
tnts: Vec::new(),
hoppers: HashMap::new(),
creative_screen: Creative::load(&game_root)?,
control: None,
frame_stats: Default::default(),
perf: Default::default(),
pending_screenshot: None,
pending_bench: None,
flight: None,
ui_wait: Default::default(),
events: Default::default(),
agent: agent::Agent::default(),
view_frustum: None,
entity_culler: None,
pending_uploads: Vec::new(),
frame_graph: Default::default(),
extras: Default::default(),
mods: Default::default(),
sky_darken_memo: Default::default(),
persist: Default::default(),
remote: None,
lan: None,
world_options: None,
options_to_world_options: false,
command_block_screen: None,
friends: None,
debug_keys: Default::default(),
debug_charts: Default::default(),
show_hitboxes: false,
show_chunk_borders: false,
pause_menu: true,
previous_mode: None,
gamemode_switcher: None,
clipboard: Default::default(),
text_selection: Default::default(),
saved_for_exit: false,
forced_hit: None,
lan_item_only: false,
lan_events: Vec::new(),
lan_block_events: Vec::new(),
lan_entity_events: Vec::new(),
lid_openers: HashMap::new(),
lan_acting: None,
lan_acting_name: None,
lan_acting_uuid: None,
chat_capture: None,
cmds: Default::default(),
ui: Default::default(),
combat: Default::default(),
mount: Default::default(),
stats: Default::default(),
score: Default::default(),
fns: Default::default(),
bosses: Default::default(),
exec: Default::default(),
rand_sequences: Default::default(),
border: Default::default(),
border_renderer: Default::default(),
border_state: Default::default(),
tab_list: Default::default(),
subtitles: Default::default(),
adv: Default::default(),
restore_player_environment: true,
stats_ui: Default::default(),
adv_ui: Default::default(),
camera_type: Default::default(),
fangs: Default::default(),
player_model: None,
};
let mut game = Game::new(&resources, pack, atlas, options, settings, audio)?;
game.ui.vanilla_root = vanilla_root;
if game.options.benchmark.is_some() {
// The same conditions on every machine: no VSync, no frame cap, no