ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: minor code improvements

Browse Source
This commit is contained in:
Ryan 2025-03-11 17:36:04 -04:00
parent e81fab7bf8
commit ca1162e99a
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/events.rs
View File

@ -6,7 +6,7 @@ use crate::{
particle, particle,
replay::recorder::Recorder, replay::recorder::Recorder,
}; };
use anyhow::Context; use anyhow::{Context, Result};
use azalea::{ use azalea::{
brigadier::exceptions::BuiltInExceptions::DispatcherUnknownCommand, prelude::*, brigadier::exceptions::BuiltInExceptions::DispatcherUnknownCommand, prelude::*,
protocol::packets::game::ClientboundGamePacket, protocol::packets::game::ClientboundGamePacket,
@ -20,7 +20,7 @@ use std::net::SocketAddr;
use tokio::net::TcpListener; use tokio::net::TcpListener;
#[allow(clippy::too_many_lines)] #[allow(clippy::too_many_lines)]
pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow::Result<()> { pub async fn handle_event(client: Client, event: Event, state: State) -> Result<()> {
match event { match event {
Event::AddPlayer(player_info) => { Event::AddPlayer(player_info) => {
call_listeners(&state, "add_player", Player::from(player_info)).await; call_listeners(&state, "add_player", Player::from(player_info)).await;
@ -178,12 +178,11 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow:
debug!("received initialize event"); debug!("received initialize event");
let globals = state.lua.globals(); let globals = state.lua.globals();
let lua_ecs = client.ecs.clone(); let ecs = client.ecs.clone();
globals.set( globals.set(
"finish_replay_recording", "finish_replay_recording",
state.lua.create_function_mut(move |_, (): ()| { state.lua.create_function_mut(move |_, (): ()| {
lua_ecs ecs.lock()
.lock()
.remove_resource::<Recorder>() .remove_resource::<Recorder>()
.context("recording not active") .context("recording not active")
.map_err(Error::external)? .map_err(Error::external)?

6
src/replay/recorder.rs
View File

@ -41,7 +41,7 @@ impl Recorder {
} }
pub fn finish(mut self) -> Result<()> { pub fn finish(mut self) -> Result<()> {
let elapsed = self.start.elapsed(); let elapsed = self.start.elapsed().as_millis();
self.zip_writer self.zip_writer
.start_file("metaData.json", SimpleFileOptions::default())?; .start_file("metaData.json", SimpleFileOptions::default())?;
@ -49,8 +49,8 @@ impl Recorder {
json!({ json!({
"singleplayer": false, "singleplayer": false,
"serverName": self.server, "serverName": self.server,
"duration": elapsed.as_millis(), "duration": elapsed,
"date": (SystemTime::now().duration_since(UNIX_EPOCH)? - elapsed).as_millis(), "date": SystemTime::now().duration_since(UNIX_EPOCH)?.as_millis() - elapsed,
"mcversion": VERSION_NAME, "mcversion": VERSION_NAME,
"fileFormat": "MCPR", "fileFormat": "MCPR",
"fileFormatVersion": 14, "fileFormatVersion": 14,