From 2daf0b3ad06baff5290c86fc6fa1a5308af0c352 Mon Sep 17 00:00:00 2001 From: core Date: Fri, 28 Mar 2025 19:54:49 -0400 Subject: [PATCH] format --- crates/server/src/module/mod.rs | 2 +- crates/server/src/module/save.rs | 8 +++--- crates/server/src/player/client_login.rs | 28 ++++++++++--------- crates/server/src/player/mod.rs | 23 ++++++++------- crates/server/src/player/packet.rs | 14 ++++++---- .../server/src/player/player_mouse_input.rs | 7 +++-- crates/server/src/player/request_save.rs | 8 +++--- 7 files changed, 49 insertions(+), 41 deletions(-) diff --git a/crates/server/src/module/mod.rs b/crates/server/src/module/mod.rs index 16001310595e4f4cf8c406e55d1f11bcceb1cc9a..983328d069c8b0ffd6a0f59464ef984440f2afbb 100644 --- a/crates/server/src/module/mod.rs +++ b/crates/server/src/module/mod.rs @@ -4,8 +4,8 @@ use bevy::{math::vec2, prelude::*}; use bevy_rapier2d::prelude::*; use component::*; use rand::Rng; -use starkingdoms_common::packet::{DespawnPartPacket, Packet, SpawnPartPacket}; use starkingdoms_common::packet::Part; +use starkingdoms_common::packet::{DespawnPartPacket, Packet, SpawnPartPacket}; use starkingdoms_common::proto_part_flags; use starkingdoms_common::proto_transform; diff --git a/crates/server/src/module/save.rs b/crates/server/src/module/save.rs index f2a4aa35c9e5c0b1d3451415d4c782dd022b3119..de2cc83244fffadd38139e2a0ce2c97b7f5cb58a 100644 --- a/crates/server/src/module/save.rs +++ b/crates/server/src/module/save.rs @@ -1,9 +1,5 @@ use std::{collections::HashMap, f32::consts::PI}; -use bevy::{math::vec2, prelude::*}; -use bevy_rapier2d::prelude::*; -use starkingdoms_common::{packet::Packet, PartType as c_PartType, SaveModule}; -use starkingdoms_common::packet::SaveEligibilityPacket; use crate::{ capacity, mass, planet::PlanetType, @@ -11,6 +7,10 @@ use crate::{ ws::{PacketMessageConvert, WsEvent}, Attach, CanAttach, LooseAttach, PartBundle, PartFlags, PartType, }; +use bevy::{math::vec2, prelude::*}; +use bevy_rapier2d::prelude::*; +use starkingdoms_common::packet::SaveEligibilityPacket; +use starkingdoms_common::{packet::Packet, PartType as c_PartType, SaveModule}; pub fn load_savefile( commands: &mut Commands, diff --git a/crates/server/src/player/client_login.rs b/crates/server/src/player/client_login.rs index 11690f3456f4729619b16c6ac7bb3b5692947819..9e6ba19aad8c7f9235343db6006e545c81ef862c 100644 --- a/crates/server/src/player/client_login.rs +++ b/crates/server/src/player/client_login.rs @@ -1,16 +1,5 @@ use std::{collections::HashMap, net::SocketAddr}; -use bevy::{math::vec2, prelude::*}; -use bevy_rapier2d::prelude::*; -use hmac::{Hmac, Mac}; -use jwt::VerifyWithKey; -use rand::Rng; -use sha2::Sha256; -use starkingdoms_common::{ - packet::{MessageType, Packet, Part, Planet, ProtoPartFlags}, - proto_part_flags, proto_transform, unpack_savefile, PartType as c_PartType, -}; -use starkingdoms_common::packet::{LoginResponsePacket, MessagePacket, PlanetPositionsPacket, PlayerListPacket, SpawnPartPacket, SpawnPlayerPacket}; use crate::{ config::StkConfig, crafting::components::{IsMining, VarietyMaterialStorage}, @@ -22,6 +11,20 @@ use crate::{ ws::{PacketMessageConvert, WsEvent}, AppKeys, UserToken, CLIENT_SCALE, }; +use bevy::{math::vec2, prelude::*}; +use bevy_rapier2d::prelude::*; +use hmac::{Hmac, Mac}; +use jwt::VerifyWithKey; +use rand::Rng; +use sha2::Sha256; +use starkingdoms_common::packet::{ + LoginResponsePacket, MessagePacket, PlanetPositionsPacket, PlayerListPacket, SpawnPartPacket, + SpawnPlayerPacket, +}; +use starkingdoms_common::{ + packet::{MessageType, Packet, Part, Planet, ProtoPartFlags}, + proto_part_flags, proto_transform, unpack_savefile, PartType as c_PartType, +}; use super::component::{Input, Player}; @@ -166,8 +169,7 @@ pub fn load_save( // HEY! GHOSTLY! THIS SAVE FILE IS VALID! PLEASE LOAD IT! // THANKS! - let (children, - _module_counts) = load_savefile( + let (children, _module_counts) = load_savefile( commands, transform, id, diff --git a/crates/server/src/player/mod.rs b/crates/server/src/player/mod.rs index bd8d58d796d23fdbfad0f9678e9bd7da8375f7fb..397dc1d466f0b96e3b9cc6582eb3c84b0941d120 100644 --- a/crates/server/src/player/mod.rs +++ b/crates/server/src/player/mod.rs @@ -1,12 +1,3 @@ -use bevy::{ecs::event::ManualEventReader, math::vec2, prelude::*}; -use bevy_rapier2d::prelude::*; -use client_login::packet_stream; -use component::Player; -use player_mouse_input::{attach_or_detach, mouse_picking}; -use request_save::request_save; -use send_message::send_message; -use starkingdoms_common::{packet::Packet, PartType as c_PartType}; -use starkingdoms_common::packet::{ClientLoginPacket, PlayerInputPacket, PlayerMouseInputPacket, RequestSavePacket, SendMessagePacket}; use crate::{ config::StkConfig, crafting::components::IsMining, @@ -21,6 +12,18 @@ use crate::{ ws::{PacketMessageConvert, WsEvent}, AppKeys, CLIENT_SCALE, }; +use bevy::{ecs::event::ManualEventReader, math::vec2, prelude::*}; +use bevy_rapier2d::prelude::*; +use client_login::packet_stream; +use component::Player; +use player_mouse_input::{attach_or_detach, mouse_picking}; +use request_save::request_save; +use send_message::send_message; +use starkingdoms_common::packet::{ + ClientLoginPacket, PlayerInputPacket, PlayerMouseInputPacket, RequestSavePacket, + SendMessagePacket, +}; +use starkingdoms_common::{packet::Packet, PartType as c_PartType}; pub mod client_login; pub mod component; @@ -79,7 +82,7 @@ pub fn on_message( let packet: Packet = err_or_cont!(Packet::from_message(message)); match packet { - Packet::ClientLogin(ClientLoginPacket{ + Packet::ClientLogin(ClientLoginPacket { username, save, jwt, diff --git a/crates/server/src/player/packet.rs b/crates/server/src/player/packet.rs index c0c1ace18b597d2b550fef57f416072af5ba8d32..942913aa84ee396792832577f2e4c5f2421bc72b 100644 --- a/crates/server/src/player/packet.rs +++ b/crates/server/src/player/packet.rs @@ -1,15 +1,17 @@ -use bevy::{ecs::event::ManualEventReader, prelude::*}; -use starkingdoms_common::{ - packet::{Packet, Part, Planet}, - proto_part_flags, proto_transform, -}; -use starkingdoms_common::packet::{EnergyUpdatePacket, PartPositionsPacket, PlanetPositionsPacket, PlayerLeavePacket}; use crate::{ module::component::{Attach, PartFlags, PartType}, planet::PlanetType, ws::{PacketMessageConvert, WsEvent}, CLIENT_SCALE, }; +use bevy::{ecs::event::ManualEventReader, prelude::*}; +use starkingdoms_common::packet::{ + EnergyUpdatePacket, PartPositionsPacket, PlanetPositionsPacket, PlayerLeavePacket, +}; +use starkingdoms_common::{ + packet::{Packet, Part, Planet}, + proto_part_flags, proto_transform, +}; use super::component::Player; diff --git a/crates/server/src/player/player_mouse_input.rs b/crates/server/src/player/player_mouse_input.rs index 36846bedcf445670b1a8f70e6a205109b45878da..2ea444949a5bfc383486d6eb09f2684cd0a19084 100644 --- a/crates/server/src/player/player_mouse_input.rs +++ b/crates/server/src/player/player_mouse_input.rs @@ -1,18 +1,18 @@ use bevy::{math::vec3, prelude::*}; use bevy_rapier2d::prelude::*; +use super::component::Player; use crate::{ crafting::components::IsMining, module::component::{Attach, CanAttach, LooseAttach, PartFlags, PartType}, planet::PlanetType, ws::{PacketMessageConvert, WsEvent}, }; +use starkingdoms_common::packet::OpenCraftingUiPacket; use starkingdoms_common::{ packet::{ButtonType, Packet}, PartType as c_PartType, }; -use starkingdoms_common::packet::OpenCraftingUiPacket; -use super::component::Player; pub fn attach_or_detach( select: Entity, @@ -193,7 +193,8 @@ pub fn mouse_picking( if *button == ButtonType::Right { send_events.push(WsEvent::Send { to: q_player.addr, - message: Packet::OpenCraftingUi(OpenCraftingUiPacket { id: entity.index() }).into_message(), + message: Packet::OpenCraftingUi(OpenCraftingUiPacket { id: entity.index() }) + .into_message(), }); // toggle mining /*if let Ok(mut is_mining) = mining_query.get_mut(entity) { diff --git a/crates/server/src/player/request_save.rs b/crates/server/src/player/request_save.rs index 484d25b804e670028d78c0531688893daa7d1431..0f359744332175adb06a7559c5ea77f9cbb2e3ed 100644 --- a/crates/server/src/player/request_save.rs +++ b/crates/server/src/player/request_save.rs @@ -1,15 +1,15 @@ use std::net::SocketAddr; -use bevy::prelude::*; -use bevy_rapier2d::prelude::Velocity; -use starkingdoms_common::{pack_savefile, packet::Packet, unpack_savefile, SaveData}; -use starkingdoms_common::packet::SaveDataPacket; use crate::{ module::component::{Attach, CanAttach, LooseAttach, PartFlags, PartType}, planet::PlanetType, ws::{PacketMessageConvert, WsEvent}, AppKeys, }; +use bevy::prelude::*; +use bevy_rapier2d::prelude::Velocity; +use starkingdoms_common::packet::SaveDataPacket; +use starkingdoms_common::{pack_savefile, packet::Packet, unpack_savefile, SaveData}; use super::component::Player;