wip: continue reorganization

Author: cilki

Cargo.lock

@@ -5,8 +5,8 @@
 use anyhow::Result;
 use native_db::*;
 use native_model::Model;
-use sandpolis_core::InstanceId;
-use sandpolis_database::DatabaseLayer;
+use sandpolis_instance::InstanceId;
+use sandpolis_instance::database::DatabaseLayer;
 use sandpolis_macros::data;
 use serde::{Deserialize, Serialize};
 use validator::Validate;

sandpolis-account/src/lib.rs

@@ -3,7 +3,7 @@
 // }
 
 use anyhow::Result;
-use sandpolis_database::DatabaseLayer;
+use sandpolis_instance::database::DatabaseLayer;
 
 pub mod bootagent;
 pub mod config;

sandpolis-agent/src/lib.rs

@@ -2,7 +2,7 @@ use crate::AgentLayer;
 use crate::messages::{UninstallRequest, UninstallResponse, UpdateRequest, UpdateResponse};
 use axum::extract;
 use axum::extract::State;
-use sandpolis_network::RequestResult;
+use sandpolis_instance::network::RequestResult;
 
 #[derive(Serialize, Deserialize)]
 pub struct UninstallRequest;

sandpolis-agent/src/uninstall.rs

@@ -2,7 +2,7 @@ use crate::AgentLayer;
 use crate::messages::{UninstallRequest, UninstallResponse, UpdateRequest, UpdateResponse};
 use axum::extract;
 use axum::extract::State;
-use sandpolis_network::RequestResult;
+use sandpolis_instance::network::RequestResult;
 
 #[derive(Serialize, Deserialize)]
 pub struct UpdateRequest;

sandpolis-agent/src/update.rs

@@ -1,6 +1,6 @@
 use native_db::*;
 use native_model::Model;
-use sandpolis_core::InstanceId;
+use sandpolis_instance::InstanceId;
 use sandpolis_macros::data;
 
 #[data]

sandpolis-audit/src/lib.rs

@@ -7,9 +7,9 @@ use ratatui::{
     widgets::ListItem,
 };
 use sandpolis_client::tui::{Panel, selectable_list::ResidentVecWidget};
-use sandpolis_database::{DataCreation, DataIdentifier, DataRevision, test_db};
+use sandpolis_instance::database::{DataCreation, DataIdentifier, DataRevision, test_db};
 use sandpolis_macros::data;
-use sandpolis_realm::RealmName;
+use sandpolis_instance::realm::RealmName;
 
 // Define a simple data structure for our list
 #[data]

sandpolis-client/examples/resident_vec.rs

@@ -2,7 +2,7 @@ use crate::gui::edges::Edge;
 use crate::gui::input::CurrentLayer;
 use crate::gui::node::NodeEntity;
 use bevy::prelude::*;
-use sandpolis_core::InstanceId;
+use sandpolis_instance::InstanceId;
 
 /// Component for animated activity lines moving along edges
 #[derive(Component)]

sandpolis-client/src/gui/activity.rs

@@ -9,8 +9,8 @@ use crate::gui::layer_ext::get_extension_for_layer;
 use crate::gui::node::{NodeEntity, WorldView};
 use bevy::prelude::*;
 use bevy_egui::{EguiContexts, egui};
-use sandpolis_core::InstanceId;
-use sandpolis_core::LayerName;
+use sandpolis_instance::InstanceId;
+use sandpolis_instance::LayerName;
 
 /// Resource tracking which node controller is currently open
 #[derive(Resource, Default)]

sandpolis-client/src/gui/controller.rs

@@ -3,7 +3,7 @@ use bevy::prelude::*;
 use bevy::window::PrimaryWindow;
 use bevy_egui::{EguiContexts, egui};
 use bevy_rapier2d::prelude::*;
-use sandpolis_core::InstanceId;
+use sandpolis_instance::InstanceId;
 
 /// Resource tracking all currently selected nodes.
 #[derive(Resource, Default)]
@@ -65,7 +65,7 @@ pub fn handle_node_selection(
 
     // Check which node was clicked
     const CLICK_RADIUS: f32 = 50.0;
-    let mut clicked_node: Option<(Entity, sandpolis_core::InstanceId)> = None;
+    let mut clicked_node: Option<(Entity, sandpolis_instance::InstanceId)> = None;
 
     for (entity, transform, node_entity) in node_query.iter() {
         let node_pos = transform.translation.truncate();