11 files changed, 110 insertions(+), 7 deletions(-)

M crates/unified/assets/config/parts/hearty.part.toml
A crates/unified/src/client/crafting/mod.rs
A crates/unified/src/client/crafting/ui.rs
M crates/unified/src/client/mod.rs
M crates/unified/src/client/parts.rs
M crates/unified/src/client/rendering/mod.rs
M crates/unified/src/client_plugins.rs
M crates/unified/src/config/part.rs
M crates/unified/src/ecs.rs
M crates/unified/src/server/part.rs
M crates/unified/src/shared_plugins.rs

@@ 47,4 47,7 @@ snap = { translation = [ 0.0, -25.0, 0.0 ], rotation = 0.0 }
 [[joint]]
 id = "Left"
 target = { translation = [ -55.0, 0.0, 0.0 ], rotation = -270.0 }
-snap = { translation = [ -25.0, 0.0, 0.0 ], rotation = 0.0 }>
\ No newline at end of file
+snap = { translation = [ -25.0, 0.0, 0.0 ], rotation = 0.0 }
+
+[crafting]
+can_craft = true

@@ 0,0 1,1 @@
+pub mod ui;

@@ 0,0 1,70 @@
+use bevy::{input_focus::{AutoFocus, InputFocus}, ui::RelativeCursorPosition};
+
+use crate::{attachment::PartInShip, client::colors, ecs::{CanCraft, CraftingUi, MainCamera, Me}, prelude::*};
+
+pub fn crafting_ui_plugin(app: &mut App) {
+    app.add_systems(Update, close_ui);
+}
+
+pub fn open_crafting_ui(
+    ev: On<Pointer<Press>>,
+    crafting_parts: Query<(Entity, &Transform), (With<PartInShip>, With<CanCraft>)>,
+    hearty: Query<(Entity, &Transform), (With<Me>, With<CanCraft>)>,
+    camera: Single<(Entity, &Camera, &GlobalTransform), (With<MainCamera>, Without<PartInShip>)>,
+    commands: Commands,
+) {
+    if matches!(ev.button, PointerButton::Secondary) {
+        let (entity, transform) = if let Ok(part) = crafting_parts.get(ev.entity) {
+            part
+        } else if let Ok(part) = hearty.get(ev.entity) {
+            part
+        } else {
+            return
+        };
+        // we have our crafting entity!
+        // now make the ui
+        setup_ui(transform, commands, camera);
+    }
+}
+
+fn setup_ui(
+    parent_transform: &Transform,
+    mut commands: Commands,
+    camera: Single<(Entity, &Camera, &GlobalTransform), (With<MainCamera>, Without<PartInShip>)>,
+) {
+    let parent_pos = camera.1.world_to_viewport(camera.2, parent_transform.translation).unwrap();
+    let entity = commands.spawn((
+        UiTargetCamera(camera.0),
+        Node {
+            position_type: PositionType::Absolute,
+            left: Val::Px(parent_pos.x),
+            top: Val::Px(parent_pos.y),
+            width: Val::Px(100.0),
+            height: Val::Px(100.0),
+            ..default()
+        },
+        AutoFocus,
+        CraftingUi,
+        BackgroundColor(colors::MANTLE),
+        RelativeCursorPosition::default(),
+    ));
+}
+
+pub fn close_ui(
+    buttons: Res<ButtonInput<MouseButton>>,
+    crafting_ui: Query<(Entity, &RelativeCursorPosition), With<CraftingUi>>,
+    mut commands: Commands,
+) {
+    if crafting_ui.is_empty() { return }
+    if !buttons.any_just_released([MouseButton::Left, MouseButton::Right]) { return }
+
+    for (_, cursor_pos) in &crafting_ui {
+        if cursor_pos.cursor_over {
+            return;
+        }
+    }
+
+    for (entity, _) in &crafting_ui {
+        commands.entity(entity).despawn();
+    }
+}

@@ 1,3 1,4 @@
+use crate::client::crafting::ui::crafting_ui_plugin;
 use crate::client::key_input::key_input_plugin;
 use crate::client::parts::parts_plugin;
 use crate::client::planet::indicators::indicators_plugin;


@@ 28,6 29,7 @@ pub mod ship;
 pub mod rendering;
 pub mod input;
 pub mod starguide;
