fix(replay): rename paths to compile
Haven't tested yet though.
This commit is contained in:
@@ -13,7 +13,7 @@ use tokio::net::TcpListener;
|
|||||||
#[cfg(feature = "matrix")]
|
#[cfg(feature = "matrix")]
|
||||||
use {crate::matrix, std::time::Duration, tokio::time::sleep};
|
use {crate::matrix, std::time::Duration, tokio::time::sleep};
|
||||||
#[cfg(feature = "replay")]
|
#[cfg(feature = "replay")]
|
||||||
use {crate::replay::recorder::Recorder, mlua::Error, std::process::exit};
|
use {crate::replay::recorder::Recorder, anyhow::Context, mlua::Error, std::process::exit};
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
State,
|
State,
|
||||||
@@ -97,6 +97,9 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
|
|||||||
})
|
})
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
|
Event::ConnectionFailed(error) => {
|
||||||
|
call_listeners(&state, "connection_failed", || Ok(error.to_string())).await
|
||||||
|
}
|
||||||
Event::Death(packet) => {
|
Event::Death(packet) => {
|
||||||
if let Some(packet) = packet {
|
if let Some(packet) = packet {
|
||||||
call_listeners(&state, "death", || {
|
call_listeners(&state, "death", || {
|
||||||
@@ -129,6 +132,7 @@ pub async fn handle_event(client: Client, event: Event, state: State) -> Result<
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
Event::KeepAlive(id) => call_listeners(&state, "keep_alive", || Ok(id)).await,
|
Event::KeepAlive(id) => call_listeners(&state, "keep_alive", || Ok(id)).await,
|
||||||
|
Event::ReceiveChunk(_) => Ok(()),
|
||||||
Event::RemovePlayer(player_info) => {
|
Event::RemovePlayer(player_info) => {
|
||||||
call_listeners(&state, "remove_player", || Ok(Player::from(player_info))).await
|
call_listeners(&state, "remove_player", || Ok(Player::from(player_info))).await
|
||||||
}
|
}
|
||||||
|
|||||||
20
src/main.rs
20
src/main.rs
@@ -40,7 +40,10 @@ use futures_locks::RwLock;
|
|||||||
use log::debug;
|
use log::debug;
|
||||||
use mlua::{Function, Lua};
|
use mlua::{Function, Lua};
|
||||||
#[cfg(feature = "replay")]
|
#[cfg(feature = "replay")]
|
||||||
use replay::{mlua::Table, plugin::RecordPlugin, recorder::Recorder};
|
use {
|
||||||
|
mlua::Table,
|
||||||
|
replay::{plugin::RecordPlugin, recorder::Recorder},
|
||||||
|
};
|
||||||
|
|
||||||
#[cfg(feature = "mimalloc")]
|
#[cfg(feature = "mimalloc")]
|
||||||
#[global_allocator]
|
#[global_allocator]
|
||||||
@@ -96,15 +99,12 @@ async fn main() -> Result<()> {
|
|||||||
DefaultPlugins.set(LogPlugin {
|
DefaultPlugins.set(LogPlugin {
|
||||||
custom_layer: |_| {
|
custom_layer: |_| {
|
||||||
env::var("LOG_FILE").ok().map(|path| {
|
env::var("LOG_FILE").ok().map(|path| {
|
||||||
layer()
|
let file = OpenOptions::new()
|
||||||
.with_writer(
|
.append(true)
|
||||||
OpenOptions::new()
|
.create(true)
|
||||||
.append(true)
|
.open(&path)
|
||||||
.create(true)
|
.expect(&(path + " should be accessible"));
|
||||||
.open(&path)
|
layer().with_writer(file).boxed()
|
||||||
.expect(&(path + " should be accessible")),
|
|
||||||
)
|
|
||||||
.boxed()
|
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
..Default::default()
|
..Default::default()
|
||||||
|
|||||||
@@ -3,7 +3,6 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use azalea::{
|
use azalea::{
|
||||||
ecs::event::EventReader,
|
|
||||||
packet::{
|
packet::{
|
||||||
config::ReceiveConfigPacketEvent, game::ReceiveGamePacketEvent,
|
config::ReceiveConfigPacketEvent, game::ReceiveGamePacketEvent,
|
||||||
login::ReceiveLoginPacketEvent,
|
login::ReceiveLoginPacketEvent,
|
||||||
@@ -11,7 +10,7 @@ use azalea::{
|
|||||||
protocol::packets::login::ClientboundLoginPacket,
|
protocol::packets::login::ClientboundLoginPacket,
|
||||||
};
|
};
|
||||||
use bevy_app::{App, First, Plugin};
|
use bevy_app::{App, First, Plugin};
|
||||||
use bevy_ecs::system::ResMut;
|
use bevy_ecs::{message::MessageReader, system::ResMut};
|
||||||
use log::error;
|
use log::error;
|
||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
|
|
||||||
@@ -35,7 +34,7 @@ impl Plugin for RecordPlugin {
|
|||||||
|
|
||||||
fn record_login_packets(
|
fn record_login_packets(
|
||||||
recorder: Option<ResMut<Recorder>>,
|
recorder: Option<ResMut<Recorder>>,
|
||||||
mut events: EventReader<ReceiveLoginPacketEvent>,
|
mut events: MessageReader<ReceiveLoginPacketEvent>,
|
||||||
) {
|
) {
|
||||||
if let Some(mut recorder) = recorder {
|
if let Some(mut recorder) = recorder {
|
||||||
for event in events.read() {
|
for event in events.read() {
|
||||||
@@ -54,7 +53,7 @@ fn record_login_packets(
|
|||||||
|
|
||||||
fn record_configuration_packets(
|
fn record_configuration_packets(
|
||||||
recorder: Option<ResMut<Recorder>>,
|
recorder: Option<ResMut<Recorder>>,
|
||||||
mut events: EventReader<ReceiveConfigPacketEvent>,
|
mut events: MessageReader<ReceiveConfigPacketEvent>,
|
||||||
) {
|
) {
|
||||||
if let Some(mut recorder) = recorder {
|
if let Some(mut recorder) = recorder {
|
||||||
for event in events.read() {
|
for event in events.read() {
|
||||||
@@ -67,7 +66,7 @@ fn record_configuration_packets(
|
|||||||
|
|
||||||
fn record_game_packets(
|
fn record_game_packets(
|
||||||
recorder: Option<ResMut<Recorder>>,
|
recorder: Option<ResMut<Recorder>>,
|
||||||
mut events: EventReader<ReceiveGamePacketEvent>,
|
mut events: MessageReader<ReceiveGamePacketEvent>,
|
||||||
) {
|
) {
|
||||||
if let Some(mut recorder) = recorder {
|
if let Some(mut recorder) = recorder {
|
||||||
for event in events.read() {
|
for event in events.read() {
|
||||||
|
|||||||
Reference in New Issue
Block a user