Skip to content

Commit

Permalink
Fix linter
Browse files Browse the repository at this point in the history
  • Loading branch information
CuddlyBunion341 committed Jan 28, 2025
1 parent c87b752 commit 65a499d
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/client/chat/systems.rs
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,9 @@ pub fn focus_chat_system(
#[cfg(test)]
mod tests {
use super::*;
use crate::ChatMessage;
use bevy::ecs::event::Events;
use chat_events::{ChatClearEvent, SingleChatSendEvent};
use crate::ChatMessage;

fn get_chat_messages(app: &mut App) -> Vec<String> {
let mut messages = app
Expand Down
5 changes: 1 addition & 4 deletions src/client/collider/systems.rs
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,7 @@ mod tests {
));

let block = BlockId::Dirt;
let mut resource = app
.world_mut()
.get_resource_mut::<ChunkManager>()
.unwrap();
let mut resource = app.world_mut().get_resource_mut::<ChunkManager>().unwrap();
let chunks = ChunkManager::instantiate_chunks(
Vec3 {
x: 0.0,
Expand Down
2 changes: 1 addition & 1 deletion src/client/networking/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pub mod systems;

use crate::connection_config;
use bevy_renet::{
netcode::{ClientAuthentication, NetcodeClientPlugin, NetcodeClientTransport},
RenetClientPlugin,
};
use crate::connection_config;

use crate::prelude::*;

Expand Down
2 changes: 1 addition & 1 deletion src/client/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ pub use terrain_util::CubeFace;

// my crates
pub use crate::states::GameState;
pub use rsmc as lib;
pub use lib::*;
pub use rsmc as lib;

pub use crate::collider::components as collider_components;
pub use crate::collider::events as collider_events;
Expand Down
2 changes: 1 addition & 1 deletion src/server/networking/mod.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pub mod systems;

use crate::connection_config;
#[cfg(feature = "renet_visualizer")]
use bevy_inspector_egui::bevy_egui::EguiPlugin;
#[cfg(feature = "renet_visualizer")]
use renet_visualizer::RenetServerVisualizer;
use crate::connection_config;

use crate::prelude::*;

Expand Down
7 changes: 2 additions & 5 deletions src/server/networking/systems.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@ pub fn receive_message_system(
server.broadcast_message_except(
client_id,
DefaultChannel::ReliableOrdered,
bincode::serialize(&NetworkingMessage::BlockUpdate {
position,
block,
})
.unwrap(),
bincode::serialize(&NetworkingMessage::BlockUpdate { position, block })
.unwrap(),
);
}
NetworkingMessage::ChatMessageSend(message) => {
Expand Down
4 changes: 2 additions & 2 deletions src/server/prelude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@ pub use bevy_renet::netcode::ServerAuthentication;
pub use bevy_renet::netcode::ServerConfig;
pub use bevy_renet::RenetServerPlugin;
pub use renet::DefaultChannel;
pub use serde::Deserialize;
pub use renet::*;
pub use serde::Deserialize;

// other crates
pub use rayon::iter::IntoParallelIterator;
pub use rayon::iter::IntoParallelRefMutIterator;
pub use rayon::iter::ParallelIterator;

pub use lib::*;
pub use noise::NoiseFn;
pub use noise::Perlin;
pub use rsmc as lib;
pub use lib::*;

// my crates
pub use crate::networking::systems as networking_systems;
Expand Down
3 changes: 1 addition & 2 deletions src/server/terrain/systems.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ pub fn setup_world_system(mut chunk_manager: ResMut<ChunkManager>) {

info!("Generating chunks");

let mut chunks =
ChunkManager::instantiate_chunks(Vec3::new(0.0, 0.0, 0.0), render_distance);
let mut chunks = ChunkManager::instantiate_chunks(Vec3::new(0.0, 0.0, 0.0), render_distance);

chunks.par_iter_mut().for_each(|chunk| {
info!("Generating chunk at {:?}", chunk.position);
Expand Down
8 changes: 4 additions & 4 deletions src/shared/chunk_serializer.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use bevy::math::Vec3;
use serde::ser::SerializeStruct;
use serde::{Deserialize, Serialize};
use crate::deserialize_buffer;
use crate::serialize_buffer;
use crate::BlockId;
use crate::Chunk;
use crate::serialize_buffer;
use crate::CHUNK_LENGTH;
use bevy::math::Vec3;
use serde::ser::SerializeStruct;
use serde::{Deserialize, Serialize};

impl Serialize for Chunk {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
Expand Down
1 change: 0 additions & 1 deletion src/shared/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@ pub mod terrain;

pub use blocks::*;
pub use buffer_serializer::*;
pub use chunk_serializer::*;
pub use networking::*;
pub use terrain::*;
4 changes: 2 additions & 2 deletions src/shared/networking.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use std::time::Duration;

use std::collections::HashMap;
use bevy::{math::{Quat, Vec3}};
use bevy::math::{Quat, Vec3};
use chrono::DateTime;
use renet::{ChannelConfig, ClientId, ConnectionConfig, SendType};
use serde::{Deserialize, Serialize};
use std::collections::HashMap;

use super::{BlockId, Chunk};

Expand Down
1 change: 0 additions & 1 deletion src/shared/terrain.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
use std::collections::HashMap;

use bevy::{math::Vec3, prelude::Resource};
use serde_big_array::BigArray;

use super::BlockId;

Expand Down

0 comments on commit 65a499d

Please sign in to comment.