From b66c1c42a35fb0a9ce2460ce0ff86ed4ebb7f9a7 Mon Sep 17 00:00:00 2001 From: ghostlyzsh Date: Sun, 7 Apr 2024 10:20:30 -0500 Subject: [PATCH] appease the clippy --- server/src/component.rs | 2 +- server/src/main.rs | 104 +++++++++++++++------------------ server/src/packet.rs | 1 - server/src/part.rs | 28 ++++----- server/src/ws.rs | 8 +-- starkingdoms-common/src/lib.rs | 2 +- 6 files changed, 68 insertions(+), 77 deletions(-) diff --git a/server/src/component.rs b/server/src/component.rs index c329136e5329ebbd73b163003324de684d8135b0..87f733bf63b7a6d683845b11c53804f1e7da7c8c 100644 --- a/server/src/component.rs +++ b/server/src/component.rs @@ -13,7 +13,7 @@ // // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -use std::{collections::HashMap, net::SocketAddr}; +use std::{net::SocketAddr}; use bevy::prelude::*; use serde::{Deserialize, Serialize}; diff --git a/server/src/main.rs b/server/src/main.rs index 9c2ee361ce82554e8adbfaf38ecbc293711f40df..c50eceaf437192d43082dd22dae00410b0ee83f5 100644 --- a/server/src/main.rs +++ b/server/src/main.rs @@ -33,13 +33,11 @@ use bevy::{ }; use bevy_rapier2d::prelude::*; use component::*; -use hmac::{Hmac, Mac}; -use jwt::VerifyWithKey; +//use hmac::Mac; use packet::*; use part::{HEARTY_THRUST_ENERGY, LANDING_THRUSTER_ENERGY}; use rand::Rng; use serde::{Deserialize, Serialize}; -use sha2::Sha256; use starkingdoms_common::SaveModule; use starkingdoms_common::{pack_savefile, unpack_savefile, SaveData}; use std::f32::consts::PI; @@ -216,50 +214,48 @@ fn module_spawn( part_query: Query<&PartType, Without>, mut packet_send: EventWriter, ) { - if module_timer.0.tick(time.delta()).just_finished() { - if part_query.iter().count() < part::FREE_MODULE_CAP { - let angle: f32 = { - let mut rng = rand::thread_rng(); - rng.gen::() * std::f32::consts::PI * 2. - }; - let mut transform = Transform::from_xyz(angle.cos() * 30.0, angle.sin() * 30.0, 0.0); - transform.rotate_z(angle); - let flags = PartFlags { attached: false }; - let mut entity = commands.spawn(PartBundle { + if module_timer.0.tick(time.delta()).just_finished() && part_query.iter().count() < part::FREE_MODULE_CAP { + let angle: f32 = { + let mut rng = rand::thread_rng(); + rng.gen::() * std::f32::consts::PI * 2. + }; + let mut transform = Transform::from_xyz(angle.cos() * 30.0, angle.sin() * 30.0, 0.0); + transform.rotate_z(angle); + let flags = PartFlags { attached: false }; + let mut entity = commands.spawn(PartBundle { + part_type: PartType::Cargo, + transform: TransformBundle::from(transform), + flags, + }); + entity + .insert(RigidBody::Dynamic) + .with_children(|children| { + children + .spawn(Collider::cuboid(0.375, 0.46875)) + .insert(TransformBundle::from(Transform::from_xyz(0., 0.03125, 0.))); + }) + .insert(AdditionalMassProperties::MassProperties(MassProperties { + local_center_of_mass: vec2(0.0, 0.0), + mass: part::CARGO_MASS, + principal_inertia: 7.5, + })) + .insert(ExternalForce::default()) + .insert(ExternalImpulse::default()) + .insert(Velocity::default()) + .insert(ReadMassProperties::default()); + + let packet = Packet::SpawnPart { + id: entity.id().index(), + part: Part { part_type: PartType::Cargo, - transform: TransformBundle::from(transform), - flags, - }); - entity - .insert(RigidBody::Dynamic) - .with_children(|children| { - children - .spawn(Collider::cuboid(0.375, 0.46875)) - .insert(TransformBundle::from(Transform::from_xyz(0., 0.03125, 0.))); - }) - .insert(AdditionalMassProperties::MassProperties(MassProperties { - local_center_of_mass: vec2(0.0, 0.0), - mass: part::CARGO_MASS, - principal_inertia: 7.5, - })) - .insert(ExternalForce::default()) - .insert(ExternalImpulse::default()) - .insert(Velocity::default()) - .insert(ReadMassProperties::default()); - - let packet = Packet::SpawnPart { - id: entity.id().index(), - part: Part { - part_type: PartType::Cargo, - transform: proto_transform!(transform), - flags: proto_part_flags!(flags), - }, - }; + transform: proto_transform!(transform), + flags: proto_part_flags!(flags), + }, + }; - packet_send.send(WsEvent::Broadcast { - message: packet.into(), - }); - } + packet_send.send(WsEvent::Broadcast { + message: packet.into(), + }); } } @@ -314,7 +310,7 @@ fn on_message( Packet::ClientLogin { username, save, - jwt, + jwt: _, } => { // auth // plz no remove @@ -708,11 +704,9 @@ fn on_message( bound = [-0.375, 0.375, -0.5, 0.4375]; } - if bound[0] < x && x < bound[1] && bound[2] < y && y < bound[3] { - if m_attach.associated_player.unwrap() == entity { - q_player.selected = Some(m_entity); - break; - } + if bound[0] < x && x < bound[1] && bound[2] < y && y < bound[3] && m_attach.associated_player.unwrap() == entity { + q_player.selected = Some(m_entity); + break; } } for (entity, part_type, transform, _, _, _) in &part_query { @@ -1167,7 +1161,7 @@ fn attach_on_module_tree( }; for this in attach.clone().children.iter().flatten() { let module = part_query.get(select).unwrap(); - let part_type = module.1.clone(); + let part_type = *module.1; ret |= if part_type != PartType::LandingThruster { attach_on_module_tree( x, @@ -2060,10 +2054,8 @@ fn search_thrusters( } } - if *part_type != PartType::LandingThruster { - if *energy >= energy_lose_by { - search_thrusters(input, attach.clone(), p_transform, energy, attached_query); - } + if *part_type != PartType::LandingThruster && *energy >= energy_lose_by { + search_thrusters(input, attach.clone(), p_transform, energy, attached_query); } } } diff --git a/server/src/packet.rs b/server/src/packet.rs index 736fff36043ae9e5aab992126e891cfcdefe4dca..d9d36f7026893a156ae993fd564f51d99d61fca9 100644 --- a/server/src/packet.rs +++ b/server/src/packet.rs @@ -16,7 +16,6 @@ use std::fmt::{Display, Formatter}; // along with this program. If not, see . use crate::component::{PartType, PlanetType}; use serde::{Deserialize, Serialize}; -use starkingdoms_common::Savefile; use tungstenite::Message; #[derive(Debug, Serialize, Deserialize, Clone, PartialEq)] diff --git a/server/src/part.rs b/server/src/part.rs index e569451fe22e85ab6216596d4668ffd60047a29b..36321f58633a5126e74f35b7a1f7934703261d2b 100644 --- a/server/src/part.rs +++ b/server/src/part.rs @@ -21,14 +21,14 @@ pub const LANDING_THRUSTER_ENERGY: u32 = 3; #[macro_export] macro_rules! mass { ($p:expr) => { - if $p == crate::component::PartType::Hearty { - crate::part::HEARTY_MASS - } else if $p == crate::component::PartType::Cargo { - crate::part::CARGO_MASS - } else if $p == crate::component::PartType::Hub { - crate::part::HUB_MASS - } else if $p == crate::component::PartType::LandingThruster { - crate::part::LANDING_THRUSTER_MASS + if $p == $crate::component::PartType::Hearty { + $crate::part::HEARTY_MASS + } else if $p == $crate::component::PartType::Cargo { + $crate::part::CARGO_MASS + } else if $p == $crate::component::PartType::Hub { + $crate::part::HUB_MASS + } else if $p == $crate::component::PartType::LandingThruster { + $crate::part::LANDING_THRUSTER_MASS } else { 1. } @@ -38,12 +38,12 @@ macro_rules! mass { #[macro_export] macro_rules! capacity { ($p:expr) => { - if $p == crate::component::PartType::Hearty { - crate::part::HEARTY_CAPACITY - } else if $p == crate::component::PartType::Hub { - crate::part::HUB_CAPACITY - } else if $p == crate::component::PartType::LandingThruster { - crate::part::LANDING_THRUSTER_CAPACITY + if $p == $crate::component::PartType::Hearty { + $crate::part::HEARTY_CAPACITY + } else if $p == $crate::component::PartType::Hub { + $crate::part::HUB_CAPACITY + } else if $p == $crate::component::PartType::LandingThruster { + $crate::part::LANDING_THRUSTER_CAPACITY } else { 0 } diff --git a/server/src/ws.rs b/server/src/ws.rs index 08ca88a8fc2cd8861ca00415206a7d50b3fb8e1f..d6e78dd58eaa423a8891c5ac3f87e45390632688 100644 --- a/server/src/ws.rs +++ b/server/src/ws.rs @@ -18,7 +18,7 @@ use bevy::app::{App, Plugin, PostUpdate, Startup}; use bevy::ecs::event::ManualEventReader; use bevy::log::{error, warn}; use bevy::prelude::{Commands, Event, Events, Local, Res, ResMut, Resource}; -use crossbeam_channel::{unbounded, Receiver, Sender}; +use crossbeam_channel::{unbounded, Receiver}; use std::collections::HashMap; use std::net::{IpAddr, SocketAddr, TcpListener}; use std::sync::{Arc, RwLock}; @@ -60,8 +60,8 @@ pub struct StkTungsteniteServerConfig { #[derive(Resource)] pub struct Rx(Receiver); -#[derive(Resource)] -pub struct Tx(Sender); +//#[derive(Resource)] +//pub struct Tx(Sender); impl StkTungsteniteServerPlugin { pub fn init_server(config: Res, mut commands: Commands) { @@ -74,7 +74,7 @@ impl StkTungsteniteServerPlugin { commands.insert_resource(clients.clone()); commands.insert_resource(Rx(rx.clone())); - commands.insert_resource(Tx(tx.clone())); + //commands.insert_resource(Tx(tx.clone())); let clients = clients.0.clone(); diff --git a/starkingdoms-common/src/lib.rs b/starkingdoms-common/src/lib.rs index 4f90136b367aa8cc862f406035d39d1ba60af649..b754fd835732943e96db46134a92b445e25d1d4f 100644 --- a/starkingdoms-common/src/lib.rs +++ b/starkingdoms-common/src/lib.rs @@ -18,7 +18,7 @@ use base64::Engine; use hmac::{Hmac, Mac}; use serde::{Deserialize, Serialize}; use sha2::Sha256; -use std::{collections::HashMap, error::Error}; +use std::error::Error; #[derive(Clone, Serialize, Deserialize, Debug, PartialEq)] pub struct SaveData {