+pub mod crafting;
 
 pub struct ClientPlugin {
     pub server: Option<String>,


@@ 61,6 63,7 @@ impl Plugin for ClientPlugin {
             .add_plugins(starguide_init_plugin)
             .add_plugins(starguide_input_plugin)
             .add_plugins(starguide_orbit_plugin)
+            .add_plugins(crafting_ui_plugin)
             .insert_state(GameplayState::Main)
             .insert_resource(DebugPickingMode::Disabled);
 

@@ 1,6 1,7 @@
 use std::f32::consts::PI;
 
 use crate::attachment::{Joint, JointOf, Joints, PartInShip, Peer, SnapOf, SnapOfJoint};
+use crate::client::crafting::ui::open_crafting_ui;
 use crate::ecs::Me;
 use crate::client::colors::GREEN;
 use crate::ecs::{DragRequestEvent, Part, MAIN_LAYER};


@@ 45,7 46,8 @@ fn handle_incoming_parts(
             .insert(MAIN_LAYER)
             .insert(sprite)
             .insert(Pickable::default())
-            .observe(on_part_click);
+            .observe(on_part_click)
+            .observe(open_crafting_ui);
     }
 }
 fn handle_updated_parts(

@@ 2,6 2,7 @@ use bevy::anti_alias::fxaa::Fxaa;
 use bevy::app::{App, Startup};
 use bevy::core_pipeline::tonemapping::DebandDither;
 use bevy::post_process::bloom::Bloom;
+use crate::client::crafting::ui::close_ui;
 use crate::ecs::{GameplayState, MAIN_LAYER, MainCamera, Me, STARGUIDE_LAYER, StarguideGizmos};
 use crate::prelude::*;
 


@@ 23,7 24,8 @@ pub fn setup_graphics(mut config_store: ResMut<GizmoConfigStore>, mut commands: 
         .insert(Bloom::default())
         .insert(DebandDither::Enabled)
         .insert(Fxaa::default())
-        .insert(MainCamera);
+        .insert(MainCamera)
+        .insert(SpritePickingCamera);
     let (gizmo_config, _) = config_store.config_mut::<StarguideGizmos>();
     gizmo_config.render_layers = STARGUIDE_LAYER;
     gizmo_config.depth_bias = 1.0;

@@ 4,6 4,7 @@ use aeronet_websocket::client::WebSocketClientPlugin;
 use bevy::app::{PluginGroup, PluginGroupBuilder};
 use bevy::dev_tools::picking_debug::DebugPickingPlugin;
 use bevy::ecs::schedule::ScheduleLabel;
+use bevy::input_focus::InputDispatchPlugin;
 use crate::prelude::*;
 use bevy::ui::UiPlugin;
 use leafwing_input_manager::plugin::InputManagerPlugin;


@@ 22,9 23,10 @@ impl PluginGroup for ClientPluginGroup {
                 server: self.server,
             })
             .add(UiPlugin)
+            .add(InputDispatchPlugin)
             .add(InputManagerPlugin::<crate::client::input::ClientAction>::default())
     }
 }
 
 #[derive(ScheduleLabel, Clone, Eq, Debug, Hash, PartialEq)]
-pub struct DontRunSchedule;>
\ No newline at end of file
+pub struct DontRunSchedule;

@@ 13,6 13,7 @@ pub struct PartConfig {
     #[serde(default)]
     #[serde(rename = "joint")]
     pub joints: Vec<JointConfig>,
+    pub crafting: Option<CraftingConfig>,
 }
 #[derive(Deserialize, TypePath, Serialize, Clone, Debug, PartialEq)]
 pub struct PartPartConfig {


@@ 53,3 54,7 @@ impl From<JointOffset> for Transform {
         }
     }
 }
+#[derive(Deserialize, TypePath, Serialize, Clone, Debug, PartialEq)]
+pub struct CraftingConfig {
+    pub can_craft: bool,
+}

@@ 108,3 108,8 @@ pub struct Hi {
     #[entities]
     pub you_are: Entity
 }
+
+#[derive(Component, Serialize, Deserialize, Debug)]
+pub struct CanCraft;
+#[derive(Component, Serialize, Deserialize, Debug)]
+pub struct CraftingUi;

@@ 1,6 1,6 @@
 use crate::attachment::{Joint, JointId, JointOf, Joints, Peer, SnapOf, SnapOfJoint};
-use crate::config::part::{JointConfig, PartConfig};
-use crate::ecs::{Part, PartHandle};
+use crate::config::part::{CraftingConfig, JointConfig, PartConfig};
+use crate::ecs::{CanCraft, Part, PartHandle};
 use crate::prelude::*;
 use bevy_replicon::prelude::Replicated;
 use crate::ecs::thruster::{PartThrusters, Thruster, ThrusterBundle, ThrusterId, ThrusterOfPart};


@@ 32,6 32,9 @@ fn handle_ready_parts(
                 .entity(entity)
                 .insert(calculate_bundle(strong_config, &loading_part.0))
                 .remove::<SpawnPartRequest>();
+            if let Some(ref crafting_config) = strong_config.crafting {
+                crafting_bundle(&mut commands.entity(entity), &crafting_config);
+            }
             spawn_joints(strong_config, entity, commands.reborrow());
             spawn_thrusters(strong_config, entity, commands.reborrow());
         }


@@ 129,6 132,11 @@ fn calculate_bundle(config: &PartConfig, handle: &Handle<PartConfig>) -> impl Bu
         mass,
     )
 }
+fn crafting_bundle(entity: &mut EntityCommands, config: &CraftingConfig) {
+    if config.can_craft {
+        entity.insert(CanCraft);
+    }
+}
 fn spawn_joint_bundle(joint: &JointConfig, part: &PartConfig, parent: &Entity) -> impl Bundle {
     let j_comp = Joint {
         id: JointId::from_part_and_joint_id(part.part.name.clone(), joint.id.clone()),


@@ 169,3 177,4 @@ fn spawn_thrusters(config: &PartConfig, part: Entity, mut commands: Commands) {
             });
     }
 }
+

@@ 1,6 1,6 @@
 use crate::attachment::{Joint, JointOf, PartInShip, Peer, Ship, SnapOf, SnapOfJoint};
 use crate::config::planet::{Planet, PlanetConfigCollection};
-use crate::ecs::{DragRequestEvent, Hi, Part, Particles, Player, PlayerStorage};
+use crate::ecs::{CanCraft, DragRequestEvent, Hi, Part, Particles, Player, PlayerStorage};
 use bevy::app::{App, PluginGroup, PluginGroupBuilder};
 use bevy_common_assets::toml::TomlAssetPlugin;
 use crate::prelude::*;


@@ 52,6 52,7 @@ pub fn register_everything(app: &mut App) {
     app.replicate::<PlayerStorage>();
     app.replicate::<Thruster>();
     app.replicate::<ThrusterOfPart>();
+    app.replicate::<CanCraft>();
 }
 
 fn physics_setup_plugin(app: &mut App) {