Consolidate imports

src/bin/trees/main.rs

@@ -3,11 +3,6 @@
 
 mod mono;
 
-use bevy::{
-    asset::LoadedFolder,
-    color::palettes::css::{DARK_GREY, DARK_ORANGE, GREY, ORANGE, PINK},
-    window::WindowResized,
-};
 use games::*;
 use mono::*;
 
@@ -336,7 +331,9 @@ fn dialog_engine(
                 debug!("Dialog ended");
 
                 // Remove the TreeMonologue component from the tree we just "spoke to"
-                commands.entity(tree_entity.unwrap()).remove::<TreeMonologue>();
+                commands
+                    .entity(tree_entity.unwrap())
+                    .remove::<TreeMonologue>();
 
                 // Remove lines from dialog box
                 lines.iter().for_each(|e| {
@@ -656,13 +653,7 @@ fn spawn_monologue_tree(
         let mesh = Mesh3d(meshes.add(Plane3d::new(Vec3::Y, Vec2::splat(1.0))));
 
         commands
-            .spawn((
+            .spawn((Tree, mesh, material, tree_monologue.clone(), transform))
-                Tree,
-                mesh,
-                material,
-                tree_monologue.clone(),
-                transform
-            ))
             .observe(delete_tree);
     }
 }

src/bin/trees/mono.rs

@@ -1,11 +1,3 @@
-use bevy::{
-    asset::{AssetLoader, LoadContext, io::Reader},
-    prelude::*,
-    reflect::TypePath,
-};
-use serde::Deserialize;
-use thiserror::Error;
-
 #[derive(Asset, TypePath, Debug, Deserialize, Default, Clone)]
 pub(crate) struct Monologue {
     value: Vec<Vec<String>>,

src/debug.rs

@@ -1,10 +1,3 @@
-use bevy::{
-    color::palettes::css::{GREY, MAGENTA},
-    gizmos::{aabb::AabbGizmoPlugin, light::LightGizmoPlugin},
-    pbr::wireframe::{WireframeConfig, WireframePlugin},
-    platform::collections::HashMap,
-};
-
 use super::*;
 
 /// Debugging systems, resources, events, etc.

src/lib.rs

@@ -11,8 +11,9 @@ mod version;
 pub use std::fmt::Display;
 
 pub use bevy::{
-    asset::LoadState,
+    asset::{AssetLoader, LoadContext, LoadState, LoadedFolder, io::Reader},
-    color::palettes::css::{BLACK, BLUE, GREEN, RED, WHITE},
+    color::palettes::css::*,
+    gizmos::{aabb::AabbGizmoPlugin, light::LightGizmoPlugin},
     input::{
         ButtonState,
         common_conditions::{input_just_pressed, input_pressed},
@@ -20,9 +21,15 @@ pub use bevy::{
         mouse::MouseMotion,
         mouse::{MouseScrollUnit, MouseWheel},
     },
+    pbr::wireframe::{WireframeConfig, WireframePlugin},
+    platform::collections::HashMap,
     prelude::*,
+    reflect::TypePath,
+    window::WindowResized,
 };
 pub use bevy_rapier3d::prelude::*;
+pub use serde::Deserialize;
+pub use thiserror::Error;
 
 pub use base_game::*;
 pub use debug::*;