Revert "clippy fixes"

This reverts commit f6e94cfd32.

.cargo/config.toml

@@ -1,2 +0,0 @@
-[env]
-BEVY_ASSET_ROOT = { value = "", relative = true }

.github/workflows/ci_debug.yml

@@ -21,7 +21,7 @@ jobs:
           packages: libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
           version: 1.0
 
-      - name: Build client
+      - name: Build
         run: |
           cargo build --locked --target=x86_64-unknown-linux-gnu
 

Cargo.lock

@@ -3146,8 +3146,8 @@ dependencies = [
  "rand 0.8.5",
  "ron",
  "serde",
- "shared",
  "steamworks",
+ "vergen-gitcl",
 ]
 
 [[package]]
@@ -5120,30 +5120,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "server"
-version = "0.1.0"
-dependencies = [
- "avian3d",
- "bevy",
- "bevy-inspector-egui",
- "bevy-steamworks",
- "bevy-ui-gradients",
- "bevy_asset_loader",
- "bevy_ballistic",
- "bevy_common_assets",
- "bevy_debug_log",
- "bevy_sprite3d",
- "bevy_trenchbroom",
- "happy_feet",
- "nil 0.14.0",
- "rand 0.8.5",
- "ron",
- "serde",
- "shared",
- "steamworks",
-]
-
 [[package]]
 name = "sharded-slab"
 version = "0.1.7"
@@ -5153,30 +5129,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shared"
-version = "0.1.0"
-dependencies = [
- "avian3d",
- "bevy",
- "bevy-inspector-egui",
- "bevy-steamworks",
- "bevy-ui-gradients",
- "bevy_asset_loader",
- "bevy_ballistic",
- "bevy_common_assets",
- "bevy_debug_log",
- "bevy_sprite3d",
- "bevy_trenchbroom",
- "happy_feet",
- "nil 0.14.0",
- "rand 0.8.5",
- "ron",
- "serde",
- "steamworks",
- "vergen-gitcl",
-]
-
 [[package]]
 name = "shlex"
 version = "1.3.0"

Cargo.toml

@@ -1,9 +1,16 @@
+[package]
+name = "hedz_reloaded"
+version = "0.1.0"
+edition = "2024"
+build = "build.rs"
 
-[workspace]
-resolver = "3"
-members = ["crates/*"]
+[profile.dev.package."*"]
+opt-level = 3
 
