Plugin cleanup

src/main.rs

@@ -1,14 +1,12 @@
 use bevy::prelude::*;
 use bevy_rand::prelude::*;
 
-use crate::entities::{
-    cargo::carry_visual_system,
-    cargo::any_hauling,
-    item::{initialize_item_rotation_state, item_tile_management_system, ItemRotationTimer},
-    shared_systems::digging::dig_system,
-    tasks::{TaskClaimed, TaskCompleted, TaskFailed, TaskDropped, TaskBlocked},
+use crate::entities::item::{
+    initialize_item_rotation_state, item_tile_management_system, ItemRotationTimer,
 };
 use crate::game::SpawnDelay;
+use crate::plugins::{CargoPlugin, TasksPlugin, EntitiesPlugin};
+use crate::world::WorldPlugin;
 
 mod camera;
 mod config;
@@ -17,6 +15,7 @@ mod cursor;
 mod debug;
 mod entities;
 mod game;
+mod plugins;
 mod system_info;
 mod world;
 
@@ -46,13 +45,13 @@ fn main() {
             (constants::SEED as u64).to_le_bytes(),
         ))
         .insert_resource(ClearColor(Color::srgb(0., 0., 0.)))
-        .add_plugins(world::WorldPlugin)
-        .add_plugins(entities::pathfinding::PathfindingPlugin)
-        .add_message::<TaskClaimed>()
-        .add_message::<TaskCompleted>()
-        .add_message::<TaskFailed>()
-        .add_message::<TaskDropped>()
-        .add_message::<TaskBlocked>()
+        .add_plugins((
+            WorldPlugin,
+            EntitiesPlugin,
+            CargoPlugin,
+            TasksPlugin,
+            entities::pathfinding::PathfindingPlugin,
+        ))
         .add_systems(
             Startup,
             (camera::spawn_panning_camera, cursor::setup_cursor),
@@ -67,7 +66,7 @@ fn main() {
                 entities::sentient::dorf::spawn_dorfs,
                 entities::livestock::pig::spawn_pigs,
                 entities::livestock::rabbit::spawn_rabbits,
-                dig_system,
+                entities::shared_systems::digging::dig_system,
             ),
         )
 
@@ -78,6 +77,5 @@ fn main() {
             item_tile_management_system.after(initialize_item_rotation_state),
         )
         .add_systems(Update, debug::entity_dump::dump_entity_positions)
-        .add_systems(Update, carry_visual_system.run_if(any_hauling))
         .run();
-}
+}