-[workspace.dependencies]
+[features]
+dbg = ["avian3d/debug-plugin", "dep:bevy-inspector-egui"]
+
+[dependencies]
 avian3d = { version = "0.3", default-features = false, features = [
     "3d",
     "f32",
@@ -14,24 +21,28 @@ avian3d = { version = "0.3", default-features = false, features = [
     "parallel",
 ] }
 bevy = { version = "0.16.0", features = ["track_location"] }
-bevy-inspector-egui = { version = "0.31" }
-bevy-steamworks = "0.13.0"
-bevy-ui-gradients = "0.4.0"
-bevy_asset_loader = "0.23.0-rc.3"
-bevy_ballistic = "0.4.0"
-bevy_common_assets = { version = "0.13.0", features = ["ron"] }
-bevy_debug_log = "0.6.0"
-bevy_sprite3d = "5.0.0"
 bevy_trenchbroom = { version = "0.8.1", features = ["avian"] }
-happy_feet = { git = "https://github.com/rustunit/happy_feet.git", rev = "ecfecc6243862bc2bc64dcadfd0efd21c766ab5b" }
 nil = "0.14.0"
+bevy_asset_loader = "0.23.0-rc.3"
+bevy_sprite3d = "5.0.0"
 rand = "=0.8.5"
-ron = "0.8"
-serde = { version = "1.0.219", features = ["derive"] }
-shared = { path = "crates/shared" }
+bevy-inspector-egui = { version = "0.31", optional = true }
+bevy-steamworks = "0.13.0"
 steamworks = "0.11"
-[profile.dev.package."*"]
-opt-level = 3
+bevy_ballistic = "0.4.0"
+bevy-ui-gradients = "0.4.0"
+bevy_debug_log = "0.6.0"
+bevy_common_assets = { version = "0.13.0", features = ["ron"] }
+serde = { version = "1.0.219", features = ["derive"] }
+ron = "0.8"
+happy_feet = { git = "https://github.com/rustunit/happy_feet.git", rev = "ecfecc6243862bc2bc64dcadfd0efd21c766ab5b" }
+
+[build-dependencies]
+vergen-gitcl = "1.0"
+
+[lints.clippy]
+too_many_arguments = "allow"
+type_complexity = "allow"
 
 [patch.crates-io]
 bevy-steamworks = { git = "https://github.com/HouraiTeahouse/bevy_steamworks.git", rev = "1933e5d" }

crates/client/Cargo.toml

@@ -1,27 +0,0 @@
-[package]
-name = "hedz_reloaded"
-version = "0.1.0"
-edition = "2024"
-
-[features]
-dbg = ["avian3d/debug-plugin", "dep:bevy-inspector-egui", "shared/dbg"]
-
-[dependencies]
-avian3d = { workspace = true }
-bevy = { workspace = true }
-bevy-inspector-egui = { workspace = true, optional = true }
-bevy-steamworks = { workspace = true }
-bevy-ui-gradients = { workspace = true }
-bevy_asset_loader = { workspace = true }
-bevy_ballistic = { workspace = true }
-bevy_common_assets = { workspace = true }
-bevy_debug_log = { workspace = true }
-bevy_sprite3d = { workspace = true }
-bevy_trenchbroom = { workspace = true }
-happy_feet = { workspace = true }
-nil = { workspace = true }
-rand = { workspace = true }
-ron = { workspace = true }
-serde = { workspace = true }
-shared = { workspace = true }
-steamworks = { workspace = true }

crates/client/src/main.rs

@@ -1,275 +0,0 @@
-use crate::utils::{auto_rotate, explosions};
-use avian3d::prelude::*;
-use bevy::{
-    audio::{PlaybackMode, Volume},
-    core_pipeline::tonemapping::Tonemapping,
-    prelude::*,
-    render::view::ColorGrading,
-};
-use bevy_common_assets::ron::RonAssetPlugin;
-use bevy_sprite3d::Sprite3dPlugin;
-use bevy_steamworks::{Client, FriendFlags, SteamworksEvent, SteamworksPlugin};
-use bevy_trenchbroom::prelude::*;
-use bevy_ui_gradients::UiGradientsPlugin;
-use camera::MainCamera;
-use heads_database::HeadDatabaseAsset;
-use loading_assets::AudioAssets;
-use shared::*;
-use std::io::{Read, Write};
-use utils::{billboards, sprite_3d_animation, squish_animation, trail};
-
-fn main() {
-    let mut app = App::new();
-
-    app.register_type::<DebugVisuals>()
-        .register_type::<TransformInterpolation>();
-    app.insert_resource(DebugVisuals {
-        unlit: false,
-        tonemapping: Tonemapping::None,
-        exposure: 1.,
-        shadows: true,
-        cam_follow: true,
-    });
-
-    app.add_plugins(
-        DefaultPlugins
-            .set(WindowPlugin {
-                primary_window: Some(Window {
-                    title: "HEDZ Reloaded".into(),
-                    // resolution: (1024., 768.).into(),
-                    ..default()
-                }),
-                ..default()
-            })
-            .set(bevy::log::LogPlugin {
-                filter: "info".into(),
-                level: bevy::log::Level::INFO,
-                // provide custom log layer to receive logging events
-                custom_layer: bevy_debug_log::log_capture_layer,
-            }),
-    );
-
-    let app_id = 1603000;
-    // should only be done in production builds
-    #[cfg(not(debug_assertions))]
-    if steamworks::restart_app_if_necessary(app_id.into()) {
-        info!("Restarting app via steam");
-        return;
-    }
-
-    match SteamworksPlugin::init_app(app_id) {
-        Ok(plugin) => {
-            app.add_plugins(plugin);
-        }
-        Err(e) => {
-            warn!("steam init error: {e:?}");
-        }
-    };
-
-    app.add_plugins(
-        bevy_debug_log::LogViewerPlugin::default()
-            .auto_open_threshold(bevy::log::tracing::level_filters::LevelFilter::OFF),
-    );
-    app.add_plugins(PhysicsPlugins::default());
-    app.add_plugins(Sprite3dPlugin);
-    app.add_plugins(TrenchBroomPlugins(
-        TrenchBroomConfig::new("hedz").icon(None),
-    ));
-    app.add_plugins(UiGradientsPlugin);
-    app.add_plugins(RonAssetPlugin::<HeadDatabaseAsset>::new(&["headsdb.ron"]));
-
-    #[cfg(feature = "dbg")]
-    {
-        app.add_plugins(bevy_inspector_egui::bevy_egui::EguiPlugin {
-            enable_multipass_for_primary_context: true,
-        });
-        app.add_plugins(bevy_inspector_egui::quick::WorldInspectorPlugin::new());
-        app.add_plugins(PhysicsDebugPlugin::default());
-
-        // app.add_plugins(bevy::pbr::wireframe::WireframePlugin)
-        //     .insert_resource(bevy::pbr::wireframe::WireframeConfig {
-        //         global: true,
-        //         default_color: bevy::color::palettes::css::WHITE.into(),
-        //     });
-    }
-
-    app.add_plugins(ai::plugin);
-    app.add_plugins(animation::plugin);
-    app.add_plugins(character::plugin);
-    app.add_plugins(cash::plugin);
-    app.add_plugins(player::plugin);
-    app.add_plugins(gates::plugin);
-    app.add_plugins(platforms::plugin);
-    app.add_plugins(movables::plugin);
-    app.add_plugins(billboards::plugin);
-    app.add_plugins(aim::plugin);
-    app.add_plugins(npc::plugin);
-    app.add_plugins(keys::plugin);
-    app.add_plugins(squish_animation::plugin);
-    app.add_plugins(cutscene::plugin);
-    app.add_plugins(control::plugin);
-    app.add_plugins(sounds::plugin);
-    app.add_plugins(camera::plugin);
-    app.add_plugins(backpack::plugin);
-    app.add_plugins(loading_assets::LoadingPlugin);
-    app.add_plugins(loading_map::plugin);
-    app.add_plugins(sprite_3d_animation::plugin);
-    app.add_plugins(abilities::plugin);
-    app.add_plugins(heads::plugin);
-    app.add_plugins(hitpoints::plugin);
-    app.add_plugins(cash_heal::plugin);
-    app.add_plugins(debug::plugin);
-    app.add_plugins(utils::observers::plugin);
-    app.add_plugins(water::plugin);
-    app.add_plugins(head_drop::plugin);
-    app.add_plugins(trail::plugin);
-    app.add_plugins(auto_rotate::plugin);
-    app.add_plugins(heal_effect::plugin);
-    app.add_plugins(tb_entities::plugin);
-    app.add_plugins(explosions::plugin);
-
-    app.init_state::<GameState>();
-
-    app.insert_resource(AmbientLight {
-        color: Color::WHITE,
-        brightness: 400.,
-        ..Default::default()
-    });
-    app.insert_resource(ClearColor(Color::BLACK));
-    //TODO: let user control this
-    app.insert_resource(GlobalVolume::new(Volume::Linear(0.4)));
-
-    app.add_systems(
-        Startup,
-        (
-            write_trenchbroom_config,
-            (steam_system, steam_events)
-                .chain()
-                .run_if(resource_exists::<Client>),
-        ),
-    );
-    app.add_systems(OnEnter(GameState::Playing), music);
-    app.add_systems(Update, (set_materials_unlit, set_tonemapping, set_shadows));
-
-    app.run();
-}
-
-fn steam_events(mut events: EventReader<SteamworksEvent>) {
-    for e in events.read() {
-        info!("steam ev: {:?}", e);
-    }
-}
-
-fn steam_system(steam_client: Res<Client>) {
-    steam_client.matchmaking().request_lobby_list(|list| {
-        let Ok(list) = list else { return };
-
-        info!("lobby list: [{}]", list.len());
-        for (i, l) in list.iter().enumerate() {
-            info!("lobby [{i}]: {:?}", l);
-        }
-    });
-
-    steam_client
-        .matchmaking()
-        .create_lobby(
-            steamworks::LobbyType::FriendsOnly,
-            4,
-            |result| match result {
-                Ok(lobby_id) => {
-                    info!("Created lobby with ID: {:?}", lobby_id);
-                }
-                Err(e) => error!("Failed to create lobby: {}", e),
-            },
-        );
-
-    for friend in steam_client.friends().get_friends(FriendFlags::IMMEDIATE) {
-        info!(
-            "Steam Friend: {:?} - {}({:?})",
-            friend.id(),
-            friend.name(),
-            friend.state()
-        );
-    }
-
-    steam_client
-        .remote_storage()
-        .set_cloud_enabled_for_app(true);
-    let f = steam_client.remote_storage().file("hedz_data.dat");
-    if f.exists() {
-        let mut buf = String::new();
-        if let Err(e) = f.read().read_to_string(&mut buf) {
-            error!("File read error: {}", e);
-        } else {
-            info!("File content: {}", buf);
-        }
-    } else {
-        info!("File does not exist");
-
-        if let Err(e) = f.write().write_all(String::from("hello world").as_bytes()) {
-            error!("steam cloud error: {}", e);
-        } else {
-            info!("steam cloud saved");
-        }
-    }
-}
-
-fn music(assets: Res<AudioAssets>, mut commands: Commands) {
-    commands.spawn((
-        Name::new("sfx-music"),
-        AudioPlayer::new(assets.music.clone()),
-        PlaybackSettings {
-            mode: PlaybackMode::Loop,
-            volume: Volume::Linear(0.6),
-            ..default()
-        },
-    ));
-
-    commands.spawn((
-        Name::new("sfx-ambient"),
-        AudioPlayer::new(assets.ambient.clone()),
-        PlaybackSettings {
-            mode: PlaybackMode::Loop,
-            volume: Volume::Linear(0.8),
-            ..default()
-        },
-    ));
-}
-
-fn write_trenchbroom_config(server: Res<TrenchBroomServer>, type_registry: Res<AppTypeRegistry>) {
-    if let Err(e) = server
-        .config
-        .write_game_config("trenchbroom/hedz", &type_registry.read())
-    {
-        warn!("Failed to write trenchbroom config: {}", e);
-    }
-}
-
-fn set_tonemapping(
-    mut cams: Query<(&mut Tonemapping, &mut ColorGrading), With<MainCamera>>,
-    visuals: Res<DebugVisuals>,
-) {
-    for (mut tm, mut color) in cams.iter_mut() {
-        *tm = visuals.tonemapping;
-        color.global.exposure = visuals.exposure;
-    }
-}
-
-fn set_materials_unlit(
-    mut materials: ResMut<Assets<StandardMaterial>>,
-    visuals: Res<DebugVisuals>,
-) {
-    if !materials.is_changed() {
-        return;
-    }
-
-    for (_, material) in materials.iter_mut() {
-        material.unlit = visuals.unlit;
-    }
-}
-
-fn set_shadows(mut lights: Query<&mut DirectionalLight>, visuals: Res<DebugVisuals>) {
-    for mut l in lights.iter_mut() {
-        l.shadows_enabled = visuals.shadows;
-    }
-}

crates/server/Cargo.toml

@@ -1,27 +0,0 @@
-[package]
-name = "server"
-version = "0.1.0"
-edition = "2024"
-
-[features]
-dbg = ["avian3d/debug-plugin", "dep:bevy-inspector-egui", "shared/dbg"]
-
-[dependencies]
-avian3d = { workspace = true }
-bevy = { workspace = true }
-bevy-inspector-egui = { workspace = true, optional = true }
-bevy-steamworks = { workspace = true }
-bevy-ui-gradients = { workspace = true }
-bevy_asset_loader = { workspace = true }
-bevy_ballistic = { workspace = true }
-bevy_common_assets = { workspace = true }
-bevy_debug_log = { workspace = true }
-bevy_sprite3d = { workspace = true }
-bevy_trenchbroom = { workspace = true }
-happy_feet = { workspace = true }
-nil = { workspace = true }
-rand = { workspace = true }
-ron = { workspace = true }
-serde = { workspace = true }
-shared = { workspace = true }
-steamworks = { workspace = true }

crates/shared/Cargo.toml

@@ -1,33 +0,0 @@
-[package]
-name = "shared"
-version = "0.1.0"
-edition = "2024"
-
-[features]
-dbg = []
-
-[dependencies]
-avian3d = { workspace = true }
-bevy = { workspace = true }
-bevy-inspector-egui = { workspace = true, optional = true }
-bevy-steamworks = { workspace = true }
-bevy-ui-gradients = { workspace = true }
-bevy_asset_loader = { workspace = true }
-bevy_ballistic = { workspace = true }
-bevy_common_assets = { workspace = true }
-bevy_debug_log = { workspace = true }
-bevy_sprite3d = { workspace = true }
-bevy_trenchbroom = { workspace = true }
-happy_feet = { workspace = true }
-nil = { workspace = true }
-rand = { workspace = true }
-ron = { workspace = true }
-serde = { workspace = true }
-steamworks = { workspace = true }
-
-[build-dependencies]
-vergen-gitcl = "1.0"
-
-[lints.clippy]
-too_many_arguments = "allow"
-type_complexity = "allow"

crates/shared/src/lib.rs

@@ -1,52 +0,0 @@
-pub mod abilities;
-pub mod ai;
-pub mod aim;
-pub mod animation;
-pub mod backpack;
-pub mod camera;
-pub mod cash;
-pub mod cash_heal;
-pub mod character;
-pub mod control;
-pub mod cutscene;
-pub mod debug;
-pub mod gates;
-pub mod head;
-pub mod head_drop;
-pub mod heads;
-pub mod heads_database;
-pub mod heal_effect;
-pub mod hitpoints;
-pub mod keys;
-pub mod loading_assets;
-pub mod loading_map;
-pub mod movables;
-pub mod npc;
-pub mod physics_layers;
-pub mod platforms;
-pub mod player;
-pub mod sounds;
-pub mod tb_entities;
-pub mod utils;
-pub mod water;
-
-use bevy::{core_pipeline::tonemapping::Tonemapping, prelude::*};
-use utils::{billboards, squish_animation};
-
-#[derive(Resource, Reflect, Debug)]
-#[reflect(Resource)]
-pub struct DebugVisuals {
-    pub unlit: bool,
-    pub tonemapping: Tonemapping,
-    pub exposure: f32,
-    pub shadows: bool,
-    pub cam_follow: bool,
-}
-
-#[derive(States, Default, Clone, Eq, PartialEq, Debug, Hash)]
-pub enum GameState {
-    #[default]
-    AssetLoading,
-    MapLoading,
-    Playing,
-}

justfile

@@ -5,14 +5,8 @@ tb_setup_mac:
     ln -s $(pwd)/trenchbroom/hedz/hedz.fgd "$HOME/Library/Application Support/TrenchBroom/games/hedz/hedz.fgd" | true
     ln -s $(pwd)/trenchbroom/hedz/GameConfig.cfg "$HOME/Library/Application Support/TrenchBroom/games/hedz/GameConfig.cfg" | true
 
-run:
-    RUST_BACKTRACE=1 cargo r --bin client
-
 dbg:
-    RUST_BACKTRACE=1 cargo r --bin client --features dbg
-
-dbg-server:
-    RUST_BACKTRACE=1 cargo r --bin server --features dbg
+    RUST_BACKTRACE=1 cargo r --features dbg
 
 check:
     cargo fmt --check

src/main.rs

@@ -1,3 +1,35 @@
+mod abilities;
+mod ai;
+mod aim;
+mod animation;
+mod backpack;
+mod camera;
+mod cash;
+mod cash_heal;
+mod character;
+mod control;
+mod cutscene;
+mod debug;
+mod gates;
+mod head;
+mod head_drop;
+mod heads;
+mod heads_database;
+mod heal_effect;
+mod hitpoints;
+mod keys;
+mod loading_assets;
+mod loading_map;
+mod movables;
+mod npc;
+mod physics_layers;
+mod platforms;
+mod player;
+mod sounds;
+mod tb_entities;
+mod utils;
+mod water;
+
 use crate::utils::{auto_rotate, explosions};
 use avian3d::prelude::*;
 use bevy::{
@@ -14,10 +46,27 @@ use bevy_ui_gradients::UiGradientsPlugin;
 use camera::MainCamera;
 use heads_database::HeadDatabaseAsset;
 use loading_assets::AudioAssets;
-use shared::*;
 use std::io::{Read, Write};
 use utils::{billboards, sprite_3d_animation, squish_animation, trail};
 
+#[derive(Resource, Reflect, Debug)]
+#[reflect(Resource)]
+struct DebugVisuals {
+    pub unlit: bool,
+    pub tonemapping: Tonemapping,
+    pub exposure: f32,
+    pub shadows: bool,
+    pub cam_follow: bool,
+}
+
+#[derive(States, Default, Clone, Eq, PartialEq, Debug, Hash)]
+enum GameState {
+    #[default]
+    AssetLoading,
+    MapLoading,
+    Playing,
+}
+
 fn main() {
     let mut app = App::new();
 

src/sounds.rs

@@ -70,11 +70,11 @@ fn on_spawn_sounds(
             }
         }
         PlaySound::Head(name) => {
-            let filename = format!("{name}.ogg");
+            let filename = format!("{}.ogg", name);
             assets
                 .head
                 .get(filename.as_str())
-                .unwrap_or_else(|| panic!("invalid head '{filename}'"))
+                .unwrap_or_else(|| panic!("invalid head '{}'", filename))
                 .clone()
         }
     };

src/tb_entities.rs

@@ -141,7 +141,7 @@ impl EnemySpawn {
 
         world.commands().entity(entity).insert((
             this_transform,
-            Name::from(format!("enemy [{head}]")),
+            Name::from(format!("enemy [{}]", head)),
             Visibility::default(),
             RigidBody::Dynamic,
             Collider::capsule(0.6, 2.),