From 81ddf1a3c08824907de862888ff951611ad71dc7 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 22 Dec 2024 20:45:22 -0500
Subject: [PATCH 01/31] Enabling more persistent component serialization
 customization

---
 .../src/block/specific_blocks/gravity_well.rs |  11 +-
 .../src/blocks/interactable/gravity_well.rs   |  49 ++++++
 cosmos_server/src/economy/mod.rs              |   4 +-
 cosmos_server/src/entities/player/mod.rs      |   4 +-
 cosmos_server/src/fluid/mod.rs                |   6 +-
 cosmos_server/src/inventory/mod.rs            |   4 +-
 cosmos_server/src/items/mod.rs                |   6 +-
 .../src/persistence/make_persistent.rs        | 141 +++++++++++++++---
 .../src/structure/planet/planet_rotation.rs   |   4 +-
 .../src/structure/shared/melt_down.rs         |   4 +-
 cosmos_server/src/universe/spawners/pirate.rs |   6 +-
 11 files changed, 202 insertions(+), 37 deletions(-)

diff --git a/cosmos_core/src/block/specific_blocks/gravity_well.rs b/cosmos_core/src/block/specific_blocks/gravity_well.rs
index fc2db4853..a8b9084b5 100644
--- a/cosmos_core/src/block/specific_blocks/gravity_well.rs
+++ b/cosmos_core/src/block/specific_blocks/gravity_well.rs
@@ -16,7 +16,10 @@ use bevy::{
 use bevy_rapier3d::dynamics::{ExternalImpulse, ReadMassProperties};
 use serde::{Deserialize, Serialize};
 
-use crate::{netty::system_sets::NetworkingSystemsSet, structure::coordinates::BlockCoordinate};
+use crate::{
+    netty::{sync::IdentifiableComponent, system_sets::NetworkingSystemsSet},
+    structure::coordinates::BlockCoordinate,
+};
 
 /// This component indicates the entity is under the affects of a gravity well.
 #[derive(Serialize, Deserialize, Component, Clone, Copy, Debug, Reflect)]
@@ -29,6 +32,12 @@ pub struct GravityWell {
     pub block: BlockCoordinate,
 }
 
+impl IdentifiableComponent for GravityWell {
+    fn get_component_unlocalized_name() -> &'static str {
+        "cosmos:gravity_well"
+    }
+}
+
 fn do_gravity_well(
     time: Res<Time>,
     mut q_grav_well: Query<(&GravityWell, &ReadMassProperties, &mut ExternalImpulse)>,
diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index 26f3a2f1d..b571df8cc 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -25,10 +25,17 @@ use cosmos_core::{
         cosmos_encoder, server_replication::ReplicationMessage, sync::server_entity_syncing::RequestedEntityEvent,
         system_sets::NetworkingSystemsSet, NettyChannelServer,
     },
+    prelude::BlockCoordinate,
     registry::{identifiable::Identifiable, Registry},
     state::GameState,
     structure::Structure,
 };
+use serde::{Deserialize, Serialize};
+
+use crate::persistence::{
+    make_persistent::{make_persistent, EntityIdManager, PersistentComponent, SelfOrEntityIdType},
+    EntityId,
+};
 
 fn grav_well_handle_block_event(
     mut interact_events: EventReader<BlockInteractEvent>,
@@ -152,7 +159,49 @@ fn on_request_under_grav(
     }
 }
 
+/// The serialized version of a gravity well.
+///
+/// Only public because the trait requires it to be public. Don't use this.
+#[derive(Serialize, Deserialize)]
+pub struct SerializedGravityWell {
+    /// g_constant * mass = force
+    g_constant: Vec3,
+    /// The structure this gravity well is for
+    structure_entity_id: EntityId,
+    /// The block this gravity well is from
+    block: BlockCoordinate,
+}
+
+impl PersistentComponent for GravityWell {
+    type EntityIdType = SerializedGravityWell;
+
+    fn convert_to_entity_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, SerializedGravityWell>> {
+        q_entity_ids
+            .get(self.structure_entity)
+            .map(|x| {
+                SelfOrEntityIdType::EntityIdType(Box::new(SerializedGravityWell {
+                    block: self.block,
+                    g_constant: self.g_constant,
+                    structure_entity_id: x.clone(),
+                }))
+            })
+            .ok()
+    }
+
+    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, entity_id_manager: &EntityIdManager) -> Option<Self> {
+        entity_id_manager
+            .entity_from_entity_id(&e_id_type.structure_entity_id)
+            .map(|e| Self {
+                structure_entity: e,
+                g_constant: e_id_type.g_constant,
+                block: e_id_type.block,
+            })
+    }
+}
+
 pub(super) fn register(app: &mut App) {
+    make_persistent::<GravityWell>(app);
+
     app.add_systems(
         Update,
         (
diff --git a/cosmos_server/src/economy/mod.rs b/cosmos_server/src/economy/mod.rs
index 64a5b037e..6c26ec1cf 100644
--- a/cosmos_server/src/economy/mod.rs
+++ b/cosmos_server/src/economy/mod.rs
@@ -1,9 +1,9 @@
 use bevy::prelude::App;
 use cosmos_core::economy::Credits;
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
-impl PersistentComponent for Credits {}
+impl DefaultPersistentComponent for Credits {}
 
 pub(super) fn register(app: &mut App) {
     make_persistent::<Credits>(app);
diff --git a/cosmos_server/src/entities/player/mod.rs b/cosmos_server/src/entities/player/mod.rs
index 208f1aefd..85b7f8c72 100644
--- a/cosmos_server/src/entities/player/mod.rs
+++ b/cosmos_server/src/entities/player/mod.rs
@@ -5,7 +5,7 @@ use bevy::prelude::{Component, Quat};
 use cosmos_core::netty::sync::IdentifiableComponent;
 use serde::{Deserialize, Serialize};
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
 mod kits;
 pub mod persistence;
@@ -24,7 +24,7 @@ impl IdentifiableComponent for PlayerLooking {
     }
 }
 
-impl PersistentComponent for PlayerLooking {}
+impl DefaultPersistentComponent for PlayerLooking {}
 
 pub(super) fn register(app: &mut App) {
     make_persistent::<PlayerLooking>(app);
diff --git a/cosmos_server/src/fluid/mod.rs b/cosmos_server/src/fluid/mod.rs
index e6a89f618..cfaf753f8 100644
--- a/cosmos_server/src/fluid/mod.rs
+++ b/cosmos_server/src/fluid/mod.rs
@@ -14,14 +14,14 @@ use cosmos_core::{
 };
 use interact_fluid::FluidInteractionSet;
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
 pub mod interact_fluid;
 mod register_blocks;
 mod tank;
 
-impl PersistentComponent for BlockFluidData {}
-impl PersistentComponent for FluidItemData {}
+impl DefaultPersistentComponent for BlockFluidData {}
+impl DefaultPersistentComponent for FluidItemData {}
 
 fn on_place_tank(
     mut evr_changed_block: EventReader<BlockChangedEvent>,
diff --git a/cosmos_server/src/inventory/mod.rs b/cosmos_server/src/inventory/mod.rs
index d6966d2f1..d2c2c6709 100644
--- a/cosmos_server/src/inventory/mod.rs
+++ b/cosmos_server/src/inventory/mod.rs
@@ -3,12 +3,12 @@
 use bevy::prelude::App;
 use cosmos_core::inventory::Inventory;
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
 mod block_events;
 mod netty;
 
-impl PersistentComponent for Inventory {
+impl DefaultPersistentComponent for Inventory {
     fn initialize(&mut self, self_entity: bevy::prelude::Entity, commands: &mut bevy::prelude::Commands) {
         self.set_self_entity(self_entity, commands);
     }
diff --git a/cosmos_server/src/items/mod.rs b/cosmos_server/src/items/mod.rs
index 02109c464..31816cae6 100644
--- a/cosmos_server/src/items/mod.rs
+++ b/cosmos_server/src/items/mod.rs
@@ -18,7 +18,7 @@ use cosmos_core::{
 };
 use serde::{Deserialize, Serialize};
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
 #[derive(Default, Component, Debug, Reflect, Serialize, Deserialize, Clone, Copy, PartialEq)]
 /// The time (in seconds) since this physcal item was created.
@@ -30,9 +30,9 @@ impl IdentifiableComponent for TimeSinceSpawn {
     }
 }
 
-impl PersistentComponent for TimeSinceSpawn {}
+impl DefaultPersistentComponent for TimeSinceSpawn {}
 
-impl PersistentComponent for PhysicalItem {}
+impl DefaultPersistentComponent for PhysicalItem {}
 
 const PHYSICAL_ITEM_LIFETIME: Duration = Duration::from_mins(5);
 
diff --git a/cosmos_server/src/persistence/make_persistent.rs b/cosmos_server/src/persistence/make_persistent.rs
index 502ac5a43..4235883d4 100644
--- a/cosmos_server/src/persistence/make_persistent.rs
+++ b/cosmos_server/src/persistence/make_persistent.rs
@@ -7,10 +7,10 @@ use bevy::{
         event::EventReader,
         query::With,
         schedule::IntoSystemConfigs,
-        system::{Commands, Query},
+        system::{Commands, Query, SystemParam},
     },
     hierarchy::Parent,
-    log::warn,
+    log::{error, warn},
 };
 use cosmos_core::{
     block::data::{persistence::ChunkLoadBlockDataEvent, BlockData},
@@ -25,38 +25,82 @@ use crate::structure::persistence::{chunk::BlockDataSavingSet, BlockDataNeedsSav
 use super::{
     loading::{LoadingSystemSet, NeedsLoaded, LOADING_SCHEDULE},
     saving::{NeedsSaved, SavingSystemSet, SAVING_SCHEDULE},
-    SerializedData,
+    EntityId, SerializedData,
 };
 
-fn save_component<T: PersistentComponent>(mut q_needs_saved: Query<(&mut SerializedData, &T), With<NeedsSaved>>) {
-    q_needs_saved.iter_mut().for_each(|(mut serialized_data, component)| {
-        serialized_data.serialize_data(T::get_component_unlocalized_name(), component);
+fn save_component<T: PersistentComponent>(
+    mut q_needs_saved: Query<(Entity, &mut SerializedData, &T), With<NeedsSaved>>,
+    q_entity_ids: Query<&EntityId>,
+) {
+    q_needs_saved.iter_mut().for_each(|(entity, mut serialized_data, component)| {
+        let Some(entity_id_type) = component.convert_to_entity_type(&q_entity_ids) else {
+            error!(
+                "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
+                T::get_component_unlocalized_name()
+            );
+            return;
+        };
+
+        let save_data = match &entity_id_type {
+            SelfOrEntityIdType::SameType(t) => *t,
+            SelfOrEntityIdType::EntityIdType(t) => t.as_ref(),
+        };
+
+        serialized_data.serialize_data(T::get_component_unlocalized_name(), save_data);
     });
 }
 
 fn save_component_block_data<T: PersistentComponent>(
-    q_storage_blocks: Query<(&Parent, &T, &BlockData), With<BlockDataNeedsSaved>>,
+    q_storage_blocks: Query<(Entity, &Parent, &T, &BlockData), With<BlockDataNeedsSaved>>,
     mut q_chunk: Query<&mut SerializedBlockData>,
+    q_entity_ids: Query<&EntityId>,
 ) {
-    q_storage_blocks.iter().for_each(|(parent, component, block_data)| {
+    q_storage_blocks.iter().for_each(|(entity, parent, component, block_data)| {
         let mut serialized_block_data = q_chunk
             .get_mut(parent.get())
             .expect("Block data's parent didn't have SerializedBlockData???");
 
+        let Some(entity_id_type) = component.convert_to_entity_type(&q_entity_ids) else {
+            error!(
+                "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
+                T::get_component_unlocalized_name()
+            );
+            return;
+        };
+
+        let save_data = match &entity_id_type {
+            SelfOrEntityIdType::SameType(t) => *t,
+            SelfOrEntityIdType::EntityIdType(t) => t.as_ref(),
+        };
+
         serialized_block_data.serialize_data(
             ChunkBlockCoordinate::for_block_coordinate(block_data.identifier.block.coords()),
             T::get_component_unlocalized_name(),
-            component,
+            save_data,
         );
     });
 }
 
-fn load_component<T: PersistentComponent>(mut commands: Commands, q_needs_loaded: Query<(Entity, &SerializedData), With<NeedsLoaded>>) {
+fn load_component<T: PersistentComponent>(
+    mut commands: Commands,
+    q_needs_loaded: Query<(Entity, &SerializedData), With<NeedsLoaded>>,
+    entity_id_manager: EntityIdManager,
+) {
     q_needs_loaded.iter().for_each(|(entity, serialized_data)| {
-        if let Some(mut component) = serialized_data.deserialize_data::<T>(T::get_component_unlocalized_name()) {
-            component.initialize(entity, &mut commands);
-            commands.entity(entity).insert(component);
-        }
+        let Some(component_save_data) = serialized_data.deserialize_data::<T::EntityIdType>(T::get_component_unlocalized_name()) else {
+            return;
+        };
+
+        let Some(mut component) = T::convert_from_entity_id_type(component_save_data, &entity_id_manager) else {
+            error!(
+                "Error getting entities needed for component {} for entity {entity:?}",
+                T::get_component_unlocalized_name()
+            );
+            return;
+        };
+
+        component.initialize(entity, &mut commands);
+        commands.entity(entity).insert(component);
     });
 }
 
@@ -67,6 +111,8 @@ fn load_component_from_block_data<T: PersistentComponent>(
     mut ev_reader: EventReader<ChunkLoadBlockDataEvent>,
     mut commands: Commands,
     q_has_component: Query<(), With<T>>,
+    q_entity_ids: Query<&EntityId>,
+    entity_id_manager: EntityIdManager,
 ) {
     for ev in ev_reader.read() {
         let Ok(mut structure) = q_structure.get_mut(ev.structure_entity) else {
@@ -76,8 +122,17 @@ fn load_component_from_block_data<T: PersistentComponent>(
 
         let first = ev.chunk.first_structure_block();
         for (data_coord, serialized) in ev.data.iter() {
-            let Some(mut data) = serialized.deserialize_data::<T>(T::get_component_unlocalized_name()) else {
-                continue;
+            let Some(component_save_data) = serialized.deserialize_data::<T::EntityIdType>(T::get_component_unlocalized_name()) else {
+                return;
+            };
+
+            let Some(mut data) = T::convert_from_entity_id_type(component_save_data, &entity_id_manager) else {
+                error!(
+                    "Error getting entities needed for component {} for block data @ {data_coord} in structure {:?}",
+                    T::get_component_unlocalized_name(),
+                    ev.structure_entity
+                );
+                return;
             };
 
             structure.insert_block_data_with_entity(
@@ -95,12 +150,64 @@ fn load_component_from_block_data<T: PersistentComponent>(
     }
 }
 
+#[derive(SystemParam)]
+pub struct EntityIdManager<'w, 's> {
+    q_entity_ids: Query<'w, 's, (Entity, &'static EntityId)>,
+}
+
+impl<'w, 's> EntityIdManager<'w, 's> {
+    pub fn entity_from_entity_id(&self, e_id: &EntityId) -> Option<Entity> {
+        // TODO: Make this a O(1) lookup
+        self.q_entity_ids.iter().find(|(_, eid)| *eid == e_id).map(|x| x.0)
+    }
+}
+
+pub enum SelfOrEntityIdType<'a, T> {
+    SameType(&'a T),
+    EntityIdType(Box<T>),
+}
+
 /// This component will be saved & loaded when the entity it is a part of is saved/unloaded.
-pub trait PersistentComponent: IdentifiableComponent + Serialize + DeserializeOwned {
+///
+/// For most purposes, you should implement [`DefaultPersistentComponent`] instead of this
+/// directly. Implement this if you need to convert entities to entity id types.
+pub trait PersistentComponent: IdentifiableComponent + Sized {
+    type EntityIdType: Serialize + DeserializeOwned;
+
     /// Initializes this component before adding it to this entity
     ///
     /// Mostly used to clear out any junk data that got saved
     fn initialize(&mut self, _self_entity: Entity, _commands: &mut Commands) {}
+
+    fn convert_to_entity_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, Self::EntityIdType>>;
+    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, entity_id_manager: &EntityIdManager) -> Option<Self>;
+}
+
+/// This component will be saved & loaded when the entity it is a part of is saved/unloaded.
+pub trait DefaultPersistentComponent: PersistentComponent<EntityIdType = Self> {
+    /// Initializes this component before adding it to this entity
+    ///
+    /// Mostly used to clear out any junk data that got saved
+    fn initialize(&mut self, _self_entity: Entity, _commands: &mut Commands) {}
+}
+
+impl<T> PersistentComponent for T
+where
+    T: DefaultPersistentComponent + Serialize + DeserializeOwned,
+{
+    type EntityIdType = Self;
+
+    fn initialize(&mut self, self_entity: Entity, commands: &mut Commands) {
+        DefaultPersistentComponent::initialize(self, self_entity, commands);
+    }
+
+    fn convert_to_entity_type<'a>(&'a self, _: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, Self::EntityIdType>> {
+        Some(SelfOrEntityIdType::SameType(self))
+    }
+
+    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, _: &EntityIdManager) -> Option<Self> {
+        Some(e_id_type)
+    }
 }
 
 /// Makes so that when an entity with this component is saved, the component will be saved as well.
diff --git a/cosmos_server/src/structure/planet/planet_rotation.rs b/cosmos_server/src/structure/planet/planet_rotation.rs
index 163db2e15..4b0e111d6 100644
--- a/cosmos_server/src/structure/planet/planet_rotation.rs
+++ b/cosmos_server/src/structure/planet/planet_rotation.rs
@@ -22,7 +22,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     init::init_world::ServerSeed,
-    persistence::make_persistent::{make_persistent, PersistentComponent},
+    persistence::make_persistent::{make_persistent, DefaultPersistentComponent},
     rng::get_rng_for_sector,
 };
 
@@ -40,7 +40,7 @@ impl IdentifiableComponent for PlanetRotation {
     }
 }
 
-impl PersistentComponent for PlanetRotation {}
+impl DefaultPersistentComponent for PlanetRotation {}
 
 // WARNING: This is duplicated in the client's `rotate_around_planet.rs` file.
 fn within_rotation_range(planet: &Structure, planet_loc: &Location, your_loc: &Location) -> bool {
diff --git a/cosmos_server/src/structure/shared/melt_down.rs b/cosmos_server/src/structure/shared/melt_down.rs
index 0fd23d8da..096436fdc 100644
--- a/cosmos_server/src/structure/shared/melt_down.rs
+++ b/cosmos_server/src/structure/shared/melt_down.rs
@@ -13,7 +13,7 @@ use cosmos_core::{
     structure::shared::MeltingDown,
 };
 
-use crate::persistence::make_persistent::{make_persistent, PersistentComponent};
+use crate::persistence::make_persistent::{make_persistent, DefaultPersistentComponent};
 
 use super::MeltingDownSet;
 
@@ -27,7 +27,7 @@ fn monitor_block_events(mut commands: Commands, blocks: Res<Registry<Block>>, mu
     }
 }
 
-impl PersistentComponent for MeltingDown {}
+impl DefaultPersistentComponent for MeltingDown {}
 
 pub(super) fn register(app: &mut App) {
     make_persistent::<MeltingDown>(app);
diff --git a/cosmos_server/src/universe/spawners/pirate.rs b/cosmos_server/src/universe/spawners/pirate.rs
index d085d24a0..6746e05c7 100644
--- a/cosmos_server/src/universe/spawners/pirate.rs
+++ b/cosmos_server/src/universe/spawners/pirate.rs
@@ -33,7 +33,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     persistence::{
         loading::{LoadingBlueprintSystemSet, LoadingSystemSet, NeedsBlueprintLoaded},
-        make_persistent::{make_persistent, PersistentComponent},
+        make_persistent::{make_persistent, DefaultPersistentComponent},
     },
     settings::ServerSettings,
 };
@@ -83,7 +83,7 @@ impl IdentifiableComponent for PlayerStrength {
     }
 }
 
-impl PersistentComponent for PlayerStrength {}
+impl DefaultPersistentComponent for PlayerStrength {}
 
 #[derive(Component, Reflect, Debug, Clone, Copy, Default, Serialize, Deserialize)]
 /// Represents the total time a player has played on the server
@@ -99,7 +99,7 @@ impl IdentifiableComponent for TotalTimePlayed {
     }
 }
 
-impl PersistentComponent for TotalTimePlayed {}
+impl DefaultPersistentComponent for TotalTimePlayed {}
 
 fn on_needs_pirate_spawned(mut commands: Commands, q_needs_pirate_spawned: Query<(Entity, &PirateNeedsSpawned)>) {
     for (ent, pns) in q_needs_pirate_spawned.iter() {

From e11373b2647bf97cfe364699f61ba422e7adabea Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Mon, 23 Dec 2024 00:22:49 -0500
Subject: [PATCH 02/31] Renaming stuff to be more obvious

---
 .../src/blocks/interactable/gravity_well.rs   | 10 +--
 .../src/persistence/make_persistent.rs        | 76 +++++++++++++------
 2 files changed, 59 insertions(+), 27 deletions(-)

diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index b571df8cc..86c5a9a1f 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -33,7 +33,7 @@ use cosmos_core::{
 use serde::{Deserialize, Serialize};
 
 use crate::persistence::{
-    make_persistent::{make_persistent, EntityIdManager, PersistentComponent, SelfOrEntityIdType},
+    make_persistent::{make_persistent, EntityIdManager, MaybeOwned, PersistentComponent},
     EntityId,
 };
 
@@ -173,13 +173,13 @@ pub struct SerializedGravityWell {
 }
 
 impl PersistentComponent for GravityWell {
-    type EntityIdType = SerializedGravityWell;
+    type SaveType = SerializedGravityWell;
 
-    fn convert_to_entity_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, SerializedGravityWell>> {
+    fn convert_to_save_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<MaybeOwned<'a, SerializedGravityWell>> {
         q_entity_ids
             .get(self.structure_entity)
             .map(|x| {
-                SelfOrEntityIdType::EntityIdType(Box::new(SerializedGravityWell {
+                MaybeOwned::Owned(Box::new(SerializedGravityWell {
                     block: self.block,
                     g_constant: self.g_constant,
                     structure_entity_id: x.clone(),
@@ -188,7 +188,7 @@ impl PersistentComponent for GravityWell {
             .ok()
     }
 
-    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, entity_id_manager: &EntityIdManager) -> Option<Self> {
+    fn convert_from_save_type(e_id_type: Self::SaveType, entity_id_manager: &EntityIdManager) -> Option<Self> {
         entity_id_manager
             .entity_from_entity_id(&e_id_type.structure_entity_id)
             .map(|e| Self {
diff --git a/cosmos_server/src/persistence/make_persistent.rs b/cosmos_server/src/persistence/make_persistent.rs
index 4235883d4..1011cde4a 100644
--- a/cosmos_server/src/persistence/make_persistent.rs
+++ b/cosmos_server/src/persistence/make_persistent.rs
@@ -1,5 +1,7 @@
 //! Streamlines the serialization & deserialization of components
 
+use std::borrow::Cow;
+
 use bevy::{
     app::{App, Update},
     ecs::{
@@ -33,7 +35,7 @@ fn save_component<T: PersistentComponent>(
     q_entity_ids: Query<&EntityId>,
 ) {
     q_needs_saved.iter_mut().for_each(|(entity, mut serialized_data, component)| {
-        let Some(entity_id_type) = component.convert_to_entity_type(&q_entity_ids) else {
+        let Some(entity_id_type) = component.convert_to_save_type(&q_entity_ids) else {
             error!(
                 "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
                 T::get_component_unlocalized_name()
@@ -42,8 +44,8 @@ fn save_component<T: PersistentComponent>(
         };
 
         let save_data = match &entity_id_type {
-            SelfOrEntityIdType::SameType(t) => *t,
-            SelfOrEntityIdType::EntityIdType(t) => t.as_ref(),
+            MaybeOwned::Borrowed(t) => *t,
+            MaybeOwned::Owned(t) => t.as_ref(),
         };
 
         serialized_data.serialize_data(T::get_component_unlocalized_name(), save_data);
@@ -60,7 +62,7 @@ fn save_component_block_data<T: PersistentComponent>(
             .get_mut(parent.get())
             .expect("Block data's parent didn't have SerializedBlockData???");
 
-        let Some(entity_id_type) = component.convert_to_entity_type(&q_entity_ids) else {
+        let Some(entity_id_type) = component.convert_to_save_type(&q_entity_ids) else {
             error!(
                 "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
                 T::get_component_unlocalized_name()
@@ -69,8 +71,8 @@ fn save_component_block_data<T: PersistentComponent>(
         };
 
         let save_data = match &entity_id_type {
-            SelfOrEntityIdType::SameType(t) => *t,
-            SelfOrEntityIdType::EntityIdType(t) => t.as_ref(),
+            MaybeOwned::Borrowed(t) => *t,
+            MaybeOwned::Owned(t) => t.as_ref(),
         };
 
         serialized_block_data.serialize_data(
@@ -87,11 +89,11 @@ fn load_component<T: PersistentComponent>(
     entity_id_manager: EntityIdManager,
 ) {
     q_needs_loaded.iter().for_each(|(entity, serialized_data)| {
-        let Some(component_save_data) = serialized_data.deserialize_data::<T::EntityIdType>(T::get_component_unlocalized_name()) else {
+        let Some(component_save_data) = serialized_data.deserialize_data::<T::SaveType>(T::get_component_unlocalized_name()) else {
             return;
         };
 
-        let Some(mut component) = T::convert_from_entity_id_type(component_save_data, &entity_id_manager) else {
+        let Some(mut component) = T::convert_from_save_type(component_save_data, &entity_id_manager) else {
             error!(
                 "Error getting entities needed for component {} for entity {entity:?}",
                 T::get_component_unlocalized_name()
@@ -111,7 +113,6 @@ fn load_component_from_block_data<T: PersistentComponent>(
     mut ev_reader: EventReader<ChunkLoadBlockDataEvent>,
     mut commands: Commands,
     q_has_component: Query<(), With<T>>,
-    q_entity_ids: Query<&EntityId>,
     entity_id_manager: EntityIdManager,
 ) {
     for ev in ev_reader.read() {
@@ -122,11 +123,11 @@ fn load_component_from_block_data<T: PersistentComponent>(
 
         let first = ev.chunk.first_structure_block();
         for (data_coord, serialized) in ev.data.iter() {
-            let Some(component_save_data) = serialized.deserialize_data::<T::EntityIdType>(T::get_component_unlocalized_name()) else {
+            let Some(component_save_data) = serialized.deserialize_data::<T::SaveType>(T::get_component_unlocalized_name()) else {
                 return;
             };
 
-            let Some(mut data) = T::convert_from_entity_id_type(component_save_data, &entity_id_manager) else {
+            let Some(mut data) = T::convert_from_save_type(component_save_data, &entity_id_manager) else {
                 error!(
                     "Error getting entities needed for component {} for block data @ {data_coord} in structure {:?}",
                     T::get_component_unlocalized_name(),
@@ -151,20 +152,37 @@ fn load_component_from_block_data<T: PersistentComponent>(
 }
 
 #[derive(SystemParam)]
+/// Used to efficiently get entities via their [`EntityId`].
 pub struct EntityIdManager<'w, 's> {
     q_entity_ids: Query<'w, 's, (Entity, &'static EntityId)>,
 }
 
 impl<'w, 's> EntityIdManager<'w, 's> {
+    /// Gets an entity from the [`EntityId`] if one exists for that id. This will ONLY retrieve
+    /// entities that are loaded in the world.
     pub fn entity_from_entity_id(&self, e_id: &EntityId) -> Option<Entity> {
         // TODO: Make this a O(1) lookup
         self.q_entity_ids.iter().find(|(_, eid)| *eid == e_id).map(|x| x.0)
     }
 }
 
-pub enum SelfOrEntityIdType<'a, T> {
-    SameType(&'a T),
-    EntityIdType(Box<T>),
+/// A [`Cow`] without the ability to clone the borrowed version.
+///
+/// Represents a piece of data (T) that is either owned or borrowed.
+pub enum MaybeOwned<'a, T> {
+    /// The data is owned by this
+    Owned(Box<T>),
+    /// The data is borrowed by this
+    Borrowed(&'a T),
+}
+
+impl<'a, T> AsRef<T> for MaybeOwned<'a, T> {
+    fn as_ref(&self) -> &T {
+        match self {
+            Self::Owned(owned) => owned.as_ref(),
+            Self::Borrowed(ref borrowed) => borrowed,
+        }
+    }
 }
 
 /// This component will be saved & loaded when the entity it is a part of is saved/unloaded.
@@ -172,19 +190,33 @@ pub enum SelfOrEntityIdType<'a, T> {
 /// For most purposes, you should implement [`DefaultPersistentComponent`] instead of this
 /// directly. Implement this if you need to convert entities to entity id types.
 pub trait PersistentComponent: IdentifiableComponent + Sized {
-    type EntityIdType: Serialize + DeserializeOwned;
+    /// The type of data that this component will be serialized to.
+    ///
+    /// Normally, this is the same as self (which is what [`DefaultPersistentComponent`] uses), but
+    /// in some cases you may want to store different data to the disk than what is used at
+    /// runtime.
+    type SaveType: Serialize + DeserializeOwned;
 
     /// Initializes this component before adding it to this entity
     ///
     /// Mostly used to clear out any junk data that got saved
     fn initialize(&mut self, _self_entity: Entity, _commands: &mut Commands) {}
 
-    fn convert_to_entity_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, Self::EntityIdType>>;
-    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, entity_id_manager: &EntityIdManager) -> Option<Self>;
+    /// Converts this component to its savable datatype. Most times, returning self here is fine,
+    /// but in the case you need to serialize different data than what is present at runtime (for
+    /// instance storing [`EntityId`]s instead of raw [`Entity`]s) you can use this and its pair
+    /// [`PersistentComponent::convert_from_save_type`].
+    fn convert_to_save_type<'a>(&'a self, q_entity_ids: &Query<&EntityId>) -> Option<MaybeOwned<'a, Self::SaveType>>;
+
+    /// Converts this component's save type to its component datatype. Most times, returning self here is fine,
+    /// but in the case you need to serialize different data than what is present at runtime (for
+    /// instance storing [`EntityId`]s instead of raw [`Entity`]s) you can use this and its pair
+    /// [`PersistentComponent::convert_to_save_type`].
+    fn convert_from_save_type(e_id_type: Self::SaveType, entity_id_manager: &EntityIdManager) -> Option<Self>;
 }
 
 /// This component will be saved & loaded when the entity it is a part of is saved/unloaded.
-pub trait DefaultPersistentComponent: PersistentComponent<EntityIdType = Self> {
+pub trait DefaultPersistentComponent: PersistentComponent<SaveType = Self> {
     /// Initializes this component before adding it to this entity
     ///
     /// Mostly used to clear out any junk data that got saved
@@ -195,17 +227,17 @@ impl<T> PersistentComponent for T
 where
     T: DefaultPersistentComponent + Serialize + DeserializeOwned,
 {
-    type EntityIdType = Self;
+    type SaveType = Self;
 
     fn initialize(&mut self, self_entity: Entity, commands: &mut Commands) {
         DefaultPersistentComponent::initialize(self, self_entity, commands);
     }
 
-    fn convert_to_entity_type<'a>(&'a self, _: &Query<&EntityId>) -> Option<SelfOrEntityIdType<'a, Self::EntityIdType>> {
-        Some(SelfOrEntityIdType::SameType(self))
+    fn convert_to_save_type<'a>(&'a self, _: &Query<&EntityId>) -> Option<MaybeOwned<'a, Self::SaveType>> {
+        Some(MaybeOwned::Borrowed(self))
     }
 
-    fn convert_from_entity_id_type(e_id_type: Self::EntityIdType, _: &EntityIdManager) -> Option<Self> {
+    fn convert_from_save_type(e_id_type: Self::SaveType, _: &EntityIdManager) -> Option<Self> {
         Some(e_id_type)
     }
 }

From 1069ffc9cdcc502e84491033bbb5da4a8349a271 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Mon, 23 Dec 2024 00:30:39 -0500
Subject: [PATCH 03/31] Moving utiltiy type to common folder

---
 cosmos_core/src/utils/mod.rs                  |  1 +
 cosmos_core/src/utils/ownership.rs            | 30 ++++++++++++++
 .../src/blocks/interactable/gravity_well.rs   |  3 +-
 .../src/persistence/make_persistent.rs        | 40 +++----------------
 4 files changed, 38 insertions(+), 36 deletions(-)
 create mode 100644 cosmos_core/src/utils/ownership.rs

diff --git a/cosmos_core/src/utils/mod.rs b/cosmos_core/src/utils/mod.rs
index 5cf2b4d13..3b2a076c1 100644
--- a/cosmos_core/src/utils/mod.rs
+++ b/cosmos_core/src/utils/mod.rs
@@ -4,6 +4,7 @@ use bevy::prelude::App;
 
 pub mod array_utils;
 pub mod ecs;
+pub mod ownership;
 pub mod quat_math;
 pub mod random;
 pub mod smooth_clamp;
diff --git a/cosmos_core/src/utils/ownership.rs b/cosmos_core/src/utils/ownership.rs
new file mode 100644
index 000000000..2addc7de1
--- /dev/null
+++ b/cosmos_core/src/utils/ownership.rs
@@ -0,0 +1,30 @@
+//! Contains ownership utilities
+
+use std::ops::Deref;
+
+/// A [`Cow`] without the ability to clone the borrowed version.
+///
+/// Represents a piece of data (T) that is either owned or borrowed.
+pub enum MaybeOwned<'a, T> {
+    /// The data is owned by this
+    Owned(Box<T>),
+    /// The data is borrowed by this
+    Borrowed(&'a T),
+}
+
+impl<'a, T> AsRef<T> for MaybeOwned<'a, T> {
+    fn as_ref(&self) -> &T {
+        match self {
+            Self::Owned(owned) => owned.as_ref(),
+            Self::Borrowed(borrowed) => borrowed,
+        }
+    }
+}
+
+impl<'a, T> Deref for MaybeOwned<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &Self::Target {
+        self.as_ref()
+    }
+}
diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index 86c5a9a1f..38e5e5f32 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -29,11 +29,12 @@ use cosmos_core::{
     registry::{identifiable::Identifiable, Registry},
     state::GameState,
     structure::Structure,
+    utils::ownership::MaybeOwned,
 };
 use serde::{Deserialize, Serialize};
 
 use crate::persistence::{
-    make_persistent::{make_persistent, EntityIdManager, MaybeOwned, PersistentComponent},
+    make_persistent::{make_persistent, EntityIdManager, PersistentComponent},
     EntityId,
 };
 
diff --git a/cosmos_server/src/persistence/make_persistent.rs b/cosmos_server/src/persistence/make_persistent.rs
index 1011cde4a..92b6eb566 100644
--- a/cosmos_server/src/persistence/make_persistent.rs
+++ b/cosmos_server/src/persistence/make_persistent.rs
@@ -1,7 +1,5 @@
 //! Streamlines the serialization & deserialization of components
 
-use std::borrow::Cow;
-
 use bevy::{
     app::{App, Update},
     ecs::{
@@ -19,6 +17,7 @@ use cosmos_core::{
     events::block_events::BlockDataSystemParams,
     netty::sync::IdentifiableComponent,
     structure::{chunk::netty::SerializedBlockData, coordinates::ChunkBlockCoordinate, loading::StructureLoadingSet, Structure},
+    utils::ownership::MaybeOwned,
 };
 use serde::{de::DeserializeOwned, Serialize};
 
@@ -35,7 +34,7 @@ fn save_component<T: PersistentComponent>(
     q_entity_ids: Query<&EntityId>,
 ) {
     q_needs_saved.iter_mut().for_each(|(entity, mut serialized_data, component)| {
-        let Some(entity_id_type) = component.convert_to_save_type(&q_entity_ids) else {
+        let Some(save_type) = component.convert_to_save_type(&q_entity_ids) else {
             error!(
                 "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
                 T::get_component_unlocalized_name()
@@ -43,12 +42,7 @@ fn save_component<T: PersistentComponent>(
             return;
         };
 
-        let save_data = match &entity_id_type {
-            MaybeOwned::Borrowed(t) => *t,
-            MaybeOwned::Owned(t) => t.as_ref(),
-        };
-
-        serialized_data.serialize_data(T::get_component_unlocalized_name(), save_data);
+        serialized_data.serialize_data(T::get_component_unlocalized_name(), save_type.as_ref());
     });
 }
 
@@ -62,7 +56,7 @@ fn save_component_block_data<T: PersistentComponent>(
             .get_mut(parent.get())
             .expect("Block data's parent didn't have SerializedBlockData???");
 
-        let Some(entity_id_type) = component.convert_to_save_type(&q_entity_ids) else {
+        let Some(save_type) = component.convert_to_save_type(&q_entity_ids) else {
             error!(
                 "Unable to convert to entity id type for {} on entity {entity:?}. This component will not be saved.",
                 T::get_component_unlocalized_name()
@@ -70,15 +64,10 @@ fn save_component_block_data<T: PersistentComponent>(
             return;
         };
 
-        let save_data = match &entity_id_type {
-            MaybeOwned::Borrowed(t) => *t,
-            MaybeOwned::Owned(t) => t.as_ref(),
-        };
-
         serialized_block_data.serialize_data(
             ChunkBlockCoordinate::for_block_coordinate(block_data.identifier.block.coords()),
             T::get_component_unlocalized_name(),
-            save_data,
+            save_type.as_ref(),
         );
     });
 }
@@ -166,25 +155,6 @@ impl<'w, 's> EntityIdManager<'w, 's> {
     }
 }
 
-/// A [`Cow`] without the ability to clone the borrowed version.
-///
-/// Represents a piece of data (T) that is either owned or borrowed.
-pub enum MaybeOwned<'a, T> {
-    /// The data is owned by this
-    Owned(Box<T>),
-    /// The data is borrowed by this
-    Borrowed(&'a T),
-}
-
-impl<'a, T> AsRef<T> for MaybeOwned<'a, T> {
-    fn as_ref(&self) -> &T {
-        match self {
-            Self::Owned(owned) => owned.as_ref(),
-            Self::Borrowed(ref borrowed) => borrowed,
-        }
-    }
-}
-
 /// This component will be saved & loaded when the entity it is a part of is saved/unloaded.
 ///
 /// For most purposes, you should implement [`DefaultPersistentComponent`] instead of this

From 1ee9a6f8f0ec9079ca44e0ff34920b5eeee3c72c Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Mon, 23 Dec 2024 16:12:24 -0500
Subject: [PATCH 04/31] Reworking location architecture

---
 cosmos_client/src/netty/gameplay/receiver.rs  | 15 ++++-
 .../physics/{location.rs => location/mod.rs}  |  0
 docs/src/physics/anchor.md                    | 32 ++++++----
 docs/src/physics/location.md                  | 58 ++++++++++++++++---
 4 files changed, 86 insertions(+), 19 deletions(-)
 rename cosmos_core/src/physics/{location.rs => location/mod.rs} (100%)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 1ac1abbf5..5566dfc6c 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -164,6 +164,8 @@ fn lerp_towards(
                     let final_trans = parent_rot.inverse().mul_vec3(rel_trans);
 
                     transform.translation = final_trans;
+                } else {
+                    error!("Missing parent for netty rigidbody location with relative flag for entity {entity:?}!");
                 }
             }
         };
@@ -401,12 +403,14 @@ pub(crate) fn client_sync_players(
                 let mut loc = match body.location {
                     NettyRigidBodyLocation::Absolute(location) => location,
                     NettyRigidBodyLocation::Relative(rel_trans, entity) => {
-                        let parent_loc = query_body.get(entity).map(|x| x.0.copied()).unwrap_or(None).unwrap_or_default();
+                        let parent_loc = query_body.get(entity).map(|x| x.0.copied()).ok().flatten().unwrap_or_default();
 
                         parent_loc + rel_trans
                     }
                 };
 
+                error!("Player starting loc: {loc:?}");
+
                 // this will avoid any position mismatching
                 loc.last_transform_loc = Some(loc.local);
 
@@ -1038,9 +1042,18 @@ fn player_changed_parent(
         .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
 }
 
+fn log_player_loc(q_ploc: Query<&Location, With<LocalPlayer>>) {
+    if let Ok(loc) = q_ploc.get_single() {
+        info!("PLOC: {loc:?}");
+    } else {
+        error!("NO PLOC!!!");
+    }
+}
+
 pub(super) fn register(app: &mut App) {
     app.insert_resource(RequestedEntities::default())
         .configure_sets(Update, LocationPhysicsSet::DoPhysics)
+        .add_systems(Update, log_player_loc)
         .add_systems(
             Update,
             (
diff --git a/cosmos_core/src/physics/location.rs b/cosmos_core/src/physics/location/mod.rs
similarity index 100%
rename from cosmos_core/src/physics/location.rs
rename to cosmos_core/src/physics/location/mod.rs
diff --git a/docs/src/physics/anchor.md b/docs/src/physics/anchor.md
index 14083731d..208d2f80a 100644
--- a/docs/src/physics/anchor.md
+++ b/docs/src/physics/anchor.md
@@ -2,46 +2,58 @@
 
 ## Intent
 
-**Anchors** are a way of making transforms relative to a specific entity to ensure floating point precision isn't a problem. 
+**Anchors** are a way of making transforms relative to a specific entity to ensure floating point precision isn't a problem.
 
 ## :( Problem
 
-In a normal game, all positions are based on an absolute `0, 0, 0`. This is fine in games where players don't travel far from the origin of the world. In Cosmos, of course, players can travel billions or even trillions of kilometers away from `0, 0, 0`. This leads to the breakdown of floating point numbers as a unit and makes the game completely unplayable. In bevy, subtle issues start to arise as early as 20,000 blocks away from the origin in any direction.
+In a normal game, all positions are based on an absolute `0, 0, 0`. This is fine in games where players don't travel far from
+the origin of the world. In Cosmos, of course, players can travel millions or even billions of kilometers away from `0, 0, 0`.
+This leads to the breakdown of floating point numbers as a unit and makes the game completely unplayable.
+In bevy, subtle issues start to arise as early as 20,000 blocks away from the origin in any direction.
 
 ## :) Solution
 
-Instead of basing all the world positions around a fixed `0, 0, 0`, have that origin move with the player. This player could then be called for more clarity, an **Anchor**.  This would ensure that floating point calculations are most accurate close to the player, and less accurate farther away from the player where inaccuracies are not noticeable.
+Instead of basing all the world positions around a fixed `0, 0, 0`, have that origin move with the player.
+This player could then be called for more clarity, an **Anchor**. This would ensure that floating point calculations
+are most accurate close to the player, and less accurate farther away from the player where inaccuracies are not noticeable.
 
 But wait... what about multiple players? Which one is the origin?
 
 ### Client
 
-For the client, this isn't a problem at all. The client doesn't have to care how other players view the world, so the client can always assume its player is the origin. This saves it from having to consider the needs of others.
+For the client, this isn't a problem at all. The client doesn't have to care how other players view the world, so the client can always assume its player is the origin.
 
 ### Server
 
-The server, in contrast to the client, has to love everyone equally. This leads to a more complex solution. 
+The server, in contrast to the client, has to love everyone equally. This leads to a more complex solution.
 
-To make sure each player has a good experience, the server simply separates each player into their own "Physics World", thus making each player an anchor. A Physics World is simply a sandbox where nothing in that world affects any others. This means, that if something in world "A" is at `0, 5, 0`, and something in world "B" is also at `0, 5, 0`, they will not interact with each other at all.
+To make sure each player has a good experience, the server simply separates each player into their own "Physics World",
+thus making each player an anchor. A Physics World is simply a sandbox where nothing in that world affects any other world.
+This means, that if something in world "A" is at `0, 5, 0`, and something in world "B" is also at `0, 5, 0`, they will not
+interact with each other at all.
 
-Once each player is in their own world, it's as simple as assigning each non-anchor entity to the anchor closest to them, basing their positions off that and putting them in that anchor's physics world. 
+Once each player is in their own world, it's as simple as assigning each non-anchor entity to the anchor closest to them,
+basing their positions off that and putting them in that anchor's physics world.
 
-Of course, this introduces a new issue - what about players that are close or next to each other? 
+Of course, this introduces a new issue - what about players that are close or next to each other?
 
-The simplest fix to this issue is to have a check for anchors that are near each other. Once an anchor (A) is too close to another (B), A's status as an anchor is revoked and it becomes a part of B's world. All the entities that were part of A's world are also moved into B's world. 
+The simplest fix to this issue is to have a check for anchors that are near each other. Once an anchor (A) is too close to another (B),
+A's status as an anchor is revoked and it becomes a part of B's world. All the entities that were part of A's world are also moved into B's world.
 
 When a player moves too far away from its anchor, it is once again put into its own world and treated as an anchor.
 
 ## Diagram
 
 ### Update Schedule (Both client + server)
+
 ```mermaid
 sequenceDiagram
     Update->>sync_transforms_and_locations: Updates transforms to be relative to their anchor
-    sync_transforms_and_locations-->>Update: At this point, all transforms are relative to their anchor.    
+    sync_transforms_and_locations-->>Update: At this point, all transforms are relative to their anchor.
 ```
 
 ### Last Schedule (Only server)
+
 ```mermaid
 sequenceDiagram
     participant Last
diff --git a/docs/src/physics/location.md b/docs/src/physics/location.md
index 46436db72..64c4d7ea8 100644
--- a/docs/src/physics/location.md
+++ b/docs/src/physics/location.md
@@ -2,30 +2,72 @@
 
 ## Intent
 
-**Locations** represent an entity's absolute coordinates in all three x/y/z axes within a range of about -19,498,223 to 19,498,223 light years. 
+**Locations** represent an entity's absolute coordinates in all three x/y/z axes within a range of about -19,498,223 to 19,498,223 light years.
 
 ## :( Problem
 
-In a normal game, all x/y/z positions are stored as `f32` values. While floating point precision errors are resolved by the [Anchor](./anchor.md) pattern, we still need a way of representing your absolute position in space. GlobalTransform positions are relative to their specific Anchor, so these wouldn't give an absolute world position. In addition, the values of a GlobalTransform wouldn't be nearly big enough to store the possible coordinates of an entity.
+In a normal game, all x/y/z positions are stored as `f32` values. While floating point precision errors are resolved by
+the [Anchor](./anchor.md) pattern, we still need a way of representing your absolute position in space.
+`GlobalTransform` positions are relative to their specific Anchor, so these wouldn't give an absolute world position.
+In addition, the values of a GlobalTransform wouldn't be nearly big enough to store the possible coordinates of an entity.
 
 ## :) Solution
 
-The Location structure stores your absolute position by breaking your position into two representations - sector coordinates and local coordinates. Sector coordinates represent how far away you are from `0, 0, 0` in multiples of 20,000*. A sector coordinate of (4, 0, -3) is the same as (80,000, 0, -60,000). The local coordinates are used to store an offset from the sector coordinate grid. For example, sector coordinates (1, 0, 0) with local coordinates (5000, 1000, -4000) would represent an absolute position of `(45000, 1000, -4000)`. 
+The Location structure stores your absolute position by breaking your position into two representations - sector coordinates
+and local coordinates. Sector coordinates represent how far away you are from `0, 0, 0` in multiples of 20,000. A sector coordinate
+of `(4, 0, -3)` is the same as `(80,000, 0, -60,000)`. The local coordinates are used to store an offset from the sector coordinate grid.
+For example, sector coordinates `(1, 0, 0)` with local coordinates `(5000, 1000, -4000)` would represent an absolute position of `(45000, 1000, -4000)`.
 
-By using locations to compare entities instead of their transforms, you will get correct measurements even over extremely long distances and short distances. Because of this, you should generally prefer to use the Location structure over the Transform or GlobalTransform.
+By using locations to compare entities instead of their transforms, you will get correct measurements even over extremely long distances
+and short distances. Because of this, you should generally prefer to use the Location structure over the Transform or GlobalTransform.
 
-This means that when adding an entity to the world, it is generally a good idea to instead add a Location rather than a TransformBundle. For ease of use, a `CosmosPbrBundle` has been provided that works the same as a normal `PbrBundle`, except it takes a location instead of a transform.
+This means that when adding an entity to the world, it is generally a good idea to instead add a Location rather than a TransformBundle.
+For ease of use, a `CosmosPbrBundle` has been provided that works the same as a normal `PbrBundle`, except it takes a location instead of a transform.
 
 To make sure the transform &amp; location remains accurate, they are synced every frame. The below diagrams show this process.
 
+`Location` and `Transform` components are automatically kept in sync with each other, meaning you can change both in a single frame, and they will
+update each other properly.
+
+## Location Flow
+
+There are two ways you would want to add or modify an entity's `Location`.
+
+The `SetPosition` component is used as a flag to indicate the source of truth for the `Entity`'s position for a single frame. This is most useful when first
+spawning an `Entity`.
+
+### Location-Dominant
+
+In this case, you want the `Location` to set the `Transform` of the entity. Insert the `SetPosition::Location`
+component to the entity to signify the [`Location`] should be used as the source of truth this frame. The `Transform` of the entity
+will be updated to match the `Location` component. After the `Transform` is set to match this `Location`, the `SetPosition` component will be removed.
+
+### Transform-Dominant
+
+In this case, you want the `Transform` to set the `Location` of this entity. Insert the `SetPosition::Transform`
+component to the entity to signify the [`Transform`] should be used as the source of truth this frame. The `Location` of the entity
+will be updated to match the `Transform` component. After the `Location` is set to match this `Transform`, the `SetPosition` component will be removed.
+
+### SetPosition
+
 ## Diagrams
 
 ### Location + Transform Syncing
+
+This takes place within the `Update` schedule, in the `DoPhysics` set.
+
 ```mermaid
+sequenceDiagram
+    Between->>apply_set_position:
+    apply_set_position->>sync_transforms_and_locations:
+    sync_transforms_and_locations->>handle_child_syncing:
+    handle_child_syncing->>add_previous_location:
+    add_previous_location->>Between:
+
 sequenceDiagram
     Update->>fix_location: Properly sets up the location of any newly added entities
     fix_location-->>Update: New entities now have proper locations
-    Update->>sync_transforms_and_locations: Applies transform changes to the location, and location changes to the transform 
+    Update->>sync_transforms_and_locations: Applies transform changes to the location, and location changes to the transform
     sync_transforms_and_locations-->>Update: Syncing for all top-level entities is done
     Update->>handle_child_syncing: Syncs entities that have parents' locations and transforms by applying transform changes to the location & location changes to the transform
     handle_child_syncing-->>Update: Entities with parents are now properly synced
@@ -34,6 +76,7 @@ sequenceDiagram
 ```
 
 ### Post Update Schedule
+
 ```mermaid
 sequenceDiagram
     PostUpdate->>fix_location: Properly sets up the location of any newly added entities
@@ -42,5 +85,4 @@ sequenceDiagram
 
 These diagrams are based off the systems added in `cosmos_server/src/physics/mod.rs` and `cosmos_client/src/physics/mod.rs`.
 
-
-\*20,000 is the number at the time of this document's writing. For an always accurate number, you should refer to the `SECTOR_DIMENSIONS` constant in `cosmos_core/src/physics/location.rs`.
\ No newline at end of file
+20,000 is the number at the time of this document's writing. For an always accurate number, you should refer to the `SECTOR_DIMENSIONS` constant in `cosmos_core/src/physics/location.rs`.

From 76367260eee58242730dc7e44f9f8f74644a054b Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Wed, 1 Jan 2025 21:33:19 -0500
Subject: [PATCH 05/31] Rewrote location systems to be less buggy

---
 cosmos_core/src/physics/location/mod.rs     |  36 +-
 cosmos_core/src/physics/location/systems.rs | 676 ++++++++++++++++++++
 docs/src/physics/location.md                |   3 +-
 3 files changed, 697 insertions(+), 18 deletions(-)
 create mode 100644 cosmos_core/src/physics/location/systems.rs

diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index feb89ce90..7b2ed0401 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -13,6 +13,7 @@
 //! to update the location component rather than the Transform where possible.
 
 use std::{
+    default,
     fmt::Display,
     ops::{Add, AddAssign, Sub},
 };
@@ -33,6 +34,8 @@ use crate::ecs::bundles::BundleStartingRotation;
 
 use super::player_world::PlayerWorld;
 
+mod systems;
+
 /// This represents the diameter of a sector. So at a local
 /// of 0, 0, 0 you can travel `SECTOR_DIMENSIONS / 2.0` blocks in any direction and
 /// remain within it.
@@ -73,12 +76,16 @@ pub struct Location {
     pub local: Vec3,
     /// The sector coordinates
     pub sector: Sector,
+}
 
-    #[serde(skip)]
-    /// Tracks the last transform location. Do not set this unless you know what you're doing.
-    ///
-    /// This is used to calculate changes in the Transform object & adjust the location accordingly.
-    pub last_transform_loc: Option<Vec3>,
+#[derive(Default, Component, Debug, PartialEq, Serialize, Deserialize, Reflect, Clone, Copy)]
+struct LastTransformTranslation(Vec3);
+
+#[derive(Default, Component, Debug, PartialEq, Eq, Reflect, Clone, Copy)]
+pub enum SetPosition {
+    #[default]
+    Location,
+    Transform,
 }
 
 /// Datatype used to store sector coordinates
@@ -333,11 +340,7 @@ impl Location {
 
     /// Creates a new location at these coordinates
     pub const fn new(local: Vec3, sector: Sector) -> Self {
-        Self {
-            local,
-            sector,
-            last_transform_loc: Some(local),
-        }
+        Self { local, sector }
     }
 
     /// Gets the system coordinates this location is in
@@ -438,14 +441,11 @@ impl Location {
     /// Applies updates from the new translation of the transform.
     ///
     /// This is done automatically, so don't worry about it unless you're doing something fancy.
-    pub fn apply_updates(&mut self, translation: Vec3) {
-        self.local += translation
-            - self
-                .last_transform_loc
-                .expect("last_transform_loc must be set for this to work properly.");
+    pub fn apply_updates(&mut self, translation: Vec3, last_transform_loc: &mut LastTransformTranslation) {
+        self.local += translation - last_transform_loc.0;
         self.fix_bounds();
 
-        self.last_transform_loc = Some(translation);
+        last_transform_loc.0 = translation;
     }
 
     /// Returns the coordinates of this location based off 0, 0, 0.
@@ -544,7 +544,7 @@ fn recursively_sync_child(
 
     // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
     my_loc.set_from(&(parent_loc + transform_delta_parent));
-    my_loc.last_transform_loc = Some(transform_delta_parent + parent_g_trans);
+    // my_loc.last_transform_loc = Some(transform_delta_parent + parent_g_trans);
 
     let parent_loc = *my_loc;
     let parent_g_trans = parent_g_trans + parent_rot.mul_vec3(my_transform.translation);
@@ -630,6 +630,8 @@ pub enum CosmosBundleSet {
 }
 
 pub(super) fn register(app: &mut App) {
+    systems::register(app);
+
     app.register_type::<Location>()
         .register_type::<PreviousLocation>()
         .configure_sets(Update, CosmosBundleSet::HandleCosmosBundles)
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
new file mode 100644
index 000000000..c16433c25
--- /dev/null
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -0,0 +1,676 @@
+//!
+//!
+//! - Apply set position
+//! - Set location based on transform
+//!     This can only be done for children - doesn't make sense for parents
+//! - Update Worlds
+//! - sync transforms and locations
+//!
+//!
+
+use bevy::{prelude::*, transform::systems::propagate_transforms, utils::HashSet};
+use bevy_rapier3d::{
+    plugin::{RapierConfiguration, RapierContextEntityLink},
+    prelude::RapierContextSimulation,
+};
+
+use crate::{
+    entities::player::Player,
+    netty::system_sets::NetworkingSystemsSet,
+    physics::{
+        location::LastTransformTranslation,
+        player_world::{PlayerWorld, WorldWithin},
+    },
+};
+
+use super::{Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
+
+#[derive(Component)]
+struct Anchor;
+
+fn calc_global_trans(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Option<Transform> {
+    let Ok((trans, parent)) = q_trans.get(entity) else {
+        error!("Inconsistent transform heirarchy!");
+        return None;
+    };
+
+    if let Some(parent) = parent {
+        calc_global_trans(parent.get(), q_trans).map(|t| t * *trans)
+    } else {
+        Some(*trans)
+    }
+}
+
+fn loc_from_trans(
+    entity: Entity,
+    q_trans: &Query<(&Transform, Option<&Parent>)>,
+    q_x: &Query<(Entity, Option<&Location>, Option<&SetPosition>)>,
+) -> Option<Location> {
+    let (entity, loc, set_pos) = q_x.get(entity).expect("Invalid entity given");
+
+    match set_pos {
+        None | Some(SetPosition::Location) => loc.copied(),
+        Some(SetPosition::Transform) => calc_global_trans(entity, &q_trans).map(|t| Location::new(t.translation, Sector::ZERO)),
+    }
+}
+
+#[derive(Component)]
+struct SetTransformBasedOnLocationFlag;
+
+fn apply_set_position(
+    q_location_added: Query<(Entity, Option<&Parent>), (Without<SetPosition>, Added<Location>)>,
+    q_set_position: Query<(Entity, &SetPosition)>,
+    q_x: Query<(Entity, Option<&Location>, Option<&SetPosition>)>,
+    q_trans: Query<(&Transform, Option<&Parent>)>,
+    q_g_trans: Query<&GlobalTransform>,
+    mut commands: Commands,
+) {
+    const TOP_LEVEL_SET_POS: SetPosition = SetPosition::Location;
+    const CHILD_SET_POS: SetPosition = SetPosition::Transform;
+
+    for (entity, set_pos) in q_location_added
+        .iter()
+        .map(|(ent, parent)| (ent, if parent.is_some() { &CHILD_SET_POS } else { &TOP_LEVEL_SET_POS }))
+        .chain(q_set_position.iter())
+    {
+        match set_pos {
+            SetPosition::Location => {
+                let mut ecmds = commands.entity(entity);
+                if let Ok(g_trans) = q_g_trans.get(entity) {
+                    ecmds.insert(LastTransformTranslation(g_trans.translation()));
+                }
+                ecmds.insert(SetTransformBasedOnLocationFlag).remove::<SetPosition>();
+            }
+            SetPosition::Transform => {
+                if let Some(loc_from_trans) = loc_from_trans(entity, &q_trans, &q_x) {
+                    if let Ok(g_trans) = q_g_trans.get(entity) {
+                        commands
+                            .entity(entity)
+                            .insert((loc_from_trans, LastTransformTranslation(g_trans.translation())))
+                            .remove::<SetPosition>();
+                    }
+                }
+            }
+        }
+    }
+}
+
+// fn calculate_global_translation(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Transform {
+//     let Ok((trans, parent)) = q_trans.get(entity) else {
+//         error!("Bad heirarchy - parent missing Transform");
+//         return Vec3::ZERO;
+//     };
+//
+//     if let Some(parent) = parent {
+//         calc_global_trans(parent.get(), q_trans)
+//     }
+// }
+
+fn set_transform_based_on_location(
+    mut q_q: Query<
+        (
+            &mut Transform,
+            &GlobalTransform,
+            &mut Location,
+            &WorldWithin,
+            &mut LastTransformTranslation,
+            Option<&Parent>,
+        ),
+        Without<PlayerWorld>,
+    >,
+    q_g_trans: Query<&GlobalTransform>,
+    q_physics_world: Query<&Location, With<PlayerWorld>>,
+) {
+    for (mut trans, g_trans, mut loc, world_within, mut last_translation, parent) in q_q.iter_mut() {
+        let Ok(pw_loc) = q_physics_world.get(world_within.0) else {
+            continue;
+        };
+
+        let parent_g_trans = if let Some(parent) = parent {
+            q_g_trans.get(parent.get()).map(|x| *x).unwrap_or_default()
+        } else {
+            Default::default()
+        };
+
+        let absolute_coords_relative_to_world = (*loc - *pw_loc).absolute_coords_f32();
+
+        let local_coords = parent_g_trans.rotation().inverse() * (absolute_coords_relative_to_world - parent_g_trans.translation());
+        trans.translation = local_coords;
+
+        let delta = g_trans.translation() - last_translation.0;
+        *loc = *loc + delta;
+        last_translation.0 = g_trans.translation();
+    }
+}
+
+fn ensure_worlds_have_anchors(
+    mut trans_query_no_parent: Query<
+        (Entity, &mut Transform, &Location, &mut LastTransformTranslation, &WorldWithin),
+        (Without<PlayerWorld>, Without<Parent>),
+    >,
+    trans_query_with_parent: Query<(Entity, &mut Transform, &mut Location), (Without<PlayerWorld>, With<Parent>)>,
+    players_query: Query<(&WorldWithin, Entity), With<Anchor>>,
+    everything_query: Query<(&WorldWithin, Entity)>,
+    parent_query: Query<&Parent>,
+    entity_query: Query<Entity>,
+    mut world_query: Query<(Entity, &mut PlayerWorld, &mut Location)>,
+
+    mut commands: Commands,
+) {
+    for (world_entity, mut world, mut world_location) in world_query.iter_mut() {
+        if let Ok(mut player_entity) = entity_query.get(world.player) {
+            while let Ok(parent) = parent_query.get(player_entity) {
+                let parent_entity = parent.get();
+                if trans_query_no_parent.contains(parent_entity) {
+                    player_entity = parent.get();
+                } else {
+                    break;
+                }
+            }
+
+            let Ok(location) = trans_query_no_parent.get(player_entity).map(|(_, _, loc, _, _)| loc).or_else(|_| {
+                match trans_query_with_parent.get(player_entity) {
+                    Ok((_, _, loc)) => Ok(loc),
+                    Err(x) => Err(x),
+                }
+            }) else {
+                // The player was just added & doesn't have a transform yet - only a location.
+                continue;
+            };
+
+            world_location.set_from(location);
+
+            // Update transforms of objects within this world.
+            for (_, mut transform, location, mut last_transform_loc, world_within) in trans_query_no_parent.iter_mut() {
+                if world_within.0 == world_entity {
+                    transform.translation = world_location.relative_coords_to(&location);
+                    // The transform.translation is the global transform since this is a top level entity
+                    last_transform_loc.0 = transform.translation;
+                }
+            }
+        } else {
+            // The player has disconnected
+            // Either: Find a new player to have the world
+            // Or: Move everything over to the closest world by removing the WorldWithin component
+
+            let mut found = false;
+            // find player
+            for (world_within, entity) in players_query.iter() {
+                if world_within.0 == world_entity {
+                    world.player = entity;
+                    found = true;
+                    break;
+                }
+            }
+
+            // No suitable player found, find another world to move everything to
+            if !found {
+                for (world_within, entity) in everything_query.iter() {
+                    if world_within.0 == world_entity {
+                        commands.entity(entity).remove::<WorldWithin>();
+                    }
+                }
+                commands.entity(world_entity).despawn_recursive();
+            }
+        }
+    }
+}
+
+//
+// fn recursively_fix_locations(
+//     entity: Entity,
+//     parent_loc: Location,
+//     mut parent_rotation: Quat,
+//     q_info: &mut Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
+//     q_children: &Query<&Children>,
+//     commands: &mut Commands,
+//     world: WorldWithin,
+//     world_id: RapierContextEntityLink,
+// ) {
+//     let Ok((mut my_loc, my_trans)) = q_info.get_mut(entity) else {
+//         return;
+//     };
+//
+//     let translation = parent_rotation.inverse().mul_vec3(-my_loc.relative_coords_to(&parent_loc));
+//
+//     my_loc.last_transform_loc = Some(translation);
+//
+//     commands.entity(entity).insert((world, world_id));
+//
+//     if let Some(mut my_trans) = my_trans {
+//         my_trans.translation = translation;
+//
+//         parent_rotation *= my_trans.rotation;
+//     } else {
+//         commands.entity(entity).insert((Transform::from_translation(translation),));
+//     }
+//
+//     let Ok(children) = q_children.get(entity) else {
+//         return;
+//     };
+//
+//     let my_loc = *my_loc;
+//
+//     for &child in children {
+//         recursively_fix_locations(child, my_loc, parent_rotation, q_info, q_children, commands, world, world_id);
+//     }
+// }
+
+const WORLD_SWITCH_DISTANCE: f32 = SECTOR_DIMENSIONS / 2.0;
+const WORLD_SWITCH_DISTANCE_SQRD: f32 = WORLD_SWITCH_DISTANCE * WORLD_SWITCH_DISTANCE;
+
+fn create_physics_world(commands: &mut Commands) -> RapierContextEntityLink {
+    let mut config = RapierConfiguration::new(1.0);
+    config.gravity = Vec3::ZERO;
+    let rw = commands.spawn((RapierContextSimulation::default(), config)).id();
+    RapierContextEntityLink(rw)
+}
+
+fn move_players_between_worlds(
+    players: Query<(Entity, &Location), (With<WorldWithin>, With<Anchor>)>,
+    mut q_world_within: Query<(&mut WorldWithin, &mut RapierContextEntityLink)>,
+    mut commands: Commands,
+) {
+    let mut changed = true;
+
+    let mut getting_new_world = Vec::new();
+
+    while changed {
+        changed = false;
+
+        for (entity, location) in players.iter() {
+            let mut needs_new_world = false;
+
+            for (other_entity, other_location) in players.iter() {
+                if other_entity == entity || getting_new_world.contains(&other_entity) {
+                    continue;
+                }
+
+                let (other_world_entity, other_body_world) = q_world_within.get(other_entity).map(|(ent, world)| (ent.0, *world)).unwrap();
+
+                let (mut world_currently_in, mut body_world) = q_world_within.get_mut(entity).unwrap();
+
+                let distance = location.distance_sqrd(other_location);
+
+                if distance < WORLD_SWITCH_DISTANCE_SQRD {
+                    if world_currently_in.0 != other_world_entity {
+                        world_currently_in.0 = other_world_entity;
+                        *body_world = other_body_world;
+
+                        needs_new_world = false;
+                        changed = true;
+                    }
+                    break;
+                } else if world_currently_in.0 == other_world_entity {
+                    needs_new_world = true;
+                }
+            }
+
+            if needs_new_world {
+                getting_new_world.push(entity);
+
+                let link = create_physics_world(&mut commands);
+
+                info!("Creating new physics world!");
+                let world_entity = commands
+                    .spawn((Name::new("Player World"), PlayerWorld { player: entity }, *location, link))
+                    .id();
+
+                let (mut world_within, mut body_world) = q_world_within.get_mut(entity).unwrap();
+
+                world_within.0 = world_entity;
+                *body_world = link;
+            }
+        }
+    }
+}
+
+fn move_non_players_between_worlds(
+    mut needs_world: Query<
+        (Entity, &Location, Option<&mut WorldWithin>, Option<&mut RapierContextEntityLink>),
+        (Without<Anchor>, Without<Parent>),
+    >,
+    players_with_worlds: Query<(&WorldWithin, &Location, &RapierContextEntityLink), With<Anchor>>,
+    mut commands: Commands,
+) {
+    for (entity, location, maybe_within, maybe_body_world) in needs_world.iter_mut() {
+        let mut best_ww = None;
+        let mut best_dist = None;
+        let mut best_world_id = None;
+
+        for (ww, player_loc, body_world) in players_with_worlds.iter() {
+            let dist = player_loc.distance_sqrd(location);
+
+            if best_ww.is_none() || dist < best_dist.unwrap() {
+                best_ww = Some(*ww);
+                best_dist = Some(dist);
+                best_world_id = Some(*body_world);
+            }
+        }
+
+        if let Some(ww) = best_ww {
+            let world_link = best_world_id.expect("This should have a value if ww is some");
+
+            if let Some(mut world_within) = maybe_within {
+                let mut body_world = maybe_body_world.expect("Something should have a `RapierContextEntityLink` if it has a WorldWithin.");
+
+                if *body_world != world_link {
+                    *body_world = world_link;
+                }
+                if world_within.0 != ww.0 {
+                    world_within.0 = ww.0;
+                }
+            } else {
+                commands.entity(entity).insert(ww).insert(world_link);
+            }
+        }
+    }
+}
+
+/// Removes worlds with nothing inside of them
+///
+/// This should be run not every frame because it can be expensive and not super necessary
+fn remove_empty_worlds(
+    q_rapier_entity_links: Query<&RapierContextEntityLink>,
+    q_worlds: Query<(Entity, &RapierContextEntityLink), With<PlayerWorld>>,
+    mut commands: Commands,
+    q_rapier_contexts: Query<Entity, With<RapierContextSimulation>>,
+) {
+    let mut worlds = HashSet::new();
+
+    for w in q_rapier_entity_links.iter() {
+        worlds.insert(w.0);
+    }
+
+    let mut to_remove = Vec::new();
+    for world_id in q_rapier_contexts.iter() {
+        if !worlds.contains(&world_id) {
+            to_remove.push(world_id);
+        }
+    }
+
+    'world_loop: for world_id in to_remove {
+        // Verify that nothing else is a part of this world before removing it.
+        for body_world in q_rapier_entity_links.iter().map(|bw| bw.0) {
+            if world_id == body_world {
+                continue 'world_loop;
+            }
+        }
+
+        for (entity, bw) in q_worlds.iter() {
+            if bw.0 == world_id {
+                commands.entity(entity).despawn_recursive();
+            }
+        }
+
+        commands.entity(world_id).despawn_recursive();
+    }
+}
+
+#[derive(Resource, Default)]
+struct FixParentLocation(Vec<Entity>);
+
+/// Bevy's query mutability rules require this query to be in a separate system than fix_location
+// fn find_need_fixed(
+//     q_added_locations_no_parent: Query<Entity, (Added<Location>, Without<PlayerWorld>, Without<Parent>)>,
+//     mut fix: ResMut<FixParentLocation>,
+// ) {
+//     for e in q_added_locations_no_parent.iter() {
+//         fix.0.push(e);
+//     }
+// }
+
+/// Handles any just-added locations that need to sync up to their transforms
+// fn fix_location(
+//     mut q_location_info: Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
+//     q_children: Query<&Children>,
+//     q_player_worlds: Query<(&Location, &WorldWithin, &RapierContextEntityLink), With<PlayerWorld>>,
+//     mut commands: Commands,
+//     q_player_world_loc: Query<&Location, With<PlayerWorld>>,
+//     mut fix: ResMut<FixParentLocation>,
+// ) {
+//     for entity in std::mem::take(&mut fix.0) {
+//         // This makes the borrow checker happy
+//         let (location, _) = q_location_info.get(entity).expect("Guarenteed in query conditions");
+//
+//         let mut best_distance = None;
+//         let mut best_world = None;
+//         let mut best_world_id = None;
+//
+//         for (loc, ww, body_world) in q_player_worlds.iter() {
+//             let distance = location.distance_sqrd(loc);
+//
+//             if best_distance.is_none() || distance < best_distance.unwrap() {
+//                 best_distance = Some(distance);
+//                 best_world = Some(*ww);
+//                 best_world_id = Some(*body_world);
+//             }
+//         }
+//
+//         match (best_world, best_world_id) {
+//             (Some(world), Some(world_id)) => {
+//                 let Ok(loc) = q_player_world_loc.get(world.0) else {
+//                     warn!("A player world was missing a location");
+//                     continue;
+//                 };
+//
+//                 recursively_fix_locations(
+//                     entity,
+//                     *loc,
+//                     Quat::IDENTITY,
+//                     &mut q_location_info,
+//                     &q_children,
+//                     &mut commands,
+//                     world,
+//                     world_id,
+//                 );
+//             }
+//             _ => {
+//                 warn!("Something was added with a location before a player world was created.");
+//                 commands.entity(entity).log_components();
+//             }
+//         }
+//     }
+// }
+//
+// fn recursively_fix_locations(
+//     entity: Entity,
+//     parent_loc: Location,
+//     mut parent_rotation: Quat,
+//     q_info: &mut Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
+//     q_children: &Query<&Children>,
+//     commands: &mut Commands,
+//     world: WorldWithin,
+//     world_id: RapierContextEntityLink,
+// ) {
+//     let Ok((mut my_loc, my_trans)) = q_info.get_mut(entity) else {
+//         return;
+//     };
+//
+//     let translation = parent_rotation.inverse().mul_vec3(-my_loc.relative_coords_to(&parent_loc));
+//
+//     my_loc.last_transform_loc = Some(translation);
+//
+//     commands.entity(entity).insert((world, world_id));
+//
+//     if let Some(mut my_trans) = my_trans {
+//         my_trans.translation = translation;
+//
+//         parent_rotation *= my_trans.rotation;
+//     } else {
+//         commands.entity(entity).insert((Transform::from_translation(translation),));
+//     }
+//
+//     let Ok(children) = q_children.get(entity) else {
+//         return;
+//     };
+//
+//     let my_loc = *my_loc;
+//
+//     for &child in children {
+//         recursively_fix_locations(child, my_loc, parent_rotation, q_info, q_children, commands, world, world_id);
+//     }
+// }
+
+type TransformLocationQuery<'w, 's> = Query<
+    'w,
+    's,
+    (
+        &'static GlobalTransform,
+        &'static mut Location,
+        Option<&'static mut Transform>,
+        &'static mut PreviousLocation,
+        Option<&'static mut LastTransformTranslation>,
+        Option<&'static SetTransformBasedOnLocationFlag>,
+    ),
+>;
+
+/// This system syncs the locations up with their changes in transforms.
+fn sync_transforms_and_locations(
+    q_entities: Query<
+        Entity,
+        (
+            Without<PlayerWorld>,
+            Without<Player>, // TODO: Is this even needed???
+            With<Transform>,
+            With<Location>,
+            With<LastTransformTranslation>,
+            Without<Parent>,
+        ),
+    >,
+    mut q_data: TransformLocationQuery,
+    q_children: Query<&Children>,
+    mut commands: Commands,
+) {
+    for entity in q_entities.iter() {
+        recursively_sync_child(
+            Location::ZERO,
+            Vec3::ZERO,
+            Quat::IDENTITY,
+            entity,
+            &mut commands,
+            &mut q_data,
+            &q_children,
+        );
+    }
+}
+
+#[derive(Component)]
+struct PreviousLocation(Location);
+
+fn recursively_sync_child(
+    parent_loc: Location,
+    parent_g_trans: Vec3,
+    parent_rot: Quat,
+    ent: Entity,
+    commands: &mut Commands,
+    q_data: &mut TransformLocationQuery,
+    q_children: &Query<&Children>,
+) {
+    let Ok((g_trans, mut my_loc, my_transform, mut my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+        return;
+    };
+
+    let (local_translation, local_rotation) = if let Some(mut my_transform) = my_transform {
+        if set_trans.is_some() {
+            my_transform.translation = parent_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+        } else {
+            // Calculates the change in location since the last time this ran
+            let delta_loc = (*my_loc - my_prev_loc.0).absolute_coords_f32();
+            let delta_g_trans = last_trans_trans.map(|x| g_trans.translation() - x.0).unwrap_or(Vec3::ZERO);
+
+            // Applies that change to the transform
+            my_transform.translation += parent_rot.inverse().mul_vec3(delta_loc);
+
+            // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
+            my_loc.set_from(&(parent_loc + delta_g_trans));
+        }
+
+        (my_transform.translation, my_transform.rotation)
+    } else {
+        let translation = parent_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+
+        commands.entity(ent).insert(Transform::from_translation(translation));
+
+        (translation, Quat::IDENTITY)
+    };
+
+    let my_g_trans = parent_g_trans + parent_rot * local_translation;
+    let ltt = LastTransformTranslation(my_g_trans);
+    commands.entity(ent).insert(ltt);
+
+    *my_prev_loc = PreviousLocation(*my_loc);
+
+    let my_loc = *my_loc;
+    let my_g_trans = my_g_trans;
+    let my_g_rot = parent_rot.mul_quat(local_rotation);
+
+    if let Ok(children) = q_children.get(ent) {
+        for &child in children.iter() {
+            recursively_sync_child(my_loc, my_g_trans, my_g_rot, child, commands, q_data, q_children);
+        }
+    }
+}
+
+/// Handles children and their locations.
+// pub fn handle_child_syncing(
+//     q_top_level: Query<(&Location, &Transform, &Children), Without<Parent>>,
+//     mut q_data: Query<(&mut Location, &mut Transform, &PreviousLocation), With<Parent>>,
+//     q_children: Query<&Children>,
+// ) {
+//     for (loc, trans, children) in q_top_level.iter() {
+//         for &child in children.iter() {
+//             recursively_sync_child(*loc, trans.translation, trans.rotation, child, &mut q_data, &q_children);
+//         }
+//     }
+// }
+
+/// Fixes oddities that happen when changing parent of player
+// fn player_changed_parent(
+//     q_parent: Query<(&GlobalTransform, &Location)>,
+//     mut q_local_player: Query<(Entity, &mut Transform, &Location, &Parent, &PlayerWorld), (Changed<Parent>, With<Anchor>)>,
+// ) {
+//     for (entity, mut player_trans, player_loc, parent, player_world) in q_local_player.iter_mut() {
+//         if entity != player_world.player {
+//             // This problem only effects players that control their world
+//             continue;
+//         }
+//
+//         let Ok((parent_trans, parent_loc)) = q_parent.get(parent.get()) else {
+//             continue;
+//         };
+//
+//         // Because the player's translation is always 0, 0, 0 we need to adjust it so the player is put into the
+//         // right spot in its parent.
+//         player_trans.translation = Quat::from_affine3(&parent_trans.affine())
+//             .inverse()
+//             .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
+//     }
+// }
+
+pub(super) fn register(app: &mut App) {
+    /*
+    *Between->>apply_set_position:
+    apply_set_position->>handle_worlds
+    handle_worlds->>sync_transforms_and_locations:
+    sync_transforms_and_locations->>handle_child_syncing:
+    handle_child_syncing->>add_previous_location:
+    add_previous_location->>Between:
+
+    * */
+    app.add_systems(
+        Update,
+        (
+            propagate_transforms, // TODO: Not this
+            apply_set_position,
+            ensure_worlds_have_anchors,
+            move_players_between_worlds,
+            move_non_players_between_worlds,
+            sync_transforms_and_locations,
+            propagate_transforms, // TODO: Maybe not this? Idk
+        )
+            .chain()
+            .in_set(LocationPhysicsSet::DoPhysics)
+            .in_set(NetworkingSystemsSet::Between),
+    );
+}
diff --git a/docs/src/physics/location.md b/docs/src/physics/location.md
index 64c4d7ea8..2d222e9be 100644
--- a/docs/src/physics/location.md
+++ b/docs/src/physics/location.md
@@ -59,7 +59,8 @@ This takes place within the `Update` schedule, in the `DoPhysics` set.
 ```mermaid
 sequenceDiagram
     Between->>apply_set_position:
-    apply_set_position->>sync_transforms_and_locations:
+    apply_set_position->>handle_worlds
+    handle_worlds->>sync_transforms_and_locations:
     sync_transforms_and_locations->>handle_child_syncing:
     handle_child_syncing->>add_previous_location:
     add_previous_location->>Between:

From 99a8b95b8f3c2a6aaab627f6bae0f8ae49d4a4e2 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Wed, 1 Jan 2025 22:10:36 -0500
Subject: [PATCH 06/31] Removing old location systems

---
 cosmos_client/src/netty/gameplay/receiver.rs  | 192 +++++---------
 cosmos_client/src/structure/ship/mod.rs       |   4 +-
 .../structure/systems/laser_cannon_system.rs  |   3 +-
 .../systems/missile_launcher_system.rs        |   3 +-
 cosmos_core/src/physics/location/mod.rs       | 145 +----------
 cosmos_core/src/physics/location/systems.rs   |  86 +++----
 cosmos_server/src/netty/server_listener.rs    |  16 +-
 cosmos_server/src/netty/sync/sync_bodies.rs   |   6 +-
 cosmos_server/src/physics/mod.rs              | 236 +-----------------
 9 files changed, 141 insertions(+), 550 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 5566dfc6c..c1b51a04a 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -37,8 +37,8 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{add_previous_location, handle_child_syncing, CosmosBundleSet, Location, LocationPhysicsSet, SYSTEM_SECTORS},
-        player_world::{PlayerWorld, WorldWithin},
+        location::{CosmosBundleSet, Location, LocationPhysicsSet, SYSTEM_SECTORS},
+        player_world::PlayerWorld,
     },
     registry::Registry,
     state::GameState,
@@ -400,7 +400,7 @@ pub(crate) fn client_sync_players(
                     commands.spawn_empty()
                 };
 
-                let mut loc = match body.location {
+                let loc = match body.location {
                     NettyRigidBodyLocation::Absolute(location) => location,
                     NettyRigidBodyLocation::Relative(rel_trans, entity) => {
                         let parent_loc = query_body.get(entity).map(|x| x.0.copied()).ok().flatten().unwrap_or_default();
@@ -412,7 +412,7 @@ pub(crate) fn client_sync_players(
                 error!("Player starting loc: {loc:?}");
 
                 // this will avoid any position mismatching
-                loc.last_transform_loc = Some(loc.local);
+                // loc.last_transform_loc = Some(loc.local);
 
                 entity_cmds.insert((
                     CosmosPbrBundle {
@@ -737,19 +737,19 @@ pub(crate) fn client_sync_players(
 
                         ecmds.remove_parent();
 
-                        let Ok(Some(ship_trans)) = query_body.get(parent.get()).map(|x| x.1.cloned()) else {
-                            continue;
-                        };
-
-                        let ship_translation = ship_trans.translation;
-
-                        if let Ok((Some(mut loc), Some(mut trans))) = query_body.get_mut(player_entity).map(|x| (x.0, x.1)) {
-                            let cur_trans = trans.translation;
-
-                            trans.translation = cur_trans + ship_translation;
-
-                            loc.last_transform_loc = Some(trans.translation);
-                        }
+                        // let Ok(Some(ship_trans)) = query_body.get(parent.get()).map(|x| x.1.cloned()) else {
+                        //     continue;
+                        // };
+                        //
+                        // let ship_translation = ship_trans.translation;
+                        //
+                        // if let Ok((Some(mut loc), Some(mut trans))) = query_body.get_mut(player_entity).map(|x| (x.0, x.1)) {
+                        //     let cur_trans = trans.translation;
+                        //
+                        //     trans.translation = cur_trans + ship_translation;
+                        //
+                        //     // loc.last_transform_loc = Some(trans.translation);
+                        // }
                     }
                 }
             }
@@ -775,10 +775,10 @@ pub(crate) fn client_sync_players(
                     continue;
                 };
 
-                if let Ok((Some(mut loc), Some(mut trans), _, _, _)) = query_body.get_mut(player_entity) {
-                    trans.translation = (*loc - ship_loc).absolute_coords_f32();
-                    loc.last_transform_loc = Some(trans.translation);
-                }
+                // if let Ok((Some(mut loc), Some(mut trans), _, _, _)) = query_body.get_mut(player_entity) {
+                //     trans.translation = (*loc - ship_loc).absolute_coords_f32();
+                //     loc.last_transform_loc = Some(trans.translation);
+                // }
             }
             ServerReliableMessages::PlayerEnterBuildMode {
                 player_entity,
@@ -951,96 +951,26 @@ fn get_entity_identifier_entity_for_despawning(
     }
 }
 
-/// Handles any just-added locations that need to sync up to their transforms
-fn fix_location(
-    mut query: Query<(Entity, &mut Location, Option<&mut Transform>), (Added<Location>, Without<PlayerWorld>, Without<Parent>)>,
-    player_worlds: Query<(Entity, &Location), With<PlayerWorld>>,
-    mut commands: Commands,
-) {
-    for (entity, mut location, transform) in query.iter_mut() {
-        match player_worlds.get_single() {
-            Ok((pw, loc)) => {
-                let translation = loc.relative_coords_to(&location);
-                if let Some(mut transform) = transform {
-                    transform.translation = translation;
-                } else {
-                    commands
-                        .entity(entity)
-                        .insert((WorldWithin(pw), Transform::from_translation(translation)));
-                }
-                location.last_transform_loc = Some(translation);
-            }
-            _ => {
-                warn!("Something was added with a location before a player world was registered.")
-            }
-        }
-    }
-}
-
-fn sync_transforms_and_locations(
-    mut trans_query_no_parent: Query<(&mut Transform, &mut Location), (Without<PlayerWorld>, Without<Parent>)>,
-    trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
-    parent_query: Query<&Parent>,
-    player_entity_query: Query<Entity, With<LocalPlayer>>,
-    mut world_query: Query<(&PlayerWorld, &mut Location)>,
-) {
-    for (transform, mut location) in trans_query_no_parent.iter_mut() {
-        if location.last_transform_loc.is_some() {
-            location.apply_updates(transform.translation);
-        }
-    }
-
-    if let Ok((world, mut world_location)) = world_query.get_single_mut() {
-        let mut player_entity = player_entity_query.get(world.player).expect("This player should exist.");
-
-        while let Ok(parent) = parent_query.get(player_entity) {
-            let parent_entity = parent.get();
-            if trans_query_no_parent.contains(parent_entity) {
-                player_entity = parent.get();
-            } else {
-                break;
-            }
-        }
-
-        let location = trans_query_no_parent
-            .get(player_entity)
-            .map(|x| x.1)
-            .or_else(|_| match trans_query_with_parent.get(player_entity) {
-                Ok(loc) => Ok(loc),
-                Err(x) => Err(x),
-            })
-            .expect("The above loop guarantees this is valid");
-
-        world_location.set_from(location);
-
-        // Update transforms of objects within this world.
-        for (mut transform, mut location) in trans_query_no_parent.iter_mut() {
-            let trans = world_location.relative_coords_to(&location);
-            transform.translation = trans;
-            location.last_transform_loc = Some(trans);
-        }
-    }
-}
-
-/// Fixes oddities that happen when changing parent of player
-fn player_changed_parent(
-    q_parent: Query<(&GlobalTransform, &Location)>,
-    mut q_local_player: Query<(&mut Transform, &Location, &Parent), (Changed<Parent>, With<LocalPlayer>)>,
-) {
-    let Ok((mut player_trans, player_loc, parent)) = q_local_player.get_single_mut() else {
-        return;
-    };
-
-    let Ok((parent_trans, parent_loc)) = q_parent.get(parent.get()) else {
-        return;
-    };
-
-    // Because the player's translation is always 0, 0, 0 we need to adjust it so the player is put into the
-    // right spot in its parent.
-    player_trans.translation = Quat::from_affine3(&parent_trans.affine())
-        .inverse()
-        .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
-}
+//
+// /// Fixes oddities that happen when changing parent of player
+// fn player_changed_parent(
+//     q_parent: Query<(&GlobalTransform, &Location)>,
+//     mut q_local_player: Query<(&mut Transform, &Location, &Parent), (Changed<Parent>, With<LocalPlayer>)>,
+// ) {
+//     let Ok((mut player_trans, player_loc, parent)) = q_local_player.get_single_mut() else {
+//         return;
+//     };
+//
+//     let Ok((parent_trans, parent_loc)) = q_parent.get(parent.get()) else {
+//         return;
+//     };
+//
+//     // Because the player's translation is always 0, 0, 0 we need to adjust it so the player is put into the
+//     // right spot in its parent.
+//     player_trans.translation = Quat::from_affine3(&parent_trans.affine())
+//         .inverse()
+//         .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
+// }
 
 fn log_player_loc(q_ploc: Query<&Location, With<LocalPlayer>>) {
     if let Ok(loc) = q_ploc.get_single() {
@@ -1068,7 +998,7 @@ pub(super) fn register(app: &mut App) {
         .add_systems(
             Update,
             (
-                fix_location,
+                // fix_location,
                 client_sync_players
                     .before(ClientReceiveComponents::ClientReceiveComponents)
                     .in_set(NetworkingSystemsSet::ReceiveMessages)
@@ -1076,24 +1006,24 @@ pub(super) fn register(app: &mut App) {
             )
                 .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
                 .chain(),
-        )
-        .add_systems(
-            Update,
-            (
-                // Also run first above
-                fix_location,
-                (
-                    lerp_towards,
-                    player_changed_parent,
-                    sync_transforms_and_locations,
-                    handle_child_syncing,
-                    add_previous_location,
-                )
-                    .after(CosmosBundleSet::HandleCosmosBundles)
-                    .chain(),
-            )
-                .in_set(LocationPhysicsSet::DoPhysics)
-                .chain()
-                .run_if(in_state(GameState::Playing)),
         );
+    // .add_systems(
+    //     Update,
+    //     (
+    //         // Also run first above
+    //         fix_location,
+    //         (
+    //             lerp_towards,
+    //             player_changed_parent,
+    //             sync_transforms_and_locations,
+    //             handle_child_syncing,
+    //             add_previous_location,
+    //         )
+    //             .after(CosmosBundleSet::HandleCosmosBundles)
+    //             .chain(),
+    //     )
+    //         .in_set(LocationPhysicsSet::DoPhysics)
+    //         .chain()
+    //         .run_if(in_state(GameState::Playing)),
+    // );
 }
diff --git a/cosmos_client/src/structure/ship/mod.rs b/cosmos_client/src/structure/ship/mod.rs
index c51647592..d9c3e2caf 100644
--- a/cosmos_client/src/structure/ship/mod.rs
+++ b/cosmos_client/src/structure/ship/mod.rs
@@ -90,7 +90,7 @@ fn respond_to_collisions(
         // Otherwise just remove the parent if they hit a different structure
         commands.entity(player_entity).remove_parent();
 
-        player_loc.last_transform_loc = Some(player_trans.translation);
+        // player_loc.last_transform_loc = Some(player_trans.translation);
 
         renet_client.send_message(
             NettyChannelClient::Reliable,
@@ -114,7 +114,7 @@ fn remove_parent_when_too_far(
             if player_loc.distance_sqrd(structure_loc).sqrt() >= CHUNK_DIMENSIONSF * 10.0 {
                 commands.entity(player_entity).remove_parent();
 
-                player_loc.last_transform_loc = Some(player_trans.translation);
+                // player_loc.last_transform_loc = Some(player_trans.translation);
 
                 renet_client.send_message(
                     NettyChannelClient::Reliable,
diff --git a/cosmos_client/src/structure/systems/laser_cannon_system.rs b/cosmos_client/src/structure/systems/laser_cannon_system.rs
index a70e1882c..fb192262b 100644
--- a/cosmos_client/src/structure/systems/laser_cannon_system.rs
+++ b/cosmos_client/src/structure/systems/laser_cannon_system.rs
@@ -35,9 +35,8 @@ fn apply_shooting_sound(
             continue;
         };
 
-        let mut location = *ship_location;
+        let location = *ship_location;
         let translation = ship_global_transform.translation();
-        location.last_transform_loc = Some(ship_global_transform.translation());
 
         let idx = rand::random::<usize>() % audio_handles.0.len();
 
diff --git a/cosmos_client/src/structure/systems/missile_launcher_system.rs b/cosmos_client/src/structure/systems/missile_launcher_system.rs
index b731ce0bf..4870efbbe 100644
--- a/cosmos_client/src/structure/systems/missile_launcher_system.rs
+++ b/cosmos_client/src/structure/systems/missile_launcher_system.rs
@@ -52,9 +52,8 @@ fn apply_shooting_sound(
             continue;
         };
 
-        let mut location = *ship_location;
+        let location = *ship_location;
         let translation = ship_global_transform.translation();
-        location.last_transform_loc = Some(ship_global_transform.translation());
 
         let idx = rand::random::<usize>() % audio_handles.0.len();
 
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 7b2ed0401..01261c2e2 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -13,27 +13,20 @@
 //! to update the location component rather than the Transform where possible.
 
 use std::{
-    default,
     fmt::Display,
     ops::{Add, AddAssign, Sub},
 };
 
+#[cfg(doc)]
+use bevy::prelude::Transform;
 use bevy::{
-    ecs::schedule::{IntoSystemConfigs, SystemSet},
-    log::warn,
-    prelude::{
-        Added, App, Children, Commands, Component, Deref, DerefMut, Entity, Parent, Quat, Query, Transform, Update, Vec3, With, Without,
-    },
+    prelude::{App, Component, Deref, DerefMut, SystemSet, Update, Vec3},
     reflect::Reflect,
 };
-use bevy_rapier3d::{na::Vector3, plugin::RapierContextEntityLink};
+use bevy_rapier3d::na::Vector3;
 use bigdecimal::{BigDecimal, FromPrimitive};
 use serde::{Deserialize, Serialize};
 
-use crate::ecs::bundles::BundleStartingRotation;
-
-use super::player_world::PlayerWorld;
-
 mod systems;
 
 /// This represents the diameter of a sector. So at a local
@@ -82,9 +75,14 @@ pub struct Location {
 struct LastTransformTranslation(Vec3);
 
 #[derive(Default, Component, Debug, PartialEq, Eq, Reflect, Clone, Copy)]
+/// Sets the position of this entity based on the specified source of truth
 pub enum SetPosition {
     #[default]
+    /// The source of truth is the [`Location`] component of this entity. The [`Transform`] will be
+    /// updated to match this [`Location`].
     Location,
+    /// The source of truth is the [`Transform`] component of this entity. The [`Location`] will be
+    /// updated to match this [`Transform`].
     Transform,
 }
 
@@ -438,16 +436,6 @@ impl Location {
         self.sector = other.sector;
     }
 
-    /// Applies updates from the new translation of the transform.
-    ///
-    /// This is done automatically, so don't worry about it unless you're doing something fancy.
-    pub fn apply_updates(&mut self, translation: Vec3, last_transform_loc: &mut LastTransformTranslation) {
-        self.local += translation - last_transform_loc.0;
-        self.fix_bounds();
-
-        last_transform_loc.0 = translation;
-    }
-
     /// Returns the coordinates of this location based off 0, 0, 0.
     ///
     /// Useful for very long-distance calculations/displaying
@@ -510,114 +498,6 @@ impl Location {
 /// Stores the location from the previous frame
 pub struct PreviousLocation(pub Location);
 
-/// Adds the previous location component. Put this before the sync bodies & transform
-pub fn add_previous_location(mut query: Query<(Entity, &Location, Option<&mut PreviousLocation>)>, mut commands: Commands) {
-    for (entity, loc, prev_loc) in query.iter_mut() {
-        if let Some(mut prev_loc) = prev_loc {
-            prev_loc.0 = *loc;
-        } else {
-            commands.entity(entity).insert(PreviousLocation(*loc));
-        }
-    }
-}
-
-fn recursively_sync_child(
-    parent_loc: Location,
-    parent_g_trans: Vec3,
-    parent_rot: Quat,
-    ent: Entity,
-    q_data: &mut Query<(&mut Location, &mut Transform, &PreviousLocation), With<Parent>>,
-    q_children: &Query<&Children>,
-) {
-    let Ok((mut my_loc, mut my_transform, my_prev_loc)) = q_data.get_mut(ent) else {
-        return;
-    };
-
-    // Calculates the change in location since the last time this ran
-    let delta_loc = (*my_loc - my_prev_loc.0).absolute_coords_f32();
-
-    // Applies that change to the transform
-    my_transform.translation += parent_rot.inverse().mul_vec3(delta_loc);
-
-    // Calculates how far away the entity was from its parent + its delta location.
-    let transform_delta_parent = parent_rot.mul_vec3(my_transform.translation);
-
-    // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
-    my_loc.set_from(&(parent_loc + transform_delta_parent));
-    // my_loc.last_transform_loc = Some(transform_delta_parent + parent_g_trans);
-
-    let parent_loc = *my_loc;
-    let parent_g_trans = parent_g_trans + parent_rot.mul_vec3(my_transform.translation);
-    let parent_rot = parent_rot.mul_quat(my_transform.rotation);
-
-    if let Ok(children) = q_children.get(ent) {
-        for &child in children.iter() {
-            recursively_sync_child(parent_loc, parent_g_trans, parent_rot, child, q_data, q_children);
-        }
-    }
-}
-
-/// Handles children and their locations.
-pub fn handle_child_syncing(
-    q_top_level: Query<(&Location, &Transform, &Children), Without<Parent>>,
-    mut q_data: Query<(&mut Location, &mut Transform, &PreviousLocation), With<Parent>>,
-    q_children: Query<&Children>,
-) {
-    for (loc, trans, children) in q_top_level.iter() {
-        for &child in children.iter() {
-            recursively_sync_child(*loc, trans.translation, trans.rotation, child, &mut q_data, &q_children);
-        }
-    }
-}
-
-fn on_add_location_without_transform(
-    mut query: Query<
-        (Entity, &mut Location, Option<&BundleStartingRotation>),
-        (Added<Location>, /* Without<Transform>, */ Without<PlayerWorld>),
-    >,
-    q_worlds: Query<(&Location, &RapierContextEntityLink), With<PlayerWorld>>,
-    mut commands: Commands,
-) {
-    for (needs_transform_entity, mut my_loc, starting_rotation) in query.iter_mut() {
-        let mut best_dist = f32::MAX;
-        let mut best_physics_world = None;
-        let mut best_player_world_loc = None;
-
-        for (world_loc, phys_world) in q_worlds.iter() {
-            let dist = world_loc.distance_sqrd(&my_loc);
-
-            if dist < best_dist {
-                best_dist = dist;
-                best_physics_world = Some(*phys_world);
-                best_player_world_loc = Some(world_loc);
-            }
-        }
-
-        let rotation = starting_rotation.map(|x| x.0).unwrap_or(Quat::IDENTITY);
-
-        if let (Some(best_physics_world), Some(best_player_world_loc)) = (best_physics_world, best_player_world_loc) {
-            let transform = Transform::from_translation(best_player_world_loc.relative_coords_to(&my_loc)).with_rotation(rotation);
-
-            my_loc.last_transform_loc = Some(transform.translation);
-
-            commands
-                .entity(needs_transform_entity)
-                .remove::<BundleStartingRotation>()
-                .insert((transform, best_physics_world));
-        } else {
-            warn!("Location bundle added before there was a player world!");
-            let transform = Transform::from_translation(my_loc.absolute_coords_f32()).with_rotation(rotation);
-
-            my_loc.last_transform_loc = Some(transform.translation);
-
-            commands
-                .entity(needs_transform_entity)
-                .remove::<BundleStartingRotation>()
-                .insert(transform);
-        }
-    }
-}
-
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 /// Handles ordering of systems that rely on custom bundles.
 ///
@@ -632,13 +512,10 @@ pub enum CosmosBundleSet {
 pub(super) fn register(app: &mut App) {
     systems::register(app);
 
+    // TODO: Remove system set
     app.register_type::<Location>()
         .register_type::<PreviousLocation>()
-        .configure_sets(Update, CosmosBundleSet::HandleCosmosBundles)
-        .add_systems(
-            Update,
-            on_add_location_without_transform.in_set(CosmosBundleSet::HandleCosmosBundles),
-        );
+        .configure_sets(Update, CosmosBundleSet::HandleCosmosBundles);
 }
 
 #[cfg(test)]
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index c16433c25..93f564273 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -21,9 +21,10 @@ use crate::{
         location::LastTransformTranslation,
         player_world::{PlayerWorld, WorldWithin},
     },
+    state::GameState,
 };
 
-use super::{Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
+use super::{CosmosBundleSet, Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
 
 #[derive(Component)]
 struct Anchor;
@@ -106,42 +107,42 @@ fn apply_set_position(
 //     }
 // }
 
-fn set_transform_based_on_location(
-    mut q_q: Query<
-        (
-            &mut Transform,
-            &GlobalTransform,
-            &mut Location,
-            &WorldWithin,
-            &mut LastTransformTranslation,
-            Option<&Parent>,
-        ),
-        Without<PlayerWorld>,
-    >,
-    q_g_trans: Query<&GlobalTransform>,
-    q_physics_world: Query<&Location, With<PlayerWorld>>,
-) {
-    for (mut trans, g_trans, mut loc, world_within, mut last_translation, parent) in q_q.iter_mut() {
-        let Ok(pw_loc) = q_physics_world.get(world_within.0) else {
-            continue;
-        };
-
-        let parent_g_trans = if let Some(parent) = parent {
-            q_g_trans.get(parent.get()).map(|x| *x).unwrap_or_default()
-        } else {
-            Default::default()
-        };
-
-        let absolute_coords_relative_to_world = (*loc - *pw_loc).absolute_coords_f32();
-
-        let local_coords = parent_g_trans.rotation().inverse() * (absolute_coords_relative_to_world - parent_g_trans.translation());
-        trans.translation = local_coords;
-
-        let delta = g_trans.translation() - last_translation.0;
-        *loc = *loc + delta;
-        last_translation.0 = g_trans.translation();
-    }
-}
+// fn set_transform_based_on_location(
+//     mut q_q: Query<
+//         (
+//             &mut Transform,
+//             &GlobalTransform,
+//             &mut Location,
+//             &WorldWithin,
+//             &mut LastTransformTranslation,
+//             Option<&Parent>,
+//         ),
+//         Without<PlayerWorld>,
+//     >,
+//     q_g_trans: Query<&GlobalTransform>,
+//     q_physics_world: Query<&Location, With<PlayerWorld>>,
+// ) {
+//     for (mut trans, g_trans, mut loc, world_within, mut last_translation, parent) in q_q.iter_mut() {
+//         let Ok(pw_loc) = q_physics_world.get(world_within.0) else {
+//             continue;
+//         };
+//
+//         let parent_g_trans = if let Some(parent) = parent {
+//             q_g_trans.get(parent.get()).map(|x| *x).unwrap_or_default()
+//         } else {
+//             Default::default()
+//         };
+//
+//         let absolute_coords_relative_to_world = (*loc - *pw_loc).absolute_coords_f32();
+//
+//         let local_coords = parent_g_trans.rotation().inverse() * (absolute_coords_relative_to_world - parent_g_trans.translation());
+//         trans.translation = local_coords;
+//
+//         let delta = g_trans.translation() - last_translation.0;
+//         *loc = *loc + delta;
+//         last_translation.0 = g_trans.translation();
+//     }
+// }
 
 fn ensure_worlds_have_anchors(
     mut trans_query_no_parent: Query<
@@ -407,9 +408,6 @@ fn remove_empty_worlds(
     }
 }
 
-#[derive(Resource, Default)]
-struct FixParentLocation(Vec<Entity>);
-
 /// Bevy's query mutability rules require this query to be in a separate system than fix_location
 // fn find_need_fixed(
 //     q_added_locations_no_parent: Query<Entity, (Added<Location>, Without<PlayerWorld>, Without<Parent>)>,
@@ -661,16 +659,20 @@ pub(super) fn register(app: &mut App) {
     app.add_systems(
         Update,
         (
-            propagate_transforms, // TODO: Not this
+            propagate_transforms, // TODO: Maybe not this?
             apply_set_position,
             ensure_worlds_have_anchors,
             move_players_between_worlds,
             move_non_players_between_worlds,
+            remove_empty_worlds,
             sync_transforms_and_locations,
+            // set_transform_based_on_location,
             propagate_transforms, // TODO: Maybe not this? Idk
         )
             .chain()
             .in_set(LocationPhysicsSet::DoPhysics)
-            .in_set(NetworkingSystemsSet::Between),
+            .in_set(CosmosBundleSet::HandleCosmosBundles)
+            .in_set(NetworkingSystemsSet::Between)
+            .run_if(in_state(GameState::Playing)),
     );
 }
diff --git a/cosmos_server/src/netty/server_listener.rs b/cosmos_server/src/netty/server_listener.rs
index a93c0760f..eae094ab2 100644
--- a/cosmos_server/src/netty/server_listener.rs
+++ b/cosmos_server/src/netty/server_listener.rs
@@ -16,7 +16,7 @@ use cosmos_core::netty::server::ServerLobby;
 use cosmos_core::netty::sync::server_entity_syncing::RequestedEntityEvent;
 use cosmos_core::netty::system_sets::NetworkingSystemsSet;
 use cosmos_core::netty::{cosmos_encoder, NettyChannelClient, NettyChannelServer};
-use cosmos_core::physics::location::Location;
+use cosmos_core::physics::location::{Location, SetPosition};
 use cosmos_core::registry::Registry;
 use cosmos_core::state::GameState;
 use cosmos_core::structure::loading::ChunksNeedLoaded;
@@ -104,8 +104,8 @@ fn server_listen_messages(
                                 }
                             };
 
-                            location.set_from(&new_loc);
-                            location.last_transform_loc = Some(transform.translation);
+                            *location = new_loc;
+                            commands.entity(player_entity).insert(SetPosition::Location);
                             currently_looking.rotation = looking;
                             velocity.linvel = body.body_vel.map(|x| x.linvel).unwrap_or(Vec3::ZERO);
                             transform.rotation = body.rotation;
@@ -285,11 +285,11 @@ fn server_listen_messages(
                         if let Some(mut e) = commands.get_entity(player_entity) {
                             // This should be verified in the future to make sure the parent of the player is actually a ship
                             e.remove_parent();
-                            if let Ok((player_trans, mut player_loc)) =
-                                change_player_query.get_mut(player_entity).map(|(x, y, _, _)| (x, y))
-                            {
-                                player_loc.last_transform_loc = Some(player_trans.translation);
-                            }
+                            // if let Ok((player_trans, mut player_loc)) =
+                            //     change_player_query.get_mut(player_entity).map(|(x, y, _, _)| (x, y))
+                            // {
+                            //     player_loc.last_transform_loc = Some(player_trans.translation);
+                            // }
 
                             server.broadcast_message_except(
                                 client_id,
diff --git a/cosmos_server/src/netty/sync/sync_bodies.rs b/cosmos_server/src/netty/sync/sync_bodies.rs
index 82b16da0a..012b1ee75 100644
--- a/cosmos_server/src/netty/sync/sync_bodies.rs
+++ b/cosmos_server/src/netty/sync/sync_bodies.rs
@@ -1,7 +1,7 @@
 //! Handles the syncing of entity's rigidbodies + velocities
 
 use bevy::prelude::*;
-use bevy_rapier3d::prelude::Velocity;
+use bevy_rapier3d::{plugin::PhysicsSet, prelude::Velocity};
 use bevy_renet2::renet2::RenetServer;
 use cosmos_core::{
     block::data::BlockData,
@@ -18,7 +18,7 @@ use cosmos_core::{
         NettyChannelServer, NoSendEntity,
     },
     persistence::LoadingDistance,
-    physics::location::{add_previous_location, Location},
+    physics::location::{Location, LocationPhysicsSet},
     structure::systems::StructureSystem,
 };
 
@@ -189,7 +189,7 @@ pub(super) fn register(app: &mut App) {
         // in location + transform, but for now it's fine.
         (
             notify_client_of_successful_entity_request,
-            server_sync_bodies.after(add_previous_location),
+            server_sync_bodies.after(LocationPhysicsSet::DoPhysics),
         )
             .in_set(NetworkingSystemsSet::SyncComponents),
     )
diff --git a/cosmos_server/src/physics/mod.rs b/cosmos_server/src/physics/mod.rs
index 2c67c0f06..b6a623809 100644
--- a/cosmos_server/src/physics/mod.rs
+++ b/cosmos_server/src/physics/mod.rs
@@ -11,7 +11,7 @@ use cosmos_core::{
     entities::player::Player,
     netty::system_sets::NetworkingSystemsSet,
     physics::{
-        location::{add_previous_location, handle_child_syncing, CosmosBundleSet, Location, LocationPhysicsSet, SECTOR_DIMENSIONS},
+        location::{CosmosBundleSet, Location, LocationPhysicsSet, SECTOR_DIMENSIONS},
         player_world::{PlayerWorld, WorldWithin},
     },
     state::GameState,
@@ -213,235 +213,19 @@ fn remove_empty_worlds(
 #[derive(Resource, Default)]
 struct FixParentLocation(Vec<Entity>);
 
-/// Bevy's query mutability rules require this query to be in a separate system than fix_location
-fn find_need_fixed(
-    q_added_locations_no_parent: Query<Entity, (Added<Location>, Without<PlayerWorld>, Without<Parent>)>,
-    mut fix: ResMut<FixParentLocation>,
-) {
-    for e in q_added_locations_no_parent.iter() {
-        fix.0.push(e);
-    }
-}
-
-/// Handles any just-added locations that need to sync up to their transforms
-fn fix_location(
-    mut q_location_info: Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
-    q_children: Query<&Children>,
-    q_player_worlds: Query<(&Location, &WorldWithin, &RapierContextEntityLink), With<PlayerWorld>>,
-    mut commands: Commands,
-    q_player_world_loc: Query<&Location, With<PlayerWorld>>,
-    mut fix: ResMut<FixParentLocation>,
-) {
-    for entity in std::mem::take(&mut fix.0) {
-        // This makes the borrow checker happy
-        let (location, _) = q_location_info.get(entity).expect("Guarenteed in query conditions");
-
-        let mut best_distance = None;
-        let mut best_world = None;
-        let mut best_world_id = None;
-
-        for (loc, ww, body_world) in q_player_worlds.iter() {
-            let distance = location.distance_sqrd(loc);
-
-            if best_distance.is_none() || distance < best_distance.unwrap() {
-                best_distance = Some(distance);
-                best_world = Some(*ww);
-                best_world_id = Some(*body_world);
-            }
-        }
-
-        match (best_world, best_world_id) {
-            (Some(world), Some(world_id)) => {
-                let Ok(loc) = q_player_world_loc.get(world.0) else {
-                    warn!("A player world was missing a location");
-                    continue;
-                };
-
-                recursively_fix_locations(
-                    entity,
-                    *loc,
-                    Quat::IDENTITY,
-                    &mut q_location_info,
-                    &q_children,
-                    &mut commands,
-                    world,
-                    world_id,
-                );
-            }
-            _ => {
-                warn!("Something was added with a location before a player world was created.");
-                commands.entity(entity).log_components();
-            }
-        }
-    }
-}
-
-fn recursively_fix_locations(
-    entity: Entity,
-    parent_loc: Location,
-    mut parent_rotation: Quat,
-    q_info: &mut Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
-    q_children: &Query<&Children>,
-    commands: &mut Commands,
-    world: WorldWithin,
-    world_id: RapierContextEntityLink,
-) {
-    let Ok((mut my_loc, my_trans)) = q_info.get_mut(entity) else {
-        return;
-    };
-
-    let translation = parent_rotation.inverse().mul_vec3(-my_loc.relative_coords_to(&parent_loc));
-
-    my_loc.last_transform_loc = Some(translation);
-
-    commands.entity(entity).insert((world, world_id));
-
-    if let Some(mut my_trans) = my_trans {
-        my_trans.translation = translation;
-
-        parent_rotation *= my_trans.rotation;
-    } else {
-        commands.entity(entity).insert((Transform::from_translation(translation),));
-    }
-
-    let Ok(children) = q_children.get(entity) else {
-        return;
-    };
-
-    let my_loc = *my_loc;
-
-    for &child in children {
-        recursively_fix_locations(child, my_loc, parent_rotation, q_info, q_children, commands, world, world_id);
-    }
-}
-
-/// This system syncs the locations up with their changes in transforms.
-fn sync_transforms_and_locations(
-    mut trans_query_no_parent: Query<(Entity, &mut Transform, &mut Location, &WorldWithin), (Without<PlayerWorld>, Without<Parent>)>,
-    trans_query_with_parent: Query<(Entity, &mut Transform, &mut Location), (Without<PlayerWorld>, With<Parent>)>,
-    players_query: Query<(&WorldWithin, Entity), With<Player>>,
-    everything_query: Query<(&WorldWithin, Entity)>,
-    parent_query: Query<&Parent>,
-    entity_query: Query<Entity>,
-    mut world_query: Query<(Entity, &mut PlayerWorld, &mut Location)>,
-
-    mut commands: Commands,
-) {
-    for (entity, transform, mut location, _) in trans_query_no_parent.iter_mut() {
-        // Server transforms for players should NOT be applied to the location.
-        // The location the client sent should override it.
-        if !players_query.contains(entity) && location.last_transform_loc.is_some() {
-            location.apply_updates(transform.translation);
-        }
-    }
-
-    for (world_entity, mut world, mut world_location) in world_query.iter_mut() {
-        if let Ok(mut player_entity) = entity_query.get(world.player) {
-            while let Ok(parent) = parent_query.get(player_entity) {
-                let parent_entity = parent.get();
-                if trans_query_no_parent.contains(parent_entity) {
-                    player_entity = parent.get();
-                } else {
-                    break;
-                }
-            }
-
-            let Ok(location) =
-                trans_query_no_parent.get(player_entity).map(|(_, _, loc, _)| loc).or_else(|_| {
-                    match trans_query_with_parent.get(player_entity) {
-                        Ok((_, _, loc)) => Ok(loc),
-                        Err(x) => Err(x),
-                    }
-                })
-            else {
-                // The player was just added & doesn't have a transform yet - only a location.
-                continue;
-            };
-
-            world_location.set_from(location);
-
-            // Update transforms of objects within this world.
-            for (_, mut transform, mut location, world_within) in trans_query_no_parent.iter_mut() {
-                if world_within.0 == world_entity {
-                    transform.translation = world_location.relative_coords_to(&location);
-                    location.last_transform_loc = Some(transform.translation);
-                }
-            }
-        } else {
-            // The player has disconnected
-            // Either: Find a new player to have the world
-            // Or: Move everything over to the closest world by removing the WorldWithin component
-
-            let mut found = false;
-            // find player
-            for (world_within, entity) in players_query.iter() {
-                if world_within.0 == world_entity {
-                    world.player = entity;
-                    found = true;
-                    break;
-                }
-            }
-
-            // No suitable player found, find another world to move everything to
-            if !found {
-                for (world_within, entity) in everything_query.iter() {
-                    if world_within.0 == world_entity {
-                        commands.entity(entity).remove::<WorldWithin>();
-                    }
-                }
-                commands.entity(world_entity).despawn_recursive();
-            }
-        }
-    }
-}
-
-/// Fixes oddities that happen when changing parent of player
-fn player_changed_parent(
-    q_parent: Query<(&GlobalTransform, &Location)>,
-    mut q_local_player: Query<(Entity, &mut Transform, &Location, &Parent, &PlayerWorld), (Changed<Parent>, With<Player>)>,
-) {
-    for (entity, mut player_trans, player_loc, parent, player_world) in q_local_player.iter_mut() {
-        if entity != player_world.player {
-            // This problem only effects players that control their world
-            continue;
-        }
-
-        let Ok((parent_trans, parent_loc)) = q_parent.get(parent.get()) else {
-            continue;
-        };
-
-        // Because the player's translation is always 0, 0, 0 we need to adjust it so the player is put into the
-        // right spot in its parent.
-        player_trans.translation = Quat::from_affine3(&parent_trans.affine())
-            .inverse()
-            .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
-    }
-}
-
 pub(super) fn register(app: &mut App) {
     collider_disabling::register(app);
 
     app.configure_sets(Update, LocationPhysicsSet::DoPhysics)
-        .add_systems(
-            Update,
-            (
-                player_changed_parent,
-                find_need_fixed,
-                fix_location,
-                sync_transforms_and_locations,
-                handle_child_syncing,
-                add_previous_location,
-                // consider for future:
-                // sync_simple_transforms,
-                // propagate_transforms,
-            )
-                .chain()
-                .after(CosmosBundleSet::HandleCosmosBundles)
-                .in_set(LocationPhysicsSet::DoPhysics)
-                .run_if(in_state(GameState::Playing))
-                .before(NetworkingSystemsSet::ReceiveMessages),
-        )
-        .add_systems(PostUpdate, fix_location)
+        // .add_systems(
+        // Update,
+        // (), // .chain()
+        // .after(CosmosBundleSet::HandleCosmosBundles)
+        // .in_set(LocationPhysicsSet::DoPhysics)
+        // .run_if(in_state(GameState::Playing))
+        // .before(NetworkingSystemsSet::ReceiveMessages),
+        // )
+        // .add_systems(PostUpdate, fix_location)
         // This must be last due to commands being delayed when adding PhysicsWorlds.
         .add_systems(
             Last,

From 19075ecfb722e48312d13a4db74ce6baef267b32 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Thu, 2 Jan 2025 13:17:12 -0500
Subject: [PATCH 07/31] Quicksave

---
 cosmos_client/src/netty/gameplay/receiver.rs |   2 +-
 cosmos_core/src/physics/location/systems.rs  | 215 +++++++++++++------
 2 files changed, 147 insertions(+), 70 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index c1b51a04a..44a5c460c 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -37,7 +37,7 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{CosmosBundleSet, Location, LocationPhysicsSet, SYSTEM_SECTORS},
+        location::{CosmosBundleSet, Location, LocationPhysicsSet, SetPosition, SYSTEM_SECTORS},
         player_world::PlayerWorld,
     },
     registry::Registry,
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 93f564273..dda71992b 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -10,7 +10,7 @@
 
 use bevy::{prelude::*, transform::systems::propagate_transforms, utils::HashSet};
 use bevy_rapier3d::{
-    plugin::{RapierConfiguration, RapierContextEntityLink},
+    plugin::{DefaultRapierContext, RapierConfiguration, RapierContextEntityLink},
     prelude::RapierContextSimulation,
 };
 
@@ -144,9 +144,33 @@ fn apply_set_position(
 //     }
 // }
 
+fn do_the_kids(
+    parent_g_trans: Vec3,
+    parent_g_rot: Quat,
+    mut q_trans: Query<
+        (
+            Entity,
+            &mut Transform,
+            &Location,
+            &mut LastTransformTranslation,
+            &WorldWithin,
+            Option<&Children>,
+        ),
+        (Without<PlayerWorld>, With<Parent>),
+    >,
+) {
+}
+
 fn ensure_worlds_have_anchors(
     mut trans_query_no_parent: Query<
-        (Entity, &mut Transform, &Location, &mut LastTransformTranslation, &WorldWithin),
+        (
+            Entity,
+            &mut Transform,
+            &Location,
+            &mut LastTransformTranslation,
+            &WorldWithin,
+            // Option<&Children>,
+        ),
         (Without<PlayerWorld>, Without<Parent>),
     >,
     trans_query_with_parent: Query<(Entity, &mut Transform, &mut Location), (Without<PlayerWorld>, With<Parent>)>,
@@ -179,39 +203,44 @@ fn ensure_worlds_have_anchors(
                 continue;
             };
 
-            world_location.set_from(location);
-
-            // Update transforms of objects within this world.
-            for (_, mut transform, location, mut last_transform_loc, world_within) in trans_query_no_parent.iter_mut() {
-                if world_within.0 == world_entity {
-                    transform.translation = world_location.relative_coords_to(&location);
-                    // The transform.translation is the global transform since this is a top level entity
-                    last_transform_loc.0 = transform.translation;
-                }
-            }
+            *world_location = *location;
+
+            // // Update transforms of objects within this world.
+            // for (_, mut transform, location, mut last_transform_loc, world_within) in trans_query_no_parent.iter_mut() {
+            //     if world_within.0 == world_entity {
+            //         info!("WORLDO PRE: {:?}", transform.translation);
+            //         transform.translation = world_location.relative_coords_to(&location);
+            //         info!("WORLDO POST: {:?}", transform.translation);
+            //         // The transform.translation is the global transform since this is a top level entity
+            //         last_transform_loc.0 = transform.translation;
+            //     }
+            // }
         } else {
-            // The player has disconnected
-            // Either: Find a new player to have the world
-            // Or: Move everything over to the closest world by removing the WorldWithin component
-
-            let mut found = false;
-            // find player
-            for (world_within, entity) in players_query.iter() {
-                if world_within.0 == world_entity {
-                    world.player = entity;
-                    found = true;
-                    break;
+            #[cfg(feature = "server")]
+            {
+                // The player has disconnected
+                // Either: Find a new player to have the world
+                // Or: Move everything over to the closest world by removing the WorldWithin component
+
+                let mut found = false;
+                // find player
+                for (world_within, entity) in players_query.iter() {
+                    if world_within.0 == world_entity {
+                        world.player = entity;
+                        found = true;
+                        break;
+                    }
                 }
-            }
 
-            // No suitable player found, find another world to move everything to
-            if !found {
-                for (world_within, entity) in everything_query.iter() {
-                    if world_within.0 == world_entity {
-                        commands.entity(entity).remove::<WorldWithin>();
+                // No suitable player found, find another world to move everything to
+                if !found {
+                    for (world_within, entity) in everything_query.iter() {
+                        if world_within.0 == world_entity {
+                            commands.entity(entity).remove::<WorldWithin>();
+                        }
                     }
+                    commands.entity(world_entity).despawn_recursive();
                 }
-                commands.entity(world_entity).despawn_recursive();
             }
         }
     }
@@ -514,41 +543,41 @@ type TransformLocationQuery<'w, 's> = Query<
     'w,
     's,
     (
+        &'static Name,
+        &'static WorldWithin,
         &'static GlobalTransform,
         &'static mut Location,
         Option<&'static mut Transform>,
-        &'static mut PreviousLocation,
-        Option<&'static mut LastTransformTranslation>,
+        Option<&'static PreviousLocation>,
+        Option<&'static LastTransformTranslation>,
         Option<&'static SetTransformBasedOnLocationFlag>,
     ),
+    Without<PlayerWorld>,
 >;
 
 /// This system syncs the locations up with their changes in transforms.
 fn sync_transforms_and_locations(
-    q_entities: Query<
-        Entity,
-        (
-            Without<PlayerWorld>,
-            Without<Player>, // TODO: Is this even needed???
-            With<Transform>,
-            With<Location>,
-            With<LastTransformTranslation>,
-            Without<Parent>,
-        ),
-    >,
+    q_entities: Query<(Entity, &WorldWithin), (Without<PlayerWorld>, With<Transform>, With<Location>, Without<Parent>)>,
+    q_loc: Query<&Location, With<PlayerWorld>>,
     mut q_data: TransformLocationQuery,
+    q_pw: Query<&Location, With<PlayerWorld>>,
     q_children: Query<&Children>,
     mut commands: Commands,
 ) {
-    for entity in q_entities.iter() {
-        recursively_sync_child(
-            Location::ZERO,
+    for (entity, world_within) in q_entities.iter() {
+        let Ok(pw_loc) = q_loc.get(world_within.0) else {
+            continue;
+        };
+
+        recursively_sync_transforms_and_locations(
+            *pw_loc,
             Vec3::ZERO,
             Quat::IDENTITY,
             entity,
             &mut commands,
             &mut q_data,
             &q_children,
+            &q_pw,
         );
     }
 }
@@ -556,56 +585,86 @@ fn sync_transforms_and_locations(
 #[derive(Component)]
 struct PreviousLocation(Location);
 
-fn recursively_sync_child(
+fn recursively_sync_transforms_and_locations(
     parent_loc: Location,
     parent_g_trans: Vec3,
-    parent_rot: Quat,
+    parent_g_rot: Quat,
+    parent_delta_g_trans: Vec3,
     ent: Entity,
     commands: &mut Commands,
     q_data: &mut TransformLocationQuery,
     q_children: &Query<&Children>,
+    q_pw: &Query<&Location, With<PlayerWorld>>,
 ) {
-    let Ok((g_trans, mut my_loc, my_transform, mut my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+    let Ok((name, world_within, _, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+        return;
+    };
+
+    let Ok(world_loc) = q_pw.get(world_within.0) else {
         return;
     };
 
+    info!("DOING {}", name);
     let (local_translation, local_rotation) = if let Some(mut my_transform) = my_transform {
+        let mut delta_g_trans = Vec3::ZERO;
+
         if set_trans.is_some() {
-            my_transform.translation = parent_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+            info!("SETTING TRANS! - Was {}", my_transform.translation);
+            my_transform.translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+            info!("SETTING TRANS! - NOW {}", my_transform.translation);
         } else {
+            let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
+
             // Calculates the change in location since the last time this ran
-            let delta_loc = (*my_loc - my_prev_loc.0).absolute_coords_f32();
-            let delta_g_trans = last_trans_trans.map(|x| g_trans.translation() - x.0).unwrap_or(Vec3::ZERO);
+            // let delta_loc = (*my_loc - my_prev_loc.map(|x| x.0).unwrap_or(*my_loc)).absolute_coords_f32();
+            // info!("G TRANS: {}", g_trans);
+            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
+
+            let my_global_location_trans = (*my_loc - *world_loc).absolute_coords_f32();
+            let my_local_location_trans = parent_g_rot.inverse() * (my_global_location_trans - parent_g_trans);
+            let my_delta_local_trans = delta_g_trans - parent_delta_g_trans;
+            // info!("Delta loc: {delta_loc:?}");
+            // info!("Delta G trans: {delta_g_trans:?}");
+            //
+            info!(
+                "PRE: {my_loc:?} | TRANS: {} | my_local_location_trans: {my_local_location_trans:?}",
+                my_transform.translation
+            );
 
             // Applies that change to the transform
-            my_transform.translation += parent_rot.inverse().mul_vec3(delta_loc);
+            my_transform.translation += parent_g_rot.inverse() * delta_loc;
 
             // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
-            my_loc.set_from(&(parent_loc + delta_g_trans));
+            *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
+            info!("POST: {my_loc:?} | TRANS: {}", my_transform.translation);
         }
 
-        (my_transform.translation, my_transform.rotation)
+        (my_transform.translation, my_transform.rotation, delta_g_trans)
     } else {
-        let translation = parent_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+        info!("SETTING TRANS the odd way!!!!!!");
+        let translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
 
         commands.entity(ent).insert(Transform::from_translation(translation));
 
-        (translation, Quat::IDENTITY)
+        info!("SETTING TRANS the odd way!!!!!! - is {}", translation);
+
+        (translation, Quat::IDENTITY, Vec3::ZERO)
     };
 
-    let my_g_trans = parent_g_trans + parent_rot * local_translation;
+    let my_g_trans = parent_g_trans + parent_g_rot * local_translation;
     let ltt = LastTransformTranslation(my_g_trans);
-    commands.entity(ent).insert(ltt);
-
-    *my_prev_loc = PreviousLocation(*my_loc);
+    commands
+        .entity(ent)
+        .insert((ltt, PreviousLocation(*my_loc)))
+        .remove::<SetTransformBasedOnLocationFlag>();
 
     let my_loc = *my_loc;
     let my_g_trans = my_g_trans;
-    let my_g_rot = parent_rot.mul_quat(local_rotation);
+    let my_g_rot = parent_g_rot.mul_quat(local_rotation);
 
     if let Ok(children) = q_children.get(ent) {
         for &child in children.iter() {
-            recursively_sync_child(my_loc, my_g_trans, my_g_rot, child, commands, q_data, q_children);
+            recursively_sync_transforms_and_locations(my_loc, my_g_trans, my_g_rot, child, commands, q_data, q_children, q_pw);
         }
     }
 }
@@ -645,6 +704,26 @@ fn recursively_sync_child(
 //             .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
 //     }
 // }
+//
+// fn create_default_world_within(
+//     mut commands: Commands,
+//     q_rapier_context: Query<Entity, With<DefaultRapierContext>>) {
+//     let context_ent = q_rapier_context.single();
+//     commands.spawn(PlayerWorld)
+// }
+//
+// fn client_update_worlds(
+//     q_needs_world: Query<Entity, (With<Location>, Without<WorldWithin>)>,
+//     pw: Query<Entity, With<PlayerWorld>>,
+//     mut commands: Commands,
+// ) {
+//     let Ok(pw) = pw.get_single() else {
+//         return;
+//     };
+//     for entity in q_needs_world.iter() {
+//         commands.entity(entity).insert(WorldWithin(pw));
+//     }
+// }
 
 pub(super) fn register(app: &mut App) {
     /*
@@ -662,17 +741,15 @@ pub(super) fn register(app: &mut App) {
             propagate_transforms, // TODO: Maybe not this?
             apply_set_position,
             ensure_worlds_have_anchors,
-            move_players_between_worlds,
-            move_non_players_between_worlds,
-            remove_empty_worlds,
+            #[cfg(feature = "server")]
+            (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
             // set_transform_based_on_location,
             propagate_transforms, // TODO: Maybe not this? Idk
         )
             .chain()
             .in_set(LocationPhysicsSet::DoPhysics)
-            .in_set(CosmosBundleSet::HandleCosmosBundles)
-            .in_set(NetworkingSystemsSet::Between)
-            .run_if(in_state(GameState::Playing)),
+            // .in_set(CosmosBundleSet::HandleCosmosBundles)
+            .in_set(NetworkingSystemsSet::Between),
     );
 }

From 52c8cc76bafc49792ab94a25298fea48a2bbe49f Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Thu, 2 Jan 2025 16:55:43 -0500
Subject: [PATCH 08/31] Location syncing working for parent child relationships

---
 cosmos_core/src/physics/location/mod.rs     | 10 +++++
 cosmos_core/src/physics/location/systems.rs | 50 +++++++++++++++------
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 01261c2e2..139c965b1 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -287,6 +287,16 @@ impl Add<Vec3> for Location {
     }
 }
 
+impl Add<Self> for Location {
+    type Output = Self;
+
+    fn add(self, rhs: Self) -> Self::Output {
+        let mut loc = Location::new(self.local + rhs.local, self.sector + rhs.sector);
+        loc.fix_bounds();
+        loc
+    }
+}
+
 impl Sub<Vec3> for Location {
     type Output = Location;
 
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index dda71992b..ab303aabd 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -570,9 +570,11 @@ fn sync_transforms_and_locations(
         };
 
         recursively_sync_transforms_and_locations(
+            *pw_loc,
             *pw_loc,
             Vec3::ZERO,
             Quat::IDENTITY,
+            Vec3::ZERO,
             entity,
             &mut commands,
             &mut q_data,
@@ -587,6 +589,7 @@ struct PreviousLocation(Location);
 
 fn recursively_sync_transforms_and_locations(
     parent_loc: Location,
+    parent_prev_loc: Location,
     parent_g_trans: Vec3,
     parent_g_rot: Quat,
     parent_delta_g_trans: Vec3,
@@ -605,7 +608,7 @@ fn recursively_sync_transforms_and_locations(
     };
 
     info!("DOING {}", name);
-    let (local_translation, local_rotation) = if let Some(mut my_transform) = my_transform {
+    let (local_translation, local_rotation, delta_g_trans) = if let Some(mut my_transform) = my_transform {
         let mut delta_g_trans = Vec3::ZERO;
 
         if set_trans.is_some() {
@@ -615,28 +618,35 @@ fn recursively_sync_transforms_and_locations(
         } else {
             let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
 
+            let parent_delta_loc = parent_loc - parent_prev_loc;
+            *my_loc = *my_loc + parent_delta_loc;
+
             // Calculates the change in location since the last time this ran
             // let delta_loc = (*my_loc - my_prev_loc.map(|x| x.0).unwrap_or(*my_loc)).absolute_coords_f32();
             // info!("G TRANS: {}", g_trans);
             delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
 
-            let my_global_location_trans = (*my_loc - *world_loc).absolute_coords_f32();
-            let my_local_location_trans = parent_g_rot.inverse() * (my_global_location_trans - parent_g_trans);
-            let my_delta_local_trans = delta_g_trans - parent_delta_g_trans;
+            // info!(
+            //     "PRE: {my_loc:?} | TRANS: {} | my_local_location_trans: {my_local_location_based_trans:?}",
+            //     my_transform.translation
+            // );
+
+            let my_delta_local_rotated_trans = delta_g_trans - parent_delta_g_trans;
+            // *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
+            *my_loc = *my_loc + my_delta_local_rotated_trans;
+            let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
+            let my_local_location_based_trans = parent_g_rot.inverse() * my_local_rotated_trans;
             // info!("Delta loc: {delta_loc:?}");
-            // info!("Delta G trans: {delta_g_trans:?}");
-            //
-            info!(
-                "PRE: {my_loc:?} | TRANS: {} | my_local_location_trans: {my_local_location_trans:?}",
-                my_transform.translation
-            );
+            info!("Delta G trans: {delta_g_trans:?} | MDLRT: {my_delta_local_rotated_trans} MLRT: {my_local_rotated_trans}");
+
+            my_transform.translation = my_local_location_based_trans;
 
             // Applies that change to the transform
-            my_transform.translation += parent_g_rot.inverse() * delta_loc;
+            // my_transform.translation += parent_g_rot.inverse() * delta_loc;
 
             // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
-            *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
-            info!("POST: {my_loc:?} | TRANS: {}", my_transform.translation);
+            // *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
+            // info!("POST: {my_loc:?} | TRANS: {}", my_transform.translation);
         }
 
         (my_transform.translation, my_transform.rotation, delta_g_trans)
@@ -661,10 +671,22 @@ fn recursively_sync_transforms_and_locations(
     let my_loc = *my_loc;
     let my_g_trans = my_g_trans;
     let my_g_rot = parent_g_rot.mul_quat(local_rotation);
+    let my_prev_loc = my_prev_loc.map(|x| x.0).unwrap_or(my_loc);
 
     if let Ok(children) = q_children.get(ent) {
         for &child in children.iter() {
-            recursively_sync_transforms_and_locations(my_loc, my_g_trans, my_g_rot, child, commands, q_data, q_children, q_pw);
+            recursively_sync_transforms_and_locations(
+                my_loc,
+                my_prev_loc,
+                my_g_trans,
+                my_g_rot,
+                delta_g_trans,
+                child,
+                commands,
+                q_data,
+                q_children,
+                q_pw,
+            );
         }
     }
 }

From 548e7ebc682905bd3f60bd1c340e1ac859d066a3 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Thu, 2 Jan 2025 19:54:51 -0500
Subject: [PATCH 09/31] Kinda works if world doesnt move

---
 cosmos_core/src/physics/location/systems.rs | 30 +++++++++------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index ab303aabd..7bbe81fd1 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -8,7 +8,9 @@
 //!
 //!
 
-use bevy::{prelude::*, transform::systems::propagate_transforms, utils::HashSet};
+use std::time::Duration;
+
+use bevy::{prelude::*, time::common_conditions::on_timer, transform::systems::propagate_transforms, utils::HashSet};
 use bevy_rapier3d::{
     plugin::{DefaultRapierContext, RapierConfiguration, RapierContextEntityLink},
     prelude::RapierContextSimulation,
@@ -617,27 +619,21 @@ fn recursively_sync_transforms_and_locations(
             info!("SETTING TRANS! - NOW {}", my_transform.translation);
         } else {
             let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
+            info!("PARENT G TRANS: {parent_g_trans}");
 
             let parent_delta_loc = parent_loc - parent_prev_loc;
-            *my_loc = *my_loc + parent_delta_loc;
-
-            // Calculates the change in location since the last time this ran
-            // let delta_loc = (*my_loc - my_prev_loc.map(|x| x.0).unwrap_or(*my_loc)).absolute_coords_f32();
-            // info!("G TRANS: {}", g_trans);
-            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
-
-            // info!(
-            //     "PRE: {my_loc:?} | TRANS: {} | my_local_location_trans: {my_local_location_based_trans:?}",
-            //     my_transform.translation
-            // );
+            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO) - parent_delta_g_trans;
 
-            let my_delta_local_rotated_trans = delta_g_trans - parent_delta_g_trans;
-            // *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
-            *my_loc = *my_loc + my_delta_local_rotated_trans;
+            *my_loc = *my_loc + delta_g_trans + parent_delta_loc;
             let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
             let my_local_location_based_trans = parent_g_rot.inverse() * my_local_rotated_trans;
             // info!("Delta loc: {delta_loc:?}");
-            info!("Delta G trans: {delta_g_trans:?} | MDLRT: {my_delta_local_rotated_trans} MLRT: {my_local_rotated_trans}");
+            info!(
+                "Delta G trans: {delta_g_trans:?} | PG: {parent_g_trans} OT: {} \
+                | (GT{g_trans} - LT{last_trans_trans:?}) \
+                New Trans: {my_local_rotated_trans}",
+                my_transform.translation
+            );
 
             my_transform.translation = my_local_location_based_trans;
 
@@ -762,7 +758,7 @@ pub(super) fn register(app: &mut App) {
         (
             propagate_transforms, // TODO: Maybe not this?
             apply_set_position,
-            ensure_worlds_have_anchors,
+            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(1))),
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,

From 44b187ca8d906c6e2567aacae1dcdcfcaf77aa19 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Fri, 3 Jan 2025 12:24:31 -0500
Subject: [PATCH 10/31] Quicksave

---
 cosmos_client/src/netty/gameplay/receiver.rs |  9 ---
 cosmos_core/src/physics/location/systems.rs  | 58 ++++++++++++++++++--
 2 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 44a5c460c..9578ea47a 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -972,18 +972,9 @@ fn get_entity_identifier_entity_for_despawning(
 //         .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
 // }
 
-fn log_player_loc(q_ploc: Query<&Location, With<LocalPlayer>>) {
-    if let Ok(loc) = q_ploc.get_single() {
-        info!("PLOC: {loc:?}");
-    } else {
-        error!("NO PLOC!!!");
-    }
-}
-
 pub(super) fn register(app: &mut App) {
     app.insert_resource(RequestedEntities::default())
         .configure_sets(Update, LocationPhysicsSet::DoPhysics)
-        .add_systems(Update, log_player_loc)
         .add_systems(
             Update,
             (
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 7bbe81fd1..3c88bbe2c 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -10,19 +10,25 @@
 
 use std::time::Duration;
 
-use bevy::{prelude::*, time::common_conditions::on_timer, transform::systems::propagate_transforms, utils::HashSet};
+use bevy::{
+    prelude::*,
+    time::common_conditions::on_timer,
+    transform::systems::{propagate_transforms, sync_simple_transforms},
+    utils::HashSet,
+};
 use bevy_rapier3d::{
     plugin::{DefaultRapierContext, RapierConfiguration, RapierContextEntityLink},
-    prelude::RapierContextSimulation,
+    prelude::{Collider, RapierContextSimulation, RigidBody, Velocity},
 };
 
 use crate::{
     entities::player::Player,
-    netty::system_sets::NetworkingSystemsSet,
+    netty::{client::LocalPlayer, system_sets::NetworkingSystemsSet},
     physics::{
         location::LastTransformTranslation,
         player_world::{PlayerWorld, WorldWithin},
     },
+    prelude::Station,
     state::GameState,
 };
 
@@ -184,6 +190,7 @@ fn ensure_worlds_have_anchors(
 
     mut commands: Commands,
 ) {
+    info!("\n\n\n\n\n\n\nRAN THE PROBLEM\n\n\n\n\n\n\n\n");
     for (world_entity, mut world, mut world_location) in world_query.iter_mut() {
         if let Ok(mut player_entity) = entity_query.get(world.player) {
             while let Ok(parent) = parent_query.get(player_entity) {
@@ -743,6 +750,46 @@ fn recursively_sync_transforms_and_locations(
 //     }
 // }
 
+fn asdf(q_p: Query<(), (Added<Parent>, With<Anchor>)>) {
+    if !q_p.is_empty() {
+        info!("ADDED PARENT TO PLAYER!!!!!!!!!!!!!!!");
+    }
+}
+
+#[derive(Component)]
+struct LeCube;
+
+fn spawn_le_cube(mut meshes: ResMut<Assets<Mesh>>, q_palyer: Query<&Location, With<LocalPlayer>>, mut commands: Commands) {
+    let loc = q_palyer.single();
+    commands.spawn((
+        *loc,
+        SetPosition::Location,
+        Mesh3d(meshes.add(Cuboid::new(0.5, 0.5, 0.5))),
+        Velocity {
+            linvel: Vec3::new(1.0, 0.0, 0.0),
+            ..Default::default()
+        },
+        LeCube,
+        RigidBody::Dynamic,
+        Collider::cuboid(0.5, 0.5, 0.5),
+    ));
+}
+
+// fn swap_le_parent(
+//     mut commands: Commands,
+//     q_station: Query<Entity, With<Station>>,
+//     q_cube: Query<(Entity, Option<&Parent>), With<LeCube>) {
+//     let station = q_station.single();
+//     let (cube_e, c_parent)
+//     = q_cube.single();
+//
+//     if c_parent.is_none() {
+//         commands.entity(cube_e).set_parent(station);
+//     }else {
+//         commands.entity(cube_e).remove_parent();
+//     }
+// }
+
 pub(super) fn register(app: &mut App) {
     /*
     *Between->>apply_set_position:
@@ -756,9 +803,10 @@ pub(super) fn register(app: &mut App) {
     app.add_systems(
         Update,
         (
-            propagate_transforms, // TODO: Maybe not this?
+            (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
+            asdf,
             apply_set_position,
-            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(1))),
+            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(20))),
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,

From 0587aec91613744db5b76d01405fe87a532e9cd8 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Fri, 3 Jan 2025 12:31:28 -0500
Subject: [PATCH 11/31] Fixed incorrect set_parent and remove_parent calls not
 updating position properly

---
 cosmos_client/src/netty/gameplay/receiver.rs          | 10 +++++-----
 cosmos_client/src/structure/shared/mod.rs             |  2 +-
 cosmos_client/src/structure/ship/mod.rs               |  8 ++++----
 cosmos_client/src/structure/systems/sync.rs           |  7 +++----
 cosmos_core/src/structure/shared/build_mode.rs        |  6 +++---
 cosmos_core/src/structure/shared/mod.rs               |  4 ++--
 cosmos_server/src/blocks/interactable/gravity_well.rs |  4 ++--
 cosmos_server/src/netty/server_listener.rs            |  2 +-
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 9578ea47a..5e0f01d3a 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -305,10 +305,10 @@ pub(crate) fn client_sync_players(
 
                                         if let Ok(parent) = q_parent.get(entity) {
                                             if parent.get() != parent_ent {
-                                                commands.entity(entity).set_parent(parent_ent);
+                                                commands.entity(entity).set_parent_in_place(parent_ent);
                                             }
                                         } else {
-                                            commands.entity(entity).set_parent(parent_ent);
+                                            commands.entity(entity).set_parent_in_place(parent_ent);
                                         }
 
                                         parent_loc + rel_trans
@@ -342,7 +342,7 @@ pub(crate) fn client_sync_players(
                         ));
 
                         if let Some(parent_ent) = parent_ent {
-                            client_entity_ecmds.set_parent(parent_ent);
+                            client_entity_ecmds.set_parent_in_place(parent_ent);
                         }
 
                         let client_entity = client_entity_ecmds.id();
@@ -735,7 +735,7 @@ pub(crate) fn client_sync_players(
                             continue;
                         };
 
-                        ecmds.remove_parent();
+                        ecmds.remove_parent_in_place();
 
                         // let Ok(Some(ship_trans)) = query_body.get(parent.get()).map(|x| x.1.cloned()) else {
                         //     continue;
@@ -769,7 +769,7 @@ pub(crate) fn client_sync_players(
                     continue;
                 };
 
-                ecmds.set_parent(ship_entity);
+                ecmds.set_parent_in_place(ship_entity);
 
                 let Ok(Some(ship_loc)) = query_body.get(ship_entity).map(|x| x.0.cloned()) else {
                     continue;
diff --git a/cosmos_client/src/structure/shared/mod.rs b/cosmos_client/src/structure/shared/mod.rs
index bc2b1b4af..58e8e1b29 100644
--- a/cosmos_client/src/structure/shared/mod.rs
+++ b/cosmos_client/src/structure/shared/mod.rs
@@ -25,7 +25,7 @@ fn remove_self_from_structure(
 ) {
     if let Ok((entity, parent)) = has_parent.get_single() {
         if ship_is_parent.contains(parent.get()) && input_handler.check_just_pressed(CosmosInputs::LeaveShip) {
-            commands.entity(entity).remove_parent();
+            commands.entity(entity).remove_parent_in_place();
 
             renet_client.send_message(
                 NettyChannelClient::Reliable,
diff --git a/cosmos_client/src/structure/ship/mod.rs b/cosmos_client/src/structure/ship/mod.rs
index d9c3e2caf..31faa554c 100644
--- a/cosmos_client/src/structure/ship/mod.rs
+++ b/cosmos_client/src/structure/ship/mod.rs
@@ -3,8 +3,8 @@
 use bevy::{
     ecs::event::EventReader,
     prelude::{
-        in_state, App, BuildChildren, Commands, Entity, IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query, ResMut, SystemSet,
-        Transform, Update, With, Without,
+        in_state, App, BuildChildren, BuildChildrenTransformExt, Commands, Entity, IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query,
+        ResMut, SystemSet, Transform, Update, With, Without,
     },
 };
 use bevy_rapier3d::pipeline::CollisionEvent;
@@ -88,7 +88,7 @@ fn respond_to_collisions(
         }
 
         // Otherwise just remove the parent if they hit a different structure
-        commands.entity(player_entity).remove_parent();
+        commands.entity(player_entity).remove_parent_in_place();
 
         // player_loc.last_transform_loc = Some(player_trans.translation);
 
@@ -112,7 +112,7 @@ fn remove_parent_when_too_far(
             }
 
             if player_loc.distance_sqrd(structure_loc).sqrt() >= CHUNK_DIMENSIONSF * 10.0 {
-                commands.entity(player_entity).remove_parent();
+                commands.entity(player_entity).remove_parent_in_place();
 
                 // player_loc.last_transform_loc = Some(player_trans.translation);
 
diff --git a/cosmos_client/src/structure/systems/sync.rs b/cosmos_client/src/structure/systems/sync.rs
index e4037c1dc..d6d812895 100644
--- a/cosmos_client/src/structure/systems/sync.rs
+++ b/cosmos_client/src/structure/systems/sync.rs
@@ -6,13 +6,12 @@ use bevy::{
         entity::Entity,
         event::{Event, EventReader, EventWriter},
         query::With,
-        schedule::IntoSystemConfigs,
-        schedule::IntoSystemSetConfigs,
+        schedule::{IntoSystemConfigs, IntoSystemSetConfigs},
         system::{Commands, Query, Res, ResMut, Resource},
     },
     hierarchy::BuildChildren,
     log::{error, warn},
-    prelude::{Deref, DerefMut, SystemSet},
+    prelude::{BuildChildrenTransformExt, Deref, DerefMut, SystemSet},
     state::condition::in_state,
     utils::HashMap,
 };
@@ -149,7 +148,7 @@ fn replication_listen_netty(
                                 aligned_to: None,
                             },
                         ))
-                        .set_parent(structure_entity);
+                        .set_parent_in_place(structure_entity);
                 } else {
                     ecmds.remove::<GravityWell>();
                 }
diff --git a/cosmos_core/src/structure/shared/build_mode.rs b/cosmos_core/src/structure/shared/build_mode.rs
index df96d53fc..da595efc4 100644
--- a/cosmos_core/src/structure/shared/build_mode.rs
+++ b/cosmos_core/src/structure/shared/build_mode.rs
@@ -4,8 +4,8 @@
 
 use bevy::{
     prelude::{
-        App, BuildChildren, Changed, Commands, Component, Entity, Event, EventReader, EventWriter, IntoSystemConfigs, IntoSystemSetConfigs,
-        Parent, Query, SystemSet, Update, With, Without,
+        App, BuildChildren, BuildChildrenTransformExt, Changed, Commands, Component, Entity, Event, EventReader, EventWriter,
+        IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query, SystemSet, Update, With, Without,
     },
     reflect::Reflect,
 };
@@ -96,7 +96,7 @@ fn enter_build_mode_listener(mut commands: Commands, mut event_reader: EventRead
             .insert(RigidBodyDisabled)
             .insert(RigidBody::Fixed)
             .insert(Sensor)
-            .set_parent(ev.structure_entity);
+            .set_parent_in_place(ev.structure_entity);
     }
 }
 
diff --git a/cosmos_core/src/structure/shared/mod.rs b/cosmos_core/src/structure/shared/mod.rs
index 6aa185592..9eaa8fdcf 100644
--- a/cosmos_core/src/structure/shared/mod.rs
+++ b/cosmos_core/src/structure/shared/mod.rs
@@ -1,7 +1,7 @@
 //! Shared systems between different structure types
 
 use bevy::{
-    prelude::{App, BuildChildren, Children, Commands, Component, Or, PostUpdate, Query, With},
+    prelude::{App, BuildChildren, BuildChildrenTransformExt, Children, Commands, Component, Or, PostUpdate, Query, With},
     reflect::Reflect,
 };
 use serde::{Deserialize, Serialize};
@@ -56,7 +56,7 @@ fn save_the_kids(
 ) {
     for children in query.iter() {
         for child in children.iter().copied().filter(|x| !is_this_structure.contains(*x)) {
-            commands.entity(child).remove_parent();
+            commands.entity(child).remove_parent_in_place();
         }
     }
 }
diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index 38e5e5f32..51706a97a 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -11,7 +11,7 @@ use bevy::{
     hierarchy::{BuildChildren, Parent},
     log::info,
     math::Vec3,
-    prelude::{Res, With},
+    prelude::{BuildChildrenTransformExt, Res, With},
     state::condition::in_state,
 };
 use bevy_renet2::renet2::RenetServer;
@@ -79,7 +79,7 @@ fn grav_well_handle_block_event(
                     g_constant: Vec3::new(0.0, -9.8, 0.0),
                     structure_entity: s_block.structure(),
                 })
-                .set_parent(s_block.structure());
+                .set_parent_in_place(s_block.structure());
         }
     }
 
diff --git a/cosmos_server/src/netty/server_listener.rs b/cosmos_server/src/netty/server_listener.rs
index eae094ab2..40f3580f2 100644
--- a/cosmos_server/src/netty/server_listener.rs
+++ b/cosmos_server/src/netty/server_listener.rs
@@ -284,7 +284,7 @@ fn server_listen_messages(
                     if let Some(player_entity) = lobby.player_from_id(client_id) {
                         if let Some(mut e) = commands.get_entity(player_entity) {
                             // This should be verified in the future to make sure the parent of the player is actually a ship
-                            e.remove_parent();
+                            e.remove_parent_in_place();
                             // if let Ok((player_trans, mut player_loc)) =
                             //     change_player_query.get_mut(player_entity).map(|(x, y, _, _)| (x, y))
                             // {

From b837c2cfff8002ac24125840f6e937600c7dd2c7 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Fri, 3 Jan 2025 22:33:42 -0500
Subject: [PATCH 12/31] Parent child stuff works on client even with changing
 world position

---
 cosmos_client/src/netty/gameplay/receiver.rs  |  3 +-
 .../ship/pilot_change_event_listener.rs       |  9 +--
 cosmos_core/src/physics/location/mod.rs       |  2 +-
 cosmos_core/src/physics/location/systems.rs   | 59 +++++++------------
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 5e0f01d3a..1db14beb7 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -37,7 +37,7 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{CosmosBundleSet, Location, LocationPhysicsSet, SetPosition, SYSTEM_SECTORS},
+        location::{systems::Anchor, CosmosBundleSet, Location, LocationPhysicsSet, SetPosition, SYSTEM_SECTORS},
         player_world::PlayerWorld,
     },
     registry::Registry,
@@ -458,6 +458,7 @@ pub(crate) fn client_sync_players(
                     entity_cmds
                         .insert((
                             LocalPlayer,
+                            Anchor,
                             HeldItemSlot::new(0).unwrap(),
                             RenderDistance::default(),
                             CameraPlayerOffset(camera_offset),
diff --git a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
index 634df7231..667b5c114 100644
--- a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
+++ b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
@@ -55,6 +55,7 @@ fn event_listener(
                 PilotStartingDelta(delta, delta_rot),
                 RigidBody::Fixed,
                 Sensor,
+                Transform::from_xyz(0.5, -0.25, 0.5),
             ));
         } else if let Some(mut ecmds) = commands.get_entity(ev.structure_entity) {
             ecmds.remove::<Pilot>();
@@ -63,10 +64,10 @@ fn event_listener(
 }
 
 fn add_pilot(mut query: Query<&mut Transform, (Added<Pilot>, With<Player>)>) {
-    for mut trans in query.iter_mut() {
-        trans.translation = Vec3::new(0.5, -0.25, 0.5);
-        trans.rotation = Quat::IDENTITY;
-    }
+    // for mut trans in query.iter_mut() {
+    // trans.translation = Vec3::new(0.5, -0.25, 0.5);
+    // trans.rotation = Quat::IDENTITY;
+    // }
 }
 
 #[derive(Debug, Event)]
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 139c965b1..e08683b46 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -27,7 +27,7 @@ use bevy_rapier3d::na::Vector3;
 use bigdecimal::{BigDecimal, FromPrimitive};
 use serde::{Deserialize, Serialize};
 
-mod systems;
+pub mod systems;
 
 /// This represents the diameter of a sector. So at a local
 /// of 0, 0, 0 you can travel `SECTOR_DIMENSIONS / 2.0` blocks in any direction and
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 3c88bbe2c..36b26c853 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -35,7 +35,7 @@ use crate::{
 use super::{CosmosBundleSet, Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
 
 #[derive(Component)]
-struct Anchor;
+pub struct Anchor;
 
 fn calc_global_trans(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Option<Transform> {
     let Ok((trans, parent)) = q_trans.get(entity) else {
@@ -152,38 +152,12 @@ fn apply_set_position(
 //     }
 // }
 
-fn do_the_kids(
-    parent_g_trans: Vec3,
-    parent_g_rot: Quat,
-    mut q_trans: Query<
-        (
-            Entity,
-            &mut Transform,
-            &Location,
-            &mut LastTransformTranslation,
-            &WorldWithin,
-            Option<&Children>,
-        ),
-        (Without<PlayerWorld>, With<Parent>),
-    >,
-) {
-}
-
 fn ensure_worlds_have_anchors(
-    mut trans_query_no_parent: Query<
-        (
-            Entity,
-            &mut Transform,
-            &Location,
-            &mut LastTransformTranslation,
-            &WorldWithin,
-            // Option<&Children>,
-        ),
-        (Without<PlayerWorld>, Without<Parent>),
-    >,
-    trans_query_with_parent: Query<(Entity, &mut Transform, &mut Location), (Without<PlayerWorld>, With<Parent>)>,
+    q_loc_no_parent: Query<&Location, (Without<PlayerWorld>, Without<Parent>)>,
+    mut q_everything: Query<(&mut LastTransformTranslation, &mut Transform, &WorldWithin, Option<&Parent>), With<Location>>,
+    trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
     players_query: Query<(&WorldWithin, Entity), With<Anchor>>,
-    everything_query: Query<(&WorldWithin, Entity)>,
+    #[cfg(feature = "server")] everything_query: Query<(&WorldWithin, Entity)>,
     parent_query: Query<&Parent>,
     entity_query: Query<Entity>,
     mut world_query: Query<(Entity, &mut PlayerWorld, &mut Location)>,
@@ -195,25 +169,34 @@ fn ensure_worlds_have_anchors(
         if let Ok(mut player_entity) = entity_query.get(world.player) {
             while let Ok(parent) = parent_query.get(player_entity) {
                 let parent_entity = parent.get();
-                if trans_query_no_parent.contains(parent_entity) {
+                if q_loc_no_parent.contains(parent_entity) {
                     player_entity = parent.get();
                 } else {
                     break;
                 }
             }
 
-            let Ok(location) = trans_query_no_parent.get(player_entity).map(|(_, _, loc, _, _)| loc).or_else(|_| {
-                match trans_query_with_parent.get(player_entity) {
-                    Ok((_, _, loc)) => Ok(loc),
+            let Ok(location) = q_loc_no_parent
+                .get(player_entity)
+                .or_else(|_| match trans_query_with_parent.get(player_entity) {
+                    Ok(loc) => Ok(loc),
                     Err(x) => Err(x),
-                }
-            }) else {
+                })
+            else {
                 // The player was just added & doesn't have a transform yet - only a location.
                 continue;
             };
 
+            let delta = (*location - *world_location).absolute_coords_f32();
             *world_location = *location;
 
+            for (mut ltt, mut t, _, parent) in q_everything.iter_mut().filter(|(_, _, ww, _)| ww.0 == world_entity) {
+                ltt.0 -= delta;
+                if parent.is_none() {
+                    t.translation -= delta;
+                }
+            }
+
             // // Update transforms of objects within this world.
             // for (_, mut transform, location, mut last_transform_loc, world_within) in trans_query_no_parent.iter_mut() {
             //     if world_within.0 == world_entity {
@@ -806,7 +789,7 @@ pub(super) fn register(app: &mut App) {
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
             asdf,
             apply_set_position,
-            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(20))),
+            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(1))),
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,

From 518c53d86b325c062f79b4e3fb3718e922912d1a Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 4 Jan 2025 14:19:14 -0500
Subject: [PATCH 13/31] Fixed player never getting transform

---
 cosmos_client/src/netty/gameplay/receiver.rs  | 40 ++++++-----
 .../src/structure/ship/create_ship.rs         |  2 +
 cosmos_core/src/physics/location/systems.rs   | 71 ++-----------------
 .../src/entities/player/persistence.rs        |  4 +-
 cosmos_server/src/netty/server_listener.rs    |  7 +-
 5 files changed, 39 insertions(+), 85 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 1db14beb7..47b7d574f 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -998,24 +998,26 @@ pub(super) fn register(app: &mut App) {
             )
                 .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
                 .chain(),
+        )
+        .add_systems(
+            Update,
+            //     (
+            //         // Also run first above
+            //         fix_location,
+            //         (
+            lerp_towards
+                //             player_changed_parent,
+                //             sync_transforms_and_locations,
+                //             handle_child_syncing,
+                //             add_previous_location,
+                //         )
+                //             .after(CosmosBundleSet::HandleCosmosBundles)
+                //             .chain(),
+                //     )
+                //         .in_set(LocationPhysicsSet::DoPhysics)
+                //         .chain()
+                .before(LocationPhysicsSet::DoPhysics)
+                .in_set(NetworkingSystemsSet::Between)
+                .run_if(in_state(GameState::Playing)),
         );
-    // .add_systems(
-    //     Update,
-    //     (
-    //         // Also run first above
-    //         fix_location,
-    //         (
-    //             lerp_towards,
-    //             player_changed_parent,
-    //             sync_transforms_and_locations,
-    //             handle_child_syncing,
-    //             add_previous_location,
-    //         )
-    //             .after(CosmosBundleSet::HandleCosmosBundles)
-    //             .chain(),
-    //     )
-    //         .in_set(LocationPhysicsSet::DoPhysics)
-    //         .chain()
-    //         .run_if(in_state(GameState::Playing)),
-    // );
 }
diff --git a/cosmos_client/src/structure/ship/create_ship.rs b/cosmos_client/src/structure/ship/create_ship.rs
index 52adb4016..9e24c47fc 100644
--- a/cosmos_client/src/structure/ship/create_ship.rs
+++ b/cosmos_client/src/structure/ship/create_ship.rs
@@ -48,6 +48,7 @@ fn listener(
         };
 
         if inventory.can_take_item(ship_core, 1) {
+            info!("Sending create ship event!");
             event_writer.send(CreateShipEvent { name: "Cool name".into() });
         } else {
             info!("Does not have ship core");
@@ -57,6 +58,7 @@ fn listener(
 
 fn event_handler(mut event_reader: EventReader<CreateShipEvent>, mut client: ResMut<RenetClient>) {
     for ev in event_reader.read() {
+        info!("Got create ship event!");
         client.send_message(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::CreateShip { name: ev.name.clone() }),
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 36b26c853..733cc3fd8 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -8,31 +8,25 @@
 //!
 //!
 
-use std::time::Duration;
-
 use bevy::{
     prelude::*,
-    time::common_conditions::on_timer,
     transform::systems::{propagate_transforms, sync_simple_transforms},
     utils::HashSet,
 };
 use bevy_rapier3d::{
-    plugin::{DefaultRapierContext, RapierConfiguration, RapierContextEntityLink},
-    prelude::{Collider, RapierContextSimulation, RigidBody, Velocity},
+    plugin::{RapierConfiguration, RapierContextEntityLink},
+    prelude::RapierContextSimulation,
 };
 
 use crate::{
-    entities::player::Player,
-    netty::{client::LocalPlayer, system_sets::NetworkingSystemsSet},
+    netty::system_sets::NetworkingSystemsSet,
     physics::{
         location::LastTransformTranslation,
         player_world::{PlayerWorld, WorldWithin},
     },
-    prelude::Station,
-    state::GameState,
 };
 
-use super::{CosmosBundleSet, Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
+use super::{Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
 
 #[derive(Component)]
 pub struct Anchor;
@@ -164,7 +158,6 @@ fn ensure_worlds_have_anchors(
 
     mut commands: Commands,
 ) {
-    info!("\n\n\n\n\n\n\nRAN THE PROBLEM\n\n\n\n\n\n\n\n");
     for (world_entity, mut world, mut world_location) in world_query.iter_mut() {
         if let Ok(mut player_entity) = entity_query.get(world.player) {
             while let Ok(parent) = parent_query.get(player_entity) {
@@ -537,7 +530,6 @@ type TransformLocationQuery<'w, 's> = Query<
     (
         &'static Name,
         &'static WorldWithin,
-        &'static GlobalTransform,
         &'static mut Location,
         Option<&'static mut Transform>,
         Option<&'static PreviousLocation>,
@@ -549,10 +541,9 @@ type TransformLocationQuery<'w, 's> = Query<
 
 /// This system syncs the locations up with their changes in transforms.
 fn sync_transforms_and_locations(
-    q_entities: Query<(Entity, &WorldWithin), (Without<PlayerWorld>, With<Transform>, With<Location>, Without<Parent>)>,
+    q_entities: Query<(Entity, &WorldWithin), (Without<PlayerWorld>, With<Location>, Without<Parent>)>,
     q_loc: Query<&Location, With<PlayerWorld>>,
     mut q_data: TransformLocationQuery,
-    q_pw: Query<&Location, With<PlayerWorld>>,
     q_children: Query<&Children>,
     mut commands: Commands,
 ) {
@@ -571,7 +562,6 @@ fn sync_transforms_and_locations(
             &mut commands,
             &mut q_data,
             &q_children,
-            &q_pw,
         );
     }
 }
@@ -589,27 +579,18 @@ fn recursively_sync_transforms_and_locations(
     commands: &mut Commands,
     q_data: &mut TransformLocationQuery,
     q_children: &Query<&Children>,
-    q_pw: &Query<&Location, With<PlayerWorld>>,
 ) {
-    let Ok((name, world_within, _, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
-        return;
-    };
-
-    let Ok(world_loc) = q_pw.get(world_within.0) else {
+    let Ok((name, world_within, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
         return;
     };
 
-    info!("DOING {}", name);
     let (local_translation, local_rotation, delta_g_trans) = if let Some(mut my_transform) = my_transform {
         let mut delta_g_trans = Vec3::ZERO;
 
         if set_trans.is_some() {
-            info!("SETTING TRANS! - Was {}", my_transform.translation);
             my_transform.translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
-            info!("SETTING TRANS! - NOW {}", my_transform.translation);
         } else {
             let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
-            info!("PARENT G TRANS: {parent_g_trans}");
 
             let parent_delta_loc = parent_loc - parent_prev_loc;
             delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO) - parent_delta_g_trans;
@@ -617,13 +598,6 @@ fn recursively_sync_transforms_and_locations(
             *my_loc = *my_loc + delta_g_trans + parent_delta_loc;
             let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
             let my_local_location_based_trans = parent_g_rot.inverse() * my_local_rotated_trans;
-            // info!("Delta loc: {delta_loc:?}");
-            info!(
-                "Delta G trans: {delta_g_trans:?} | PG: {parent_g_trans} OT: {} \
-                | (GT{g_trans} - LT{last_trans_trans:?}) \
-                New Trans: {my_local_rotated_trans}",
-                my_transform.translation
-            );
 
             my_transform.translation = my_local_location_based_trans;
 
@@ -632,18 +606,14 @@ fn recursively_sync_transforms_and_locations(
 
             // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
             // *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
-            // info!("POST: {my_loc:?} | TRANS: {}", my_transform.translation);
         }
 
         (my_transform.translation, my_transform.rotation, delta_g_trans)
     } else {
-        info!("SETTING TRANS the odd way!!!!!!");
         let translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
 
         commands.entity(ent).insert(Transform::from_translation(translation));
 
-        info!("SETTING TRANS the odd way!!!!!! - is {}", translation);
-
         (translation, Quat::IDENTITY, Vec3::ZERO)
     };
 
@@ -671,7 +641,6 @@ fn recursively_sync_transforms_and_locations(
                 commands,
                 q_data,
                 q_children,
-                q_pw,
             );
         }
     }
@@ -733,31 +702,6 @@ fn recursively_sync_transforms_and_locations(
 //     }
 // }
 
-fn asdf(q_p: Query<(), (Added<Parent>, With<Anchor>)>) {
-    if !q_p.is_empty() {
-        info!("ADDED PARENT TO PLAYER!!!!!!!!!!!!!!!");
-    }
-}
-
-#[derive(Component)]
-struct LeCube;
-
-fn spawn_le_cube(mut meshes: ResMut<Assets<Mesh>>, q_palyer: Query<&Location, With<LocalPlayer>>, mut commands: Commands) {
-    let loc = q_palyer.single();
-    commands.spawn((
-        *loc,
-        SetPosition::Location,
-        Mesh3d(meshes.add(Cuboid::new(0.5, 0.5, 0.5))),
-        Velocity {
-            linvel: Vec3::new(1.0, 0.0, 0.0),
-            ..Default::default()
-        },
-        LeCube,
-        RigidBody::Dynamic,
-        Collider::cuboid(0.5, 0.5, 0.5),
-    ));
-}
-
 // fn swap_le_parent(
 //     mut commands: Commands,
 //     q_station: Query<Entity, With<Station>>,
@@ -787,9 +731,8 @@ pub(super) fn register(app: &mut App) {
         Update,
         (
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
-            asdf,
             apply_set_position,
-            ensure_worlds_have_anchors.run_if(on_timer(Duration::from_secs(1))),
+            ensure_worlds_have_anchors, //.run_if(on_timer(Duration::from_secs(1))),
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
diff --git a/cosmos_server/src/entities/player/persistence.rs b/cosmos_server/src/entities/player/persistence.rs
index 0e4f20e2d..78f30f8d7 100644
--- a/cosmos_server/src/entities/player/persistence.rs
+++ b/cosmos_server/src/entities/player/persistence.rs
@@ -23,7 +23,7 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{Location, Sector},
+        location::{systems::Anchor, Location, Sector, SetPosition},
         player_world::WorldWithin,
     },
     registry::{identifiable::Identifiable, Registry},
@@ -267,6 +267,8 @@ fn finish_loading_player(
                 LoadingDistance::new(2, 9999),
                 ActiveEvents::COLLISION_EVENTS,
                 Name::new(format!("Player ({})", load_player.name())),
+                Anchor,
+                SetPosition::Location,
             ))
             // If we don't remove this, it won't automatically
             // generate a new one when we save the player next
diff --git a/cosmos_server/src/netty/server_listener.rs b/cosmos_server/src/netty/server_listener.rs
index 40f3580f2..b1052738c 100644
--- a/cosmos_server/src/netty/server_listener.rs
+++ b/cosmos_server/src/netty/server_listener.rs
@@ -197,8 +197,9 @@ fn server_listen_messages(
                         alternate,
                     });
                 }
-                ClientReliableMessages::CreateShip { name: _name } => {
+                ClientReliableMessages::CreateShip { name } => {
                     let Some(client) = lobby.player_from_id(client_id) else {
+                        warn!("Invalid client id {client_id}");
                         continue;
                     };
 
@@ -221,10 +222,14 @@ fn server_listen_messages(
                     if let Ok((transform, location, looking, _)) = change_player_query.get(client) {
                         let ship_location = *location + transform.rotation.mul_vec3(looking.rotation.mul_vec3(Vec3::new(0.0, 0.0, -4.0)));
 
+                        info!("Creating ship {name}");
+
                         create_ship_event_writer.send(CreateShipEvent {
                             ship_location,
                             rotation: looking.rotation,
                         });
+                    } else {
+                        warn!("Invalid player entity - {client:?}");
                     }
                 }
                 ClientReliableMessages::CreateStation { name: _name } => {

From 5a5ef050d513975a00aaa60c354a847a9f5d70ca Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 4 Jan 2025 15:46:14 -0500
Subject: [PATCH 14/31] Debugging

---
 cosmos_core/src/physics/location/systems.rs | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 733cc3fd8..0bc117caa 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -8,8 +8,11 @@
 //!
 //!
 
+use std::time::Duration;
+
 use bevy::{
     prelude::*,
+    time::common_conditions::on_real_timer,
     transform::systems::{propagate_transforms, sync_simple_transforms},
     utils::HashSet,
 };
@@ -593,12 +596,17 @@ fn recursively_sync_transforms_and_locations(
             let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
 
             let parent_delta_loc = parent_loc - parent_prev_loc;
-            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO) - parent_delta_g_trans;
+            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
+
+            let delta_local_trans = delta_g_trans - parent_delta_g_trans;
 
-            *my_loc = *my_loc + delta_g_trans + parent_delta_loc;
+            *my_loc = *my_loc + delta_local_trans + parent_delta_loc;
             let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
             let my_local_location_based_trans = parent_g_rot.inverse() * my_local_rotated_trans;
 
+            info!("{}: {} -> {}", name, my_transform.translation, my_local_location_based_trans);
+            info!("Delta G trans: {delta_g_trans}; Parent delta g trans: {parent_delta_g_trans}; Local {delta_local_trans}");
+
             my_transform.translation = my_local_location_based_trans;
 
             // Applies that change to the transform
@@ -732,7 +740,7 @@ pub(super) fn register(app: &mut App) {
         (
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
             apply_set_position,
-            ensure_worlds_have_anchors, //.run_if(on_timer(Duration::from_secs(1))),
+            ensure_worlds_have_anchors.run_if(on_real_timer(Duration::from_secs(20))),
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,

From ea986aad7743fb5bf8faac5fb350ffc085ea0663 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 4 Jan 2025 22:19:35 -0500
Subject: [PATCH 15/31] Locations are working again

It's a little jank, but it seems to work
---
 cosmos_core/src/physics/location/systems.rs | 29 ++++++++++++++-------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 0bc117caa..88809c4b6 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -572,6 +572,13 @@ fn sync_transforms_and_locations(
 #[derive(Component)]
 struct PreviousLocation(Location);
 
+// 1. Bubble down location changes
+//   - Update only your transform
+//   - Carry down last transform translation effects
+// 2. Bubble down transform changes
+//   - Update only your transform
+//   - Carry down last transform translation effects
+
 fn recursively_sync_transforms_and_locations(
     parent_loc: Location,
     parent_prev_loc: Location,
@@ -587,11 +594,13 @@ fn recursively_sync_transforms_and_locations(
         return;
     };
 
+    let parent_g_rot = parent_g_rot.normalize();
+
     let (local_translation, local_rotation, delta_g_trans) = if let Some(mut my_transform) = my_transform {
         let mut delta_g_trans = Vec3::ZERO;
 
         if set_trans.is_some() {
-            my_transform.translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
+            my_transform.translation = parent_g_rot.inverse().normalize() * ((*my_loc - parent_loc).absolute_coords_f32());
         } else {
             let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
 
@@ -600,20 +609,21 @@ fn recursively_sync_transforms_and_locations(
 
             let delta_local_trans = delta_g_trans - parent_delta_g_trans;
 
+            // WARNING: THIS COULD BLOW UP if the delta loc is huge in f32 coords. Idk how to do this better
+            // though.
+            let delta_loc = my_prev_loc.map(|x| (*my_loc - x.0).absolute_coords_f32()).unwrap_or(Vec3::ZERO);
             *my_loc = *my_loc + delta_local_trans + parent_delta_loc;
             let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
-            let my_local_location_based_trans = parent_g_rot.inverse() * my_local_rotated_trans;
+            let my_local_location_based_trans = parent_g_rot.inverse().normalize() * my_local_rotated_trans;
 
+            info!("My last g trans: {:?}", last_trans_trans);
             info!("{}: {} -> {}", name, my_transform.translation, my_local_location_based_trans);
             info!("Delta G trans: {delta_g_trans}; Parent delta g trans: {parent_delta_g_trans}; Local {delta_local_trans}");
 
             my_transform.translation = my_local_location_based_trans;
 
-            // Applies that change to the transform
-            // my_transform.translation += parent_g_rot.inverse() * delta_loc;
-
-            // Updates the location to be based on the parent's location + your absolute coordinates to your parent.
-            // *my_loc = parent_loc + parent_g_rot * (my_transform.translation + delta_g_trans);
+            // Changes in location mess up the children.
+            delta_g_trans += delta_loc;
         }
 
         (my_transform.translation, my_transform.rotation, delta_g_trans)
@@ -637,6 +647,8 @@ fn recursively_sync_transforms_and_locations(
     let my_g_rot = parent_g_rot.mul_quat(local_rotation);
     let my_prev_loc = my_prev_loc.map(|x| x.0).unwrap_or(my_loc);
 
+    info!("MY LOCAL TRANS: {}", local_translation);
+
     if let Ok(children) = q_children.get(ent) {
         for &child in children.iter() {
             recursively_sync_transforms_and_locations(
@@ -740,12 +752,11 @@ pub(super) fn register(app: &mut App) {
         (
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
             apply_set_position,
-            ensure_worlds_have_anchors.run_if(on_real_timer(Duration::from_secs(20))),
+            ensure_worlds_have_anchors,
             #[cfg(feature = "server")]
             (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
             // set_transform_based_on_location,
-            propagate_transforms, // TODO: Maybe not this? Idk
         )
             .chain()
             .in_set(LocationPhysicsSet::DoPhysics)

From d543f1da395a1f2c8b119795a2828f62e04aec61 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 4 Jan 2025 22:49:13 -0500
Subject: [PATCH 16/31] Warnings be gone

---
 cosmos_client/src/structure/ship/mod.rs       |  17 +-
 cosmos_client/src/structure/systems/sync.rs   |   1 -
 .../ship/pilot_change_event_listener.rs       |  19 +-
 cosmos_core/src/physics/location/systems.rs   | 339 ++----------------
 .../src/structure/shared/build_mode.rs        |   4 +-
 cosmos_core/src/structure/shared/mod.rs       |   2 +-
 cosmos_server/src/netty/sync/sync_bodies.rs   |   4 +-
 cosmos_server/src/physics/mod.rs              |   4 +-
 8 files changed, 49 insertions(+), 341 deletions(-)

diff --git a/cosmos_client/src/structure/ship/mod.rs b/cosmos_client/src/structure/ship/mod.rs
index 31faa554c..1dcb47409 100644
--- a/cosmos_client/src/structure/ship/mod.rs
+++ b/cosmos_client/src/structure/ship/mod.rs
@@ -3,8 +3,8 @@
 use bevy::{
     ecs::event::EventReader,
     prelude::{
-        in_state, App, BuildChildren, BuildChildrenTransformExt, Commands, Entity, IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query,
-        ResMut, SystemSet, Transform, Update, With, Without,
+        in_state, App, BuildChildrenTransformExt, Commands, Entity, IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query, ResMut,
+        SystemSet, Update, With, Without,
     },
 };
 use bevy_rapier3d::pipeline::CollisionEvent;
@@ -32,7 +32,6 @@ fn respond_to_collisions(
     parent_query: Query<&Parent>,
     is_local_player: Query<(), (With<LocalPlayer>, Without<Pilot>)>,
     is_planet: Query<(), With<Planet>>,
-    mut trans_query: Query<(&mut Transform, &mut Location)>,
     mut commands: Commands,
     mut renet_client: ResMut<RenetClient>,
 ) {
@@ -79,10 +78,6 @@ fn respond_to_collisions(
 
         // Even though these will always be seperate from the trans + loc below, the borrow checker doesn't know that
 
-        let (player_trans, mut player_loc) = trans_query
-            .get_mut(player_entity)
-            .expect("The player should have a transform + location");
-
         if !parent_query.contains(player_entity) {
             continue;
         }
@@ -90,8 +85,6 @@ fn respond_to_collisions(
         // Otherwise just remove the parent if they hit a different structure
         commands.entity(player_entity).remove_parent_in_place();
 
-        // player_loc.last_transform_loc = Some(player_trans.translation);
-
         renet_client.send_message(
             NettyChannelClient::Reliable,
             cosmos_encoder::serialize(&ClientReliableMessages::LeaveShip),
@@ -100,12 +93,12 @@ fn respond_to_collisions(
 }
 
 fn remove_parent_when_too_far(
-    mut query: Query<(Entity, &Parent, &mut Location, &Transform), (With<LocalPlayer>, Without<Structure>, Without<BuildMode>)>,
+    query: Query<(Entity, &Parent, &Location), (With<LocalPlayer>, Without<Structure>, Without<BuildMode>)>,
     q_structure: Query<(&Location, &Structure)>,
     mut commands: Commands,
     mut renet_client: ResMut<RenetClient>,
 ) {
-    if let Ok((player_entity, parent, mut player_loc, player_trans)) = query.get_single_mut() {
+    if let Ok((player_entity, parent, player_loc)) = query.get_single() {
         if let Ok((structure_loc, structure)) = q_structure.get(parent.get()) {
             if !matches!(structure, Structure::Full(_)) {
                 return;
@@ -114,8 +107,6 @@ fn remove_parent_when_too_far(
             if player_loc.distance_sqrd(structure_loc).sqrt() >= CHUNK_DIMENSIONSF * 10.0 {
                 commands.entity(player_entity).remove_parent_in_place();
 
-                // player_loc.last_transform_loc = Some(player_trans.translation);
-
                 renet_client.send_message(
                     NettyChannelClient::Reliable,
                     cosmos_encoder::serialize(&ClientReliableMessages::LeaveShip),
diff --git a/cosmos_client/src/structure/systems/sync.rs b/cosmos_client/src/structure/systems/sync.rs
index d6d812895..39cfe8176 100644
--- a/cosmos_client/src/structure/systems/sync.rs
+++ b/cosmos_client/src/structure/systems/sync.rs
@@ -9,7 +9,6 @@ use bevy::{
         schedule::{IntoSystemConfigs, IntoSystemSetConfigs},
         system::{Commands, Query, Res, ResMut, Resource},
     },
-    hierarchy::BuildChildren,
     log::{error, warn},
     prelude::{BuildChildrenTransformExt, Deref, DerefMut, SystemSet},
     state::condition::in_state,
diff --git a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
index 667b5c114..0b8242198 100644
--- a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
+++ b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
@@ -1,6 +1,6 @@
 use bevy::prelude::{
-    in_state, Added, App, BuildChildren, Commands, Component, Entity, Event, EventReader, EventWriter, IntoSystemConfigs,
-    IntoSystemSetConfigs, Quat, Query, RemovedComponents, States, SystemSet, Transform, Update, Vec3, With,
+    in_state, App, BuildChildren, Commands, Component, Entity, Event, EventReader, EventWriter, IntoSystemConfigs, IntoSystemSetConfigs,
+    Quat, Query, RemovedComponents, States, SystemSet, Transform, Update, Vec3, With,
 };
 use bevy_rapier3d::prelude::{RigidBody, Sensor};
 
@@ -63,11 +63,14 @@ fn event_listener(
     }
 }
 
-fn add_pilot(mut query: Query<&mut Transform, (Added<Pilot>, With<Player>)>) {
-    // for mut trans in query.iter_mut() {
-    // trans.translation = Vec3::new(0.5, -0.25, 0.5);
-    // trans.rotation = Quat::IDENTITY;
-    // }
+/// This is to combat floating point issues. The pilot will slowly drift from the center
+/// due to location syncing floating point errors.
+///
+/// TODO: Having to do this is mega lame, find a better solution to this problem please.
+fn keep_pilot_centered(mut q_pilot_transform: Query<&mut Transform, (With<Pilot>, With<Player>)>) {
+    for mut trans in q_pilot_transform.iter_mut() {
+        trans.translation = Vec3::new(0.5, -0.25, 0.5);
+    }
 }
 
 #[derive(Debug, Event)]
@@ -149,7 +152,7 @@ pub(super) fn register<T: States + Clone + Copy>(app: &mut App, playing_state: T
     app.add_systems(
         Update,
         (
-            add_pilot,
+            keep_pilot_centered,
             pilot_removed,
             remove_sensor,
             bouncer,
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 88809c4b6..014031c40 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -8,11 +8,8 @@
 //!
 //!
 
-use std::time::Duration;
-
 use bevy::{
     prelude::*,
-    time::common_conditions::on_real_timer,
     transform::systems::{propagate_transforms, sync_simple_transforms},
     utils::HashSet,
 };
@@ -30,8 +27,23 @@ use crate::{
 };
 
 use super::{Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
+#[cfg(doc)]
+use crate::netty::client::LocalPlayer;
 
 #[derive(Component)]
+/// Anything that has this component will be treated as an anchor for the [`PlayerWorld`]s.
+///
+/// If the [`Anchor`] entity is a child of another, its parent will be treated as the anchor.
+///
+/// ## Client
+/// This should only be put on the [`LocalPlayer`].
+///
+/// Putting this on anything else will probably cause issues, since the client can only ever have
+/// one world.
+///
+/// ## Server
+/// This can be put on any entity with a [`Location`] and a [`Transform`]. This will act as a focal
+/// point for a [`PlayerWorld`].
 pub struct Anchor;
 
 fn calc_global_trans(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Option<Transform> {
@@ -101,59 +113,11 @@ fn apply_set_position(
     }
 }
 
-// fn calculate_global_translation(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Transform {
-//     let Ok((trans, parent)) = q_trans.get(entity) else {
-//         error!("Bad heirarchy - parent missing Transform");
-//         return Vec3::ZERO;
-//     };
-//
-//     if let Some(parent) = parent {
-//         calc_global_trans(parent.get(), q_trans)
-//     }
-// }
-
-// fn set_transform_based_on_location(
-//     mut q_q: Query<
-//         (
-//             &mut Transform,
-//             &GlobalTransform,
-//             &mut Location,
-//             &WorldWithin,
-//             &mut LastTransformTranslation,
-//             Option<&Parent>,
-//         ),
-//         Without<PlayerWorld>,
-//     >,
-//     q_g_trans: Query<&GlobalTransform>,
-//     q_physics_world: Query<&Location, With<PlayerWorld>>,
-// ) {
-//     for (mut trans, g_trans, mut loc, world_within, mut last_translation, parent) in q_q.iter_mut() {
-//         let Ok(pw_loc) = q_physics_world.get(world_within.0) else {
-//             continue;
-//         };
-//
-//         let parent_g_trans = if let Some(parent) = parent {
-//             q_g_trans.get(parent.get()).map(|x| *x).unwrap_or_default()
-//         } else {
-//             Default::default()
-//         };
-//
-//         let absolute_coords_relative_to_world = (*loc - *pw_loc).absolute_coords_f32();
-//
-//         let local_coords = parent_g_trans.rotation().inverse() * (absolute_coords_relative_to_world - parent_g_trans.translation());
-//         trans.translation = local_coords;
-//
-//         let delta = g_trans.translation() - last_translation.0;
-//         *loc = *loc + delta;
-//         last_translation.0 = g_trans.translation();
-//     }
-// }
-
 fn ensure_worlds_have_anchors(
     q_loc_no_parent: Query<&Location, (Without<PlayerWorld>, Without<Parent>)>,
     mut q_everything: Query<(&mut LastTransformTranslation, &mut Transform, &WorldWithin, Option<&Parent>), With<Location>>,
     trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
-    players_query: Query<(&WorldWithin, Entity), With<Anchor>>,
+    q_anchors: Query<(&WorldWithin, Entity), With<Anchor>>,
     #[cfg(feature = "server")] everything_query: Query<(&WorldWithin, Entity)>,
     parent_query: Query<&Parent>,
     entity_query: Query<Entity>,
@@ -192,17 +156,6 @@ fn ensure_worlds_have_anchors(
                     t.translation -= delta;
                 }
             }
-
-            // // Update transforms of objects within this world.
-            // for (_, mut transform, location, mut last_transform_loc, world_within) in trans_query_no_parent.iter_mut() {
-            //     if world_within.0 == world_entity {
-            //         info!("WORLDO PRE: {:?}", transform.translation);
-            //         transform.translation = world_location.relative_coords_to(&location);
-            //         info!("WORLDO POST: {:?}", transform.translation);
-            //         // The transform.translation is the global transform since this is a top level entity
-            //         last_transform_loc.0 = transform.translation;
-            //     }
-            // }
         } else {
             #[cfg(feature = "server")]
             {
@@ -212,7 +165,7 @@ fn ensure_worlds_have_anchors(
 
                 let mut found = false;
                 // find player
-                for (world_within, entity) in players_query.iter() {
+                for (world_within, entity) in q_anchors.iter() {
                     if world_within.0 == world_entity {
                         world.player = entity;
                         found = true;
@@ -234,46 +187,6 @@ fn ensure_worlds_have_anchors(
     }
 }
 
-//
-// fn recursively_fix_locations(
-//     entity: Entity,
-//     parent_loc: Location,
-//     mut parent_rotation: Quat,
-//     q_info: &mut Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
-//     q_children: &Query<&Children>,
-//     commands: &mut Commands,
-//     world: WorldWithin,
-//     world_id: RapierContextEntityLink,
-// ) {
-//     let Ok((mut my_loc, my_trans)) = q_info.get_mut(entity) else {
-//         return;
-//     };
-//
-//     let translation = parent_rotation.inverse().mul_vec3(-my_loc.relative_coords_to(&parent_loc));
-//
-//     my_loc.last_transform_loc = Some(translation);
-//
-//     commands.entity(entity).insert((world, world_id));
-//
-//     if let Some(mut my_trans) = my_trans {
-//         my_trans.translation = translation;
-//
-//         parent_rotation *= my_trans.rotation;
-//     } else {
-//         commands.entity(entity).insert((Transform::from_translation(translation),));
-//     }
-//
-//     let Ok(children) = q_children.get(entity) else {
-//         return;
-//     };
-//
-//     let my_loc = *my_loc;
-//
-//     for &child in children {
-//         recursively_fix_locations(child, my_loc, parent_rotation, q_info, q_children, commands, world, world_id);
-//     }
-// }
-
 const WORLD_SWITCH_DISTANCE: f32 = SECTOR_DIMENSIONS / 2.0;
 const WORLD_SWITCH_DISTANCE_SQRD: f32 = WORLD_SWITCH_DISTANCE * WORLD_SWITCH_DISTANCE;
 
@@ -284,8 +197,9 @@ fn create_physics_world(commands: &mut Commands) -> RapierContextEntityLink {
     RapierContextEntityLink(rw)
 }
 
-fn move_players_between_worlds(
-    players: Query<(Entity, &Location), (With<WorldWithin>, With<Anchor>)>,
+#[cfg(feature = "server")]
+fn move_anchors_between_worlds(
+    q_anchors: Query<(Entity, &Location), (With<WorldWithin>, With<Anchor>)>,
     mut q_world_within: Query<(&mut WorldWithin, &mut RapierContextEntityLink)>,
     mut commands: Commands,
 ) {
@@ -296,10 +210,10 @@ fn move_players_between_worlds(
     while changed {
         changed = false;
 
-        for (entity, location) in players.iter() {
+        for (entity, location) in q_anchors.iter() {
             let mut needs_new_world = false;
 
-            for (other_entity, other_location) in players.iter() {
+            for (other_entity, other_location) in q_anchors.iter() {
                 if other_entity == entity || getting_new_world.contains(&other_entity) {
                     continue;
                 }
@@ -343,12 +257,13 @@ fn move_players_between_worlds(
     }
 }
 
-fn move_non_players_between_worlds(
+#[cfg(feature = "server")]
+fn move_non_anchors_between_worlds(
     mut needs_world: Query<
         (Entity, &Location, Option<&mut WorldWithin>, Option<&mut RapierContextEntityLink>),
         (Without<Anchor>, Without<Parent>),
     >,
-    players_with_worlds: Query<(&WorldWithin, &Location, &RapierContextEntityLink), With<Anchor>>,
+    anchors_with_worlds: Query<(&WorldWithin, &Location, &RapierContextEntityLink), With<Anchor>>,
     mut commands: Commands,
 ) {
     for (entity, location, maybe_within, maybe_body_world) in needs_world.iter_mut() {
@@ -356,7 +271,7 @@ fn move_non_players_between_worlds(
         let mut best_dist = None;
         let mut best_world_id = None;
 
-        for (ww, player_loc, body_world) in players_with_worlds.iter() {
+        for (ww, player_loc, body_world) in anchors_with_worlds.iter() {
             let dist = player_loc.distance_sqrd(location);
 
             if best_ww.is_none() || dist < best_dist.unwrap() {
@@ -388,6 +303,7 @@ fn move_non_players_between_worlds(
 /// Removes worlds with nothing inside of them
 ///
 /// This should be run not every frame because it can be expensive and not super necessary
+#[cfg(feature = "server")]
 fn remove_empty_worlds(
     q_rapier_entity_links: Query<&RapierContextEntityLink>,
     q_worlds: Query<(Entity, &RapierContextEntityLink), With<PlayerWorld>>,
@@ -425,114 +341,10 @@ fn remove_empty_worlds(
     }
 }
 
-/// Bevy's query mutability rules require this query to be in a separate system than fix_location
-// fn find_need_fixed(
-//     q_added_locations_no_parent: Query<Entity, (Added<Location>, Without<PlayerWorld>, Without<Parent>)>,
-//     mut fix: ResMut<FixParentLocation>,
-// ) {
-//     for e in q_added_locations_no_parent.iter() {
-//         fix.0.push(e);
-//     }
-// }
-
-/// Handles any just-added locations that need to sync up to their transforms
-// fn fix_location(
-//     mut q_location_info: Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
-//     q_children: Query<&Children>,
-//     q_player_worlds: Query<(&Location, &WorldWithin, &RapierContextEntityLink), With<PlayerWorld>>,
-//     mut commands: Commands,
-//     q_player_world_loc: Query<&Location, With<PlayerWorld>>,
-//     mut fix: ResMut<FixParentLocation>,
-// ) {
-//     for entity in std::mem::take(&mut fix.0) {
-//         // This makes the borrow checker happy
-//         let (location, _) = q_location_info.get(entity).expect("Guarenteed in query conditions");
-//
-//         let mut best_distance = None;
-//         let mut best_world = None;
-//         let mut best_world_id = None;
-//
-//         for (loc, ww, body_world) in q_player_worlds.iter() {
-//             let distance = location.distance_sqrd(loc);
-//
-//             if best_distance.is_none() || distance < best_distance.unwrap() {
-//                 best_distance = Some(distance);
-//                 best_world = Some(*ww);
-//                 best_world_id = Some(*body_world);
-//             }
-//         }
-//
-//         match (best_world, best_world_id) {
-//             (Some(world), Some(world_id)) => {
-//                 let Ok(loc) = q_player_world_loc.get(world.0) else {
-//                     warn!("A player world was missing a location");
-//                     continue;
-//                 };
-//
-//                 recursively_fix_locations(
-//                     entity,
-//                     *loc,
-//                     Quat::IDENTITY,
-//                     &mut q_location_info,
-//                     &q_children,
-//                     &mut commands,
-//                     world,
-//                     world_id,
-//                 );
-//             }
-//             _ => {
-//                 warn!("Something was added with a location before a player world was created.");
-//                 commands.entity(entity).log_components();
-//             }
-//         }
-//     }
-// }
-//
-// fn recursively_fix_locations(
-//     entity: Entity,
-//     parent_loc: Location,
-//     mut parent_rotation: Quat,
-//     q_info: &mut Query<(&mut Location, Option<&mut Transform>), Without<PlayerWorld>>,
-//     q_children: &Query<&Children>,
-//     commands: &mut Commands,
-//     world: WorldWithin,
-//     world_id: RapierContextEntityLink,
-// ) {
-//     let Ok((mut my_loc, my_trans)) = q_info.get_mut(entity) else {
-//         return;
-//     };
-//
-//     let translation = parent_rotation.inverse().mul_vec3(-my_loc.relative_coords_to(&parent_loc));
-//
-//     my_loc.last_transform_loc = Some(translation);
-//
-//     commands.entity(entity).insert((world, world_id));
-//
-//     if let Some(mut my_trans) = my_trans {
-//         my_trans.translation = translation;
-//
-//         parent_rotation *= my_trans.rotation;
-//     } else {
-//         commands.entity(entity).insert((Transform::from_translation(translation),));
-//     }
-//
-//     let Ok(children) = q_children.get(entity) else {
-//         return;
-//     };
-//
-//     let my_loc = *my_loc;
-//
-//     for &child in children {
-//         recursively_fix_locations(child, my_loc, parent_rotation, q_info, q_children, commands, world, world_id);
-//     }
-// }
-
 type TransformLocationQuery<'w, 's> = Query<
     'w,
     's,
     (
-        &'static Name,
-        &'static WorldWithin,
         &'static mut Location,
         Option<&'static mut Transform>,
         Option<&'static PreviousLocation>,
@@ -572,13 +384,6 @@ fn sync_transforms_and_locations(
 #[derive(Component)]
 struct PreviousLocation(Location);
 
-// 1. Bubble down location changes
-//   - Update only your transform
-//   - Carry down last transform translation effects
-// 2. Bubble down transform changes
-//   - Update only your transform
-//   - Carry down last transform translation effects
-
 fn recursively_sync_transforms_and_locations(
     parent_loc: Location,
     parent_prev_loc: Location,
@@ -590,7 +395,7 @@ fn recursively_sync_transforms_and_locations(
     q_data: &mut TransformLocationQuery,
     q_children: &Query<&Children>,
 ) {
-    let Ok((name, world_within, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+    let Ok((mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
         return;
     };
 
@@ -616,10 +421,6 @@ fn recursively_sync_transforms_and_locations(
             let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
             let my_local_location_based_trans = parent_g_rot.inverse().normalize() * my_local_rotated_trans;
 
-            info!("My last g trans: {:?}", last_trans_trans);
-            info!("{}: {} -> {}", name, my_transform.translation, my_local_location_based_trans);
-            info!("Delta G trans: {delta_g_trans}; Parent delta g trans: {parent_delta_g_trans}; Local {delta_local_trans}");
-
             my_transform.translation = my_local_location_based_trans;
 
             // Changes in location mess up the children.
@@ -647,8 +448,6 @@ fn recursively_sync_transforms_and_locations(
     let my_g_rot = parent_g_rot.mul_quat(local_rotation);
     let my_prev_loc = my_prev_loc.map(|x| x.0).unwrap_or(my_loc);
 
-    info!("MY LOCAL TRANS: {}", local_translation);
-
     if let Ok(children) = q_children.get(ent) {
         for &child in children.iter() {
             recursively_sync_transforms_and_locations(
@@ -666,87 +465,7 @@ fn recursively_sync_transforms_and_locations(
     }
 }
 
-/// Handles children and their locations.
-// pub fn handle_child_syncing(
-//     q_top_level: Query<(&Location, &Transform, &Children), Without<Parent>>,
-//     mut q_data: Query<(&mut Location, &mut Transform, &PreviousLocation), With<Parent>>,
-//     q_children: Query<&Children>,
-// ) {
-//     for (loc, trans, children) in q_top_level.iter() {
-//         for &child in children.iter() {
-//             recursively_sync_child(*loc, trans.translation, trans.rotation, child, &mut q_data, &q_children);
-//         }
-//     }
-// }
-
-/// Fixes oddities that happen when changing parent of player
-// fn player_changed_parent(
-//     q_parent: Query<(&GlobalTransform, &Location)>,
-//     mut q_local_player: Query<(Entity, &mut Transform, &Location, &Parent, &PlayerWorld), (Changed<Parent>, With<Anchor>)>,
-// ) {
-//     for (entity, mut player_trans, player_loc, parent, player_world) in q_local_player.iter_mut() {
-//         if entity != player_world.player {
-//             // This problem only effects players that control their world
-//             continue;
-//         }
-//
-//         let Ok((parent_trans, parent_loc)) = q_parent.get(parent.get()) else {
-//             continue;
-//         };
-//
-//         // Because the player's translation is always 0, 0, 0 we need to adjust it so the player is put into the
-//         // right spot in its parent.
-//         player_trans.translation = Quat::from_affine3(&parent_trans.affine())
-//             .inverse()
-//             .mul_vec3((*player_loc - *parent_loc).absolute_coords_f32());
-//     }
-// }
-//
-// fn create_default_world_within(
-//     mut commands: Commands,
-//     q_rapier_context: Query<Entity, With<DefaultRapierContext>>) {
-//     let context_ent = q_rapier_context.single();
-//     commands.spawn(PlayerWorld)
-// }
-//
-// fn client_update_worlds(
-//     q_needs_world: Query<Entity, (With<Location>, Without<WorldWithin>)>,
-//     pw: Query<Entity, With<PlayerWorld>>,
-//     mut commands: Commands,
-// ) {
-//     let Ok(pw) = pw.get_single() else {
-//         return;
-//     };
-//     for entity in q_needs_world.iter() {
-//         commands.entity(entity).insert(WorldWithin(pw));
-//     }
-// }
-
-// fn swap_le_parent(
-//     mut commands: Commands,
-//     q_station: Query<Entity, With<Station>>,
-//     q_cube: Query<(Entity, Option<&Parent>), With<LeCube>) {
-//     let station = q_station.single();
-//     let (cube_e, c_parent)
-//     = q_cube.single();
-//
-//     if c_parent.is_none() {
-//         commands.entity(cube_e).set_parent(station);
-//     }else {
-//         commands.entity(cube_e).remove_parent();
-//     }
-// }
-
 pub(super) fn register(app: &mut App) {
-    /*
-    *Between->>apply_set_position:
-    apply_set_position->>handle_worlds
-    handle_worlds->>sync_transforms_and_locations:
-    sync_transforms_and_locations->>handle_child_syncing:
-    handle_child_syncing->>add_previous_location:
-    add_previous_location->>Between:
-
-    * */
     app.add_systems(
         Update,
         (
@@ -754,7 +473,7 @@ pub(super) fn register(app: &mut App) {
             apply_set_position,
             ensure_worlds_have_anchors,
             #[cfg(feature = "server")]
-            (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
+            (move_anchors_between_worlds, move_non_anchors_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
             // set_transform_based_on_location,
         )
diff --git a/cosmos_core/src/structure/shared/build_mode.rs b/cosmos_core/src/structure/shared/build_mode.rs
index da595efc4..1b037fb29 100644
--- a/cosmos_core/src/structure/shared/build_mode.rs
+++ b/cosmos_core/src/structure/shared/build_mode.rs
@@ -4,8 +4,8 @@
 
 use bevy::{
     prelude::{
-        App, BuildChildren, BuildChildrenTransformExt, Changed, Commands, Component, Entity, Event, EventReader, EventWriter,
-        IntoSystemConfigs, IntoSystemSetConfigs, Parent, Query, SystemSet, Update, With, Without,
+        App, BuildChildrenTransformExt, Changed, Commands, Component, Entity, Event, EventReader, EventWriter, IntoSystemConfigs,
+        IntoSystemSetConfigs, Parent, Query, SystemSet, Update, With, Without,
     },
     reflect::Reflect,
 };
diff --git a/cosmos_core/src/structure/shared/mod.rs b/cosmos_core/src/structure/shared/mod.rs
index 9eaa8fdcf..00441991c 100644
--- a/cosmos_core/src/structure/shared/mod.rs
+++ b/cosmos_core/src/structure/shared/mod.rs
@@ -1,7 +1,7 @@
 //! Shared systems between different structure types
 
 use bevy::{
-    prelude::{App, BuildChildren, BuildChildrenTransformExt, Children, Commands, Component, Or, PostUpdate, Query, With},
+    prelude::{App, BuildChildrenTransformExt, Children, Commands, Component, Or, PostUpdate, Query, With},
     reflect::Reflect,
 };
 use serde::{Deserialize, Serialize};
diff --git a/cosmos_server/src/netty/sync/sync_bodies.rs b/cosmos_server/src/netty/sync/sync_bodies.rs
index 012b1ee75..5a47d71c1 100644
--- a/cosmos_server/src/netty/sync/sync_bodies.rs
+++ b/cosmos_server/src/netty/sync/sync_bodies.rs
@@ -1,7 +1,7 @@
 //! Handles the syncing of entity's rigidbodies + velocities
 
 use bevy::prelude::*;
-use bevy_rapier3d::{plugin::PhysicsSet, prelude::Velocity};
+use bevy_rapier3d::prelude::Velocity;
 use bevy_renet2::renet2::RenetServer;
 use cosmos_core::{
     block::data::BlockData,
@@ -185,8 +185,6 @@ fn notify_despawned_entities(
 pub(super) fn register(app: &mut App) {
     app.add_systems(
         Update,
-        // This really needs to run immediately after `add_previous_location` to make sure nothing causes any desync
-        // in location + transform, but for now it's fine.
         (
             notify_client_of_successful_entity_request,
             server_sync_bodies.after(LocationPhysicsSet::DoPhysics),
diff --git a/cosmos_server/src/physics/mod.rs b/cosmos_server/src/physics/mod.rs
index b6a623809..77ee88f15 100644
--- a/cosmos_server/src/physics/mod.rs
+++ b/cosmos_server/src/physics/mod.rs
@@ -9,12 +9,10 @@ use bevy_rapier3d::{
 };
 use cosmos_core::{
     entities::player::Player,
-    netty::system_sets::NetworkingSystemsSet,
     physics::{
-        location::{CosmosBundleSet, Location, LocationPhysicsSet, SECTOR_DIMENSIONS},
+        location::{Location, LocationPhysicsSet, SECTOR_DIMENSIONS},
         player_world::{PlayerWorld, WorldWithin},
     },
-    state::GameState,
 };
 
 mod collider_disabling;

From a271d0ebc8846417c3c4daa04c478a1ba7c898d3 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 5 Jan 2025 14:06:32 -0500
Subject: [PATCH 17/31] Docs

---
 cosmos_client/src/netty/gameplay/receiver.rs | 47 +-------------------
 cosmos_core/src/physics/location/mod.rs      |  1 +
 cosmos_core/src/physics/location/systems.rs  |  6 ++-
 cosmos_server/src/physics/mod.rs             | 33 ++++++--------
 docs/src/physics/location.md                 | 42 ++++++++---------
 5 files changed, 43 insertions(+), 86 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 47b7d574f..b8d38827e 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -37,7 +37,7 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{systems::Anchor, CosmosBundleSet, Location, LocationPhysicsSet, SetPosition, SYSTEM_SECTORS},
+        location::{systems::Anchor, CosmosBundleSet, Location, LocationPhysicsSet, SYSTEM_SECTORS},
         player_world::PlayerWorld,
     },
     registry::Registry,
@@ -209,10 +209,9 @@ pub(crate) fn client_sync_players(
         EventWriter<SetTerrainGenData>,
         EventWriter<BlockDataChangedEvent>,
     ),
-    (q_default_rapier_context, query_player, parent_query, q_structure_systems, mut q_inventory, mut q_structure): (
+    (q_default_rapier_context, query_player, q_structure_systems, mut q_inventory, mut q_structure): (
         Query<Entity, With<DefaultRapierContext>>,
         Query<&Player>,
-        Query<&Parent>,
         Query<&StructureSystems>,
         Query<&mut Inventory>,
         Query<&mut Structure>,
@@ -732,25 +731,7 @@ pub(crate) fn client_sync_players(
             ServerReliableMessages::PlayerLeaveShip { player_entity } => {
                 if let Some(player_entity) = network_mapping.client_from_server(&player_entity) {
                     if let Some(mut ecmds) = commands.get_entity(player_entity) {
-                        let Ok(parent) = parent_query.get(player_entity) else {
-                            continue;
-                        };
-
                         ecmds.remove_parent_in_place();
-
-                        // let Ok(Some(ship_trans)) = query_body.get(parent.get()).map(|x| x.1.cloned()) else {
-                        //     continue;
-                        // };
-                        //
-                        // let ship_translation = ship_trans.translation;
-                        //
-                        // if let Ok((Some(mut loc), Some(mut trans))) = query_body.get_mut(player_entity).map(|x| (x.0, x.1)) {
-                        //     let cur_trans = trans.translation;
-                        //
-                        //     trans.translation = cur_trans + ship_translation;
-                        //
-                        //     // loc.last_transform_loc = Some(trans.translation);
-                        // }
                     }
                 }
             }
@@ -771,15 +752,6 @@ pub(crate) fn client_sync_players(
                 };
 
                 ecmds.set_parent_in_place(ship_entity);
-
-                let Ok(Some(ship_loc)) = query_body.get(ship_entity).map(|x| x.0.cloned()) else {
-                    continue;
-                };
-
-                // if let Ok((Some(mut loc), Some(mut trans), _, _, _)) = query_body.get_mut(player_entity) {
-                //     trans.translation = (*loc - ship_loc).absolute_coords_f32();
-                //     loc.last_transform_loc = Some(trans.translation);
-                // }
             }
             ServerReliableMessages::PlayerEnterBuildMode {
                 player_entity,
@@ -975,7 +947,6 @@ fn get_entity_identifier_entity_for_despawning(
 
 pub(super) fn register(app: &mut App) {
     app.insert_resource(RequestedEntities::default())
-        .configure_sets(Update, LocationPhysicsSet::DoPhysics)
         .add_systems(
             Update,
             (
@@ -1001,21 +972,7 @@ pub(super) fn register(app: &mut App) {
         )
         .add_systems(
             Update,
-            //     (
-            //         // Also run first above
-            //         fix_location,
-            //         (
             lerp_towards
-                //             player_changed_parent,
-                //             sync_transforms_and_locations,
-                //             handle_child_syncing,
-                //             add_previous_location,
-                //         )
-                //             .after(CosmosBundleSet::HandleCosmosBundles)
-                //             .chain(),
-                //     )
-                //         .in_set(LocationPhysicsSet::DoPhysics)
-                //         .chain()
                 .before(LocationPhysicsSet::DoPhysics)
                 .in_set(NetworkingSystemsSet::Between)
                 .run_if(in_state(GameState::Playing)),
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index e08683b46..021f1fa40 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -521,6 +521,7 @@ pub enum CosmosBundleSet {
 
 pub(super) fn register(app: &mut App) {
     systems::register(app);
+    app.configure_sets(Update, LocationPhysicsSet::DoPhysics);
 
     // TODO: Remove system set
     app.register_type::<Location>()
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 014031c40..51a3287bd 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -113,7 +113,7 @@ fn apply_set_position(
     }
 }
 
-fn ensure_worlds_have_anchors(
+fn reposition_worlds_around_anchors(
     q_loc_no_parent: Query<&Location, (Without<PlayerWorld>, Without<Parent>)>,
     mut q_everything: Query<(&mut LastTransformTranslation, &mut Transform, &WorldWithin, Option<&Parent>), With<Location>>,
     trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
@@ -471,7 +471,7 @@ pub(super) fn register(app: &mut App) {
         (
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
             apply_set_position,
-            ensure_worlds_have_anchors,
+            reposition_worlds_around_anchors,
             #[cfg(feature = "server")]
             (move_anchors_between_worlds, move_non_anchors_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
@@ -482,4 +482,6 @@ pub(super) fn register(app: &mut App) {
             // .in_set(CosmosBundleSet::HandleCosmosBundles)
             .in_set(NetworkingSystemsSet::Between),
     );
+
+    app.add_systems(PostUpdate, sync_transforms_and_locations);
 }
diff --git a/cosmos_server/src/physics/mod.rs b/cosmos_server/src/physics/mod.rs
index 77ee88f15..5a97c64b5 100644
--- a/cosmos_server/src/physics/mod.rs
+++ b/cosmos_server/src/physics/mod.rs
@@ -208,26 +208,21 @@ fn remove_empty_worlds(
     }
 }
 
-#[derive(Resource, Default)]
-struct FixParentLocation(Vec<Entity>);
-
 pub(super) fn register(app: &mut App) {
     collider_disabling::register(app);
 
-    app.configure_sets(Update, LocationPhysicsSet::DoPhysics)
-        // .add_systems(
-        // Update,
-        // (), // .chain()
-        // .after(CosmosBundleSet::HandleCosmosBundles)
-        // .in_set(LocationPhysicsSet::DoPhysics)
-        // .run_if(in_state(GameState::Playing))
-        // .before(NetworkingSystemsSet::ReceiveMessages),
-        // )
-        // .add_systems(PostUpdate, fix_location)
-        // This must be last due to commands being delayed when adding PhysicsWorlds.
-        .add_systems(
-            Last,
-            (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
-        )
-        .init_resource::<FixParentLocation>();
+    // .add_systems(
+    // Update,
+    // (), // .chain()
+    // .after(CosmosBundleSet::HandleCosmosBundles)
+    // .in_set(LocationPhysicsSet::DoPhysics)
+    // .run_if(in_state(GameState::Playing))
+    // .before(NetworkingSystemsSet::ReceiveMessages),
+    // )
+    // .add_systems(PostUpdate, fix_location)
+    // This must be last due to commands being delayed when adding PhysicsWorlds.
+    // .add_systems(
+    // Last,
+    // (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
+    // )
 }
diff --git a/docs/src/physics/location.md b/docs/src/physics/location.md
index 2d222e9be..fa0e92203 100644
--- a/docs/src/physics/location.md
+++ b/docs/src/physics/location.md
@@ -14,7 +14,7 @@ In addition, the values of a GlobalTransform wouldn't be nearly big enough to st
 ## :) Solution
 
 The Location structure stores your absolute position by breaking your position into two representations - sector coordinates
-and local coordinates. Sector coordinates represent how far away you are from `0, 0, 0` in multiples of 20,000. A sector coordinate
+and local coordinates. Sector coordinates represent how far away you are from `0, 0, 0` in multiples of 20,000\*. A sector coordinate
 of `(4, 0, -3)` is the same as `(80,000, 0, -60,000)`. The local coordinates are used to store an offset from the sector coordinate grid.
 For example, sector coordinates `(1, 0, 0)` with local coordinates `(5000, 1000, -4000)` would represent an absolute position of `(45000, 1000, -4000)`.
 
@@ -54,36 +54,38 @@ will be updated to match the `Transform` component. After the `Location` is set
 
 ### Location + Transform Syncing
 
-This takes place within the `Update` schedule, in the `DoPhysics` set.
+This takes place within the `Update` schedule, in the `LocationPhysicsSet::DoPhysics` set.
+
+#### Server
 
 ```mermaid
 sequenceDiagram
-    Between->>apply_set_position:
-    apply_set_position->>handle_worlds
-    handle_worlds->>sync_transforms_and_locations:
-    sync_transforms_and_locations->>handle_child_syncing:
-    handle_child_syncing->>add_previous_location:
-    add_previous_location->>Between:
+    sync_simple_transforms->>propagate_transforms
+    propagate_transforms->>apply_set_position
+    apply_set_position->>reposition_worlds_around_anchors
+    reposition_worlds_around_anchors->>move_anchors_between_worlds
+    move_anchors_between_worlds->>move_non_anchors_between_worlds
+    move_non_anchors_between_worlds->>remove_empty_worlds
+    remove_empty_worlds->>sync_transforms_and_locations
+```
 
+#### Client
+
+```mermaid
 sequenceDiagram
-    Update->>fix_location: Properly sets up the location of any newly added entities
-    fix_location-->>Update: New entities now have proper locations
-    Update->>sync_transforms_and_locations: Applies transform changes to the location, and location changes to the transform
-    sync_transforms_and_locations-->>Update: Syncing for all top-level entities is done
-    Update->>handle_child_syncing: Syncs entities that have parents' locations and transforms by applying transform changes to the location & location changes to the transform
-    handle_child_syncing-->>Update: Entities with parents are now properly synced
-    Update->>add_previous_location: The new locations created from this are now set to be the previous location, so the above systems can properly track changes
-    add_previous_location-->Update: Everything is complete, and transforms + locations are now in-sync.
+    sync_simple_transforms->>propagate_transforms
+    propagate_transforms->>apply_set_position
+    apply_set_position->>reposition_worlds_around_anchors
+    reposition_worlds_around_anchors->>sync_transforms_and_locations
 ```
 
 ### Post Update Schedule
 
 ```mermaid
 sequenceDiagram
-    PostUpdate->>fix_location: Properly sets up the location of any newly added entities
-    fix_location-->>PostUpdate: Newly added entities now have proper transforms
+    sync_transforms_and_locations
 ```
 
-These diagrams are based off the systems added in `cosmos_server/src/physics/mod.rs` and `cosmos_client/src/physics/mod.rs`.
+These diagrams are based off the systems added in `cosmos_core/src/physics/location/systems.rs`.
 
-20,000 is the number at the time of this document's writing. For an always accurate number, you should refer to the `SECTOR_DIMENSIONS` constant in `cosmos_core/src/physics/location.rs`.
+\* 20,000 is the number at the time of this document's writing. For an always accurate number, you should refer to the `SECTOR_DIMENSIONS` constant in `cosmos_core/src/physics/location.rs`.

From 8bd48c7f098734da584c950cd90f9285bef3f024 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 5 Jan 2025 15:47:29 -0500
Subject: [PATCH 18/31] Loading more things during the LoadingWorld state

---
 .../src/entities/player/render_distance.rs    |  7 +++-
 cosmos_client/src/loading/mod.rs              |  6 ++-
 cosmos_client/src/main.rs                     |  3 +-
 cosmos_client/src/netty/connect.rs            | 25 +-----------
 cosmos_client/src/netty/gameplay/receiver.rs  |  3 +-
 cosmos_client/src/netty/loading.rs            | 39 +++++++++++++++++++
 cosmos_client/src/netty/mod.rs                |  2 +
 cosmos_client/src/projectiles/missile.rs      |  2 +-
 .../src/rendering/structure_renderer/mod.rs   |  4 +-
 .../src/structure/planet/generation.rs        |  2 +-
 .../src/structure/planet/lods/mod.rs          |  5 ++-
 cosmos_client/src/structure/planet/mod.rs     |  5 ++-
 cosmos_client/src/window/setup.rs             | 19 ++++++++-
 cosmos_core/src/physics/location/systems.rs   | 20 +++++++---
 cosmos_server/src/netty/sync/sync_bodies.rs   |  2 +-
 15 files changed, 99 insertions(+), 45 deletions(-)
 create mode 100644 cosmos_client/src/netty/loading.rs

diff --git a/cosmos_client/src/entities/player/render_distance.rs b/cosmos_client/src/entities/player/render_distance.rs
index 2d28dc0f1..6dec57dee 100644
--- a/cosmos_client/src/entities/player/render_distance.rs
+++ b/cosmos_client/src/entities/player/render_distance.rs
@@ -1,6 +1,6 @@
 //! Represents how far the player can see entities
 
-use bevy::prelude::{in_state, App, Changed, IntoSystemConfigs, Query, ResMut, Update, With};
+use bevy::prelude::{in_state, App, Changed, Condition, IntoSystemConfigs, Query, ResMut, Update, With};
 use bevy_renet2::renet2::RenetClient;
 use cosmos_core::{
     entities::player::render_distance::RenderDistance,
@@ -20,5 +20,8 @@ fn send_render_distance(query: Query<&RenderDistance, (With<LocalPlayer>, Change
 }
 
 pub(super) fn register(app: &mut App) {
-    app.add_systems(Update, send_render_distance.run_if(in_state(GameState::Playing)));
+    app.add_systems(
+        Update,
+        send_render_distance.run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
+    );
 }
diff --git a/cosmos_client/src/loading/mod.rs b/cosmos_client/src/loading/mod.rs
index 006b0cd3a..5002b1fa2 100644
--- a/cosmos_client/src/loading/mod.rs
+++ b/cosmos_client/src/loading/mod.rs
@@ -1,6 +1,9 @@
 //! Responsible for unloading far entities
 
-use bevy::prelude::{App, Commands, Entity, IntoSystemConfigs, Parent, Query, Update, With, Without};
+use bevy::{
+    log::info,
+    prelude::{App, Commands, Entity, IntoSystemConfigs, Parent, Query, Update, With, Without},
+};
 use cosmos_core::{
     ecs::NeedsDespawned,
     entities::player::Player,
@@ -19,6 +22,7 @@ fn unload_far_entities(
             let ul_distance = unload_distance.unload_distance() as SectorUnit;
 
             if (loc.sector() - my_loc.sector()).abs().max_element() > ul_distance {
+                info!("Unloading {ent:?} - it's too far.");
                 commands.entity(ent).insert(NeedsDespawned);
             }
         }
diff --git a/cosmos_client/src/main.rs b/cosmos_client/src/main.rs
index bb4a13e52..5297d0a8c 100644
--- a/cosmos_client/src/main.rs
+++ b/cosmos_client/src/main.rs
@@ -155,8 +155,7 @@ fn main() {
         ))
         // .add_plugins(RapierDebugRenderPlugin::default())
         .add_systems(OnEnter(GameState::Connecting), connect::establish_connection)
-        .add_systems(Update, connect::wait_for_connection.run_if(in_state(GameState::Connecting)))
-        .add_systems(Update, connect::wait_for_done_loading.run_if(in_state(GameState::LoadingWorld)));
+        .add_systems(Update, connect::wait_for_connection.run_if(in_state(GameState::Connecting)));
 
     input::register(&mut app);
     window::register(&mut app);
diff --git a/cosmos_client/src/netty/connect.rs b/cosmos_client/src/netty/connect.rs
index 3a745f24c..c01de1b93 100644
--- a/cosmos_client/src/netty/connect.rs
+++ b/cosmos_client/src/netty/connect.rs
@@ -13,8 +13,7 @@ use bevy_renet2::renet2::{
     RenetClient,
 };
 use cosmos_core::{
-    entities::player::Player,
-    netty::{client::LocalPlayer, connection_config, sync::mapping::NetworkMapping, PROTOCOL_ID},
+    netty::{connection_config, sync::mapping::NetworkMapping, PROTOCOL_ID},
     state::GameState,
 };
 use renet2::transport::NativeSocket;
@@ -100,25 +99,3 @@ pub fn wait_for_connection(mut state_changer: ResMut<NextState<GameState>>, clie
         state_changer.set(GameState::LoadingData);
     }
 }
-
-#[derive(Component)]
-/// Add this component to an entity to ensure the state isn't advanced to playing. Remove this when you're ready to start playing.
-pub struct WaitingOnServer;
-
-// GameState::LoadingData -> GameState::LoadingWorld in registry/mod.rs
-
-/// Waits for the `LoadingWorld` state to be done loading, then transitions to the `GameState::Playing`
-pub fn wait_for_done_loading(
-    mut state_changer: ResMut<NextState<GameState>>,
-    q_waiting: Query<(), With<WaitingOnServer>>,
-    query: Query<&Player, With<LocalPlayer>>,
-) {
-    if !q_waiting.is_empty() {
-        return;
-    }
-
-    if query.get_single().is_ok() {
-        info!("Got local player, starting game!");
-        state_changer.set(GameState::Playing);
-    }
-}
diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index b8d38827e..a3f084d11 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -258,6 +258,7 @@ pub(crate) fn client_sync_players(
 
         match msg {
             ServerUnreliableMessages::BulkBodies { bodies, time_stamp } => {
+                info!("Got BB!");
                 for (server_entity, body) in bodies.iter() {
                     let Ok(body) = body.map(&network_mapping) else {
                         continue;
@@ -975,6 +976,6 @@ pub(super) fn register(app: &mut App) {
             lerp_towards
                 .before(LocationPhysicsSet::DoPhysics)
                 .in_set(NetworkingSystemsSet::Between)
-                .run_if(in_state(GameState::Playing)),
+                .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
         );
 }
diff --git a/cosmos_client/src/netty/loading.rs b/cosmos_client/src/netty/loading.rs
new file mode 100644
index 000000000..e34de826f
--- /dev/null
+++ b/cosmos_client/src/netty/loading.rs
@@ -0,0 +1,39 @@
+//! Handles the state change between [`GameState::LoadingWorld`] to [`GameState::Playing`]
+
+use std::time::Duration;
+
+use bevy::{prelude::*, time::common_conditions::on_timer};
+use cosmos_core::{
+    netty::{client::LocalPlayer, system_sets::NetworkingSystemsSet},
+    state::GameState,
+};
+
+#[derive(Component)]
+/// Add this component to an entity to ensure the state isn't advanced to playing. Remove this when you're ready to start playing.
+pub struct WaitingOnServer;
+
+/// Waits for the `LoadingWorld` state to be done loading, then transitions to the `GameState::Playing`
+pub fn wait_for_done_loading(
+    mut state_changer: ResMut<NextState<GameState>>,
+    q_waiting: Query<(), With<WaitingOnServer>>,
+    query: Query<(), With<LocalPlayer>>,
+) {
+    if !q_waiting.is_empty() {
+        return;
+    }
+
+    if query.get_single().is_ok() {
+        info!("Got local player, starting game!");
+        state_changer.set(GameState::Playing);
+    }
+}
+
+pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        wait_for_done_loading
+            .in_set(NetworkingSystemsSet::Between)
+            .run_if(on_timer(Duration::from_secs(30)))
+            .run_if(in_state(GameState::LoadingWorld)),
+    );
+}
diff --git a/cosmos_client/src/netty/mod.rs b/cosmos_client/src/netty/mod.rs
index 8e3b5fab8..82cccc45a 100644
--- a/cosmos_client/src/netty/mod.rs
+++ b/cosmos_client/src/netty/mod.rs
@@ -12,9 +12,11 @@ use cosmos_core::{
 
 pub mod connect;
 pub mod gameplay;
+pub mod loading;
 pub mod lobby;
 
 pub(super) fn register(app: &mut App) {
+    loading::register(app);
     app.configure_sets(
         Update,
         (
diff --git a/cosmos_client/src/projectiles/missile.rs b/cosmos_client/src/projectiles/missile.rs
index d938ada69..bf5268eca 100644
--- a/cosmos_client/src/projectiles/missile.rs
+++ b/cosmos_client/src/projectiles/missile.rs
@@ -265,7 +265,7 @@ pub(super) fn register(app: &mut App) {
         Update,
         on_add_missile
             .in_set(ComponentSyncingSet::PostComponentSyncing)
-            .run_if(in_state(GameState::Playing)),
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
     )
     .add_systems(OnEnter(GameState::Loading), create_missile_mesh)
     .add_systems(Update, track_time_alive)
diff --git a/cosmos_client/src/rendering/structure_renderer/mod.rs b/cosmos_client/src/rendering/structure_renderer/mod.rs
index a62a59cc0..feb9505a9 100644
--- a/cosmos_client/src/rendering/structure_renderer/mod.rs
+++ b/cosmos_client/src/rendering/structure_renderer/mod.rs
@@ -1,7 +1,7 @@
 use crate::asset::materials::MaterialsSystemSet;
 use crate::structure::planet::unload_chunks_far_from_players;
 use bevy::ecs::schedule::{IntoSystemSetConfigs, SystemSet};
-use bevy::prelude::{in_state, App, Res, ResMut, Resource, Update};
+use bevy::prelude::{in_state, App, Condition, Res, ResMut, Resource, Update};
 use bevy::state::state::OnExit;
 use cosmos_core::block::block_events::BlockEventsSet;
 use cosmos_core::block::Block;
@@ -72,7 +72,7 @@ pub(super) fn register(app: &mut App) {
             StructureRenderingSet::CustomRendering,
         )
             .chain()
-            .run_if(in_state(GameState::Playing))
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
             .before(unload_chunks_far_from_players)
             .in_set(NetworkingSystemsSet::Between)
             .in_set(MaterialsSystemSet::RequestMaterialChanges)
diff --git a/cosmos_client/src/structure/planet/generation.rs b/cosmos_client/src/structure/planet/generation.rs
index a5d925348..ea9ff0549 100644
--- a/cosmos_client/src/structure/planet/generation.rs
+++ b/cosmos_client/src/structure/planet/generation.rs
@@ -2,7 +2,7 @@
 
 use std::fs;
 
-use crate::netty::connect::WaitingOnServer;
+use crate::netty::loading::WaitingOnServer;
 use bevy::prelude::*;
 use bevy_easy_compute::prelude::*;
 use cosmos_core::{
diff --git a/cosmos_client/src/structure/planet/lods/mod.rs b/cosmos_client/src/structure/planet/lods/mod.rs
index 208295e13..ce69f3383 100644
--- a/cosmos_client/src/structure/planet/lods/mod.rs
+++ b/cosmos_client/src/structure/planet/lods/mod.rs
@@ -13,7 +13,8 @@ use bevy::{
     log::{info, warn},
     math::{Vec3, Vec4},
     prelude::{
-        in_state, App, Commands, Component, Entity, GlobalTransform, IntoSystemConfigs, Quat, Query, Res, ResMut, Resource, Update, With,
+        in_state, App, Commands, Component, Condition, Entity, GlobalTransform, IntoSystemConfigs, Quat, Query, Res, ResMut, Resource,
+        Update, With,
     },
 };
 use bevy_easy_compute::prelude::{AppComputeWorker, BevyEasyComputeSet};
@@ -807,7 +808,7 @@ pub(super) fn register(app: &mut App) {
             .before(BevyEasyComputeSet::ExtractPipelines)
             .in_set(NetworkingSystemsSet::Between)
             .chain()
-            .run_if(in_state(GameState::Playing)),
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
     )
     .add_mut_event::<DoneGeneratingChunkEvent>()
     .init_resource::<NeedGeneratedLodChunks>()
diff --git a/cosmos_client/src/structure/planet/mod.rs b/cosmos_client/src/structure/planet/mod.rs
index 1657caefc..b7a756547 100644
--- a/cosmos_client/src/structure/planet/mod.rs
+++ b/cosmos_client/src/structure/planet/mod.rs
@@ -3,7 +3,8 @@
 use bevy::{
     math::Quat,
     prelude::{
-        in_state, App, Commands, Entity, EventWriter, GlobalTransform, IntoSystemConfigs, Mut, Query, Res, ResMut, Update, Vec3, With,
+        in_state, App, Commands, Condition, Entity, EventWriter, GlobalTransform, IntoSystemConfigs, Mut, Query, Res, ResMut, Update, Vec3,
+        With,
     },
 };
 use bevy_renet2::renet2::RenetClient;
@@ -188,6 +189,6 @@ pub(super) fn register(app: &mut App) {
             .chain()
             .in_set(NetworkingSystemsSet::Between)
             .after(LocationPhysicsSet::DoPhysics)
-            .run_if(in_state(GameState::Playing)),
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
     );
 }
diff --git a/cosmos_client/src/window/setup.rs b/cosmos_client/src/window/setup.rs
index f5c7dd19f..4f3e79395 100644
--- a/cosmos_client/src/window/setup.rs
+++ b/cosmos_client/src/window/setup.rs
@@ -108,6 +108,20 @@ fn apply_cursor_flags_on_change(cursor_flags: Res<CursorFlags>, mut primary_quer
     apply_cursor_flags(&mut window, *cursor_flags);
 }
 
+fn show_cursor(mut primary_query: Query<&mut Window, With<PrimaryWindow>>) {
+    let Ok(mut window) = primary_query.get_single_mut() else {
+        return;
+    };
+
+    apply_cursor_flags(
+        &mut window,
+        CursorFlags {
+            locked: false,
+            visible: true,
+        },
+    );
+}
+
 #[derive(Debug, Hash, PartialEq, Eq, Clone, SystemSet)]
 /// Handles when the cursor should be shown/hidden
 pub enum CursorFlagsSet {
@@ -132,12 +146,15 @@ pub(super) fn register(app: &mut App) {
     )
     .insert_resource(DeltaCursorPosition { x: 0.0, y: 0.0 })
     .add_systems(Startup, setup_window)
+    .add_systems(Update, show_cursor.run_if(not(in_state(GameState::Playing))))
     .add_systems(
         Update,
         (
             update_mouse_deltas,
             window_focus_changed,
-            apply_cursor_flags_on_change.in_set(CursorFlagsSet::UpdateCursorFlags),
+            apply_cursor_flags_on_change
+                .run_if(in_state(GameState::Playing))
+                .in_set(CursorFlagsSet::UpdateCursorFlags),
         )
             .chain(),
     )
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 51a3287bd..39f832020 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -11,8 +11,12 @@
 use bevy::{
     prelude::*,
     transform::systems::{propagate_transforms, sync_simple_transforms},
-    utils::HashSet,
 };
+
+#[cfg(feature = "server")]
+use bevy::utils::HashSet;
+
+#[cfg(feature = "server")]
 use bevy_rapier3d::{
     plugin::{RapierConfiguration, RapierContextEntityLink},
     prelude::RapierContextSimulation,
@@ -26,7 +30,10 @@ use crate::{
     },
 };
 
-use super::{Location, LocationPhysicsSet, Sector, SetPosition, SECTOR_DIMENSIONS};
+#[cfg(feature = "server")]
+use super::SECTOR_DIMENSIONS;
+use super::{Location, LocationPhysicsSet, Sector, SetPosition};
+
 #[cfg(doc)]
 use crate::netty::client::LocalPlayer;
 
@@ -117,14 +124,14 @@ fn reposition_worlds_around_anchors(
     q_loc_no_parent: Query<&Location, (Without<PlayerWorld>, Without<Parent>)>,
     mut q_everything: Query<(&mut LastTransformTranslation, &mut Transform, &WorldWithin, Option<&Parent>), With<Location>>,
     trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
-    q_anchors: Query<(&WorldWithin, Entity), With<Anchor>>,
+    #[cfg(feature = "server")] q_anchors: Query<(&WorldWithin, Entity), With<Anchor>>,
     #[cfg(feature = "server")] everything_query: Query<(&WorldWithin, Entity)>,
     parent_query: Query<&Parent>,
     entity_query: Query<Entity>,
     mut world_query: Query<(Entity, &mut PlayerWorld, &mut Location)>,
-
-    mut commands: Commands,
+    #[cfg(feature = "server")] mut commands: Commands,
 ) {
+    #[allow(unused_mut)] // the server needs `world` to be mut, the client doesn't.
     for (world_entity, mut world, mut world_location) in world_query.iter_mut() {
         if let Ok(mut player_entity) = entity_query.get(world.player) {
             while let Ok(parent) = parent_query.get(player_entity) {
@@ -187,9 +194,12 @@ fn reposition_worlds_around_anchors(
     }
 }
 
+#[cfg(feature = "server")]
 const WORLD_SWITCH_DISTANCE: f32 = SECTOR_DIMENSIONS / 2.0;
+#[cfg(feature = "server")]
 const WORLD_SWITCH_DISTANCE_SQRD: f32 = WORLD_SWITCH_DISTANCE * WORLD_SWITCH_DISTANCE;
 
+#[cfg(feature = "server")]
 fn create_physics_world(commands: &mut Commands) -> RapierContextEntityLink {
     let mut config = RapierConfiguration::new(1.0);
     config.gravity = Vec3::ZERO;
diff --git a/cosmos_server/src/netty/sync/sync_bodies.rs b/cosmos_server/src/netty/sync/sync_bodies.rs
index 5a47d71c1..ff14edd4b 100644
--- a/cosmos_server/src/netty/sync/sync_bodies.rs
+++ b/cosmos_server/src/netty/sync/sync_bodies.rs
@@ -51,7 +51,7 @@ fn send_bodies(
             };
 
             let message = cosmos_encoder::serialize(&sync_message);
-
+            info!("Sending BB!");
             server.send_message(player.id(), NettyChannelServer::Unreliable, message.clone());
         }
     }

From 057e39460f13b797c7328732d0aa6c9cdecad112 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 5 Jan 2025 16:14:34 -0500
Subject: [PATCH 19/31] Players now respect their parent on the client when
 joining

---
 cosmos_client/src/netty/gameplay/receiver.rs  | 11 +++++++--
 .../src/netty/server_reliable_messages.rs     |  2 ++
 cosmos_core/src/physics/location/systems.rs   |  7 +++---
 .../src/entities/player/persistence.rs        |  5 ++--
 cosmos_server/src/netty/server_events.rs      | 23 -------------------
 cosmos_server/src/netty/sync/sync_bodies.rs   |  1 -
 6 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index a3f084d11..2a5c5767a 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -37,7 +37,7 @@ use cosmos_core::{
     },
     persistence::LoadingDistance,
     physics::{
-        location::{systems::Anchor, CosmosBundleSet, Location, LocationPhysicsSet, SYSTEM_SECTORS},
+        location::{systems::Anchor, CosmosBundleSet, Location, LocationPhysicsSet, SetPosition, SYSTEM_SECTORS},
         player_world::PlayerWorld,
     },
     registry::Registry,
@@ -258,7 +258,6 @@ pub(crate) fn client_sync_players(
 
         match msg {
             ServerUnreliableMessages::BulkBodies { bodies, time_stamp } => {
-                info!("Got BB!");
                 for (server_entity, body) in bodies.iter() {
                     let Ok(body) = body.map(&network_mapping) else {
                         continue;
@@ -378,6 +377,7 @@ pub(crate) fn client_sync_players(
                 body,
                 id,
                 entity: server_entity,
+                parent: server_parent_entity,
                 name,
                 render_distance: _,
             } => {
@@ -415,6 +415,7 @@ pub(crate) fn client_sync_players(
                 // loc.last_transform_loc = Some(loc.local);
 
                 entity_cmds.insert((
+                    SetPosition::Location,
                     CosmosPbrBundle {
                         location: loc,
                         rotation: body.rotation.into(),
@@ -436,6 +437,12 @@ pub(crate) fn client_sync_players(
                     ServerEntity(server_entity),
                 ));
 
+                if let Some(server_parent_entity) = server_parent_entity {
+                    if let Some(parent_ent) = network_mapping.client_from_server(&server_parent_entity) {
+                        entity_cmds.set_parent_in_place(parent_ent);
+                    }
+                }
+
                 let client_entity = entity_cmds.id();
 
                 let player_info = PlayerInfo {
diff --git a/cosmos_core/src/netty/server_reliable_messages.rs b/cosmos_core/src/netty/server_reliable_messages.rs
index 4f2d0948d..1fac3075b 100644
--- a/cosmos_core/src/netty/server_reliable_messages.rs
+++ b/cosmos_core/src/netty/server_reliable_messages.rs
@@ -63,6 +63,8 @@ pub enum ServerReliableMessages {
     PlayerCreate {
         /// The server entity for this player.
         entity: Entity,
+        /// The player's parent (if it has one)
+        parent: Option<Entity>,
         /// The player's name.
         name: String,
         /// The id for this player.
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 39f832020..82833f155 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -83,19 +83,18 @@ fn loc_from_trans(
 struct SetTransformBasedOnLocationFlag;
 
 fn apply_set_position(
-    q_location_added: Query<(Entity, Option<&Parent>), (Without<SetPosition>, Added<Location>)>,
+    q_location_added: Query<Entity, (Without<SetPosition>, Added<Location>)>,
     q_set_position: Query<(Entity, &SetPosition)>,
     q_x: Query<(Entity, Option<&Location>, Option<&SetPosition>)>,
     q_trans: Query<(&Transform, Option<&Parent>)>,
     q_g_trans: Query<&GlobalTransform>,
     mut commands: Commands,
 ) {
-    const TOP_LEVEL_SET_POS: SetPosition = SetPosition::Location;
-    const CHILD_SET_POS: SetPosition = SetPosition::Transform;
+    const DEFAULT_SET_POS: SetPosition = SetPosition::Location;
 
     for (entity, set_pos) in q_location_added
         .iter()
-        .map(|(ent, parent)| (ent, if parent.is_some() { &CHILD_SET_POS } else { &TOP_LEVEL_SET_POS }))
+        .map(|ent| (ent, &DEFAULT_SET_POS))
         .chain(q_set_position.iter())
     {
         match set_pos {
diff --git a/cosmos_server/src/entities/player/persistence.rs b/cosmos_server/src/entities/player/persistence.rs
index 78f30f8d7..e5e1011b8 100644
--- a/cosmos_server/src/entities/player/persistence.rs
+++ b/cosmos_server/src/entities/player/persistence.rs
@@ -248,9 +248,9 @@ fn finish_loading_player(
     mut evw_player_join: EventWriter<PlayerConnectedEvent>,
     mut evw_sync_registries: EventWriter<SyncRegistriesEvent>,
     server_settings: Res<ServerSettings>,
-    q_player_finished_loading: Query<(Entity, &Player, &Location, &Velocity), Added<Player>>,
+    q_player_finished_loading: Query<(Entity, &Player, &Location, &Velocity, Option<&Parent>), Added<Player>>,
 ) {
-    for (player_entity, load_player, location, velocity) in q_player_finished_loading.iter() {
+    for (player_entity, load_player, location, velocity, maybe_parent) in q_player_finished_loading.iter() {
         info!("Completing player load for {}", load_player.name());
         let mut ecmds = commands.entity(player_entity);
 
@@ -285,6 +285,7 @@ fn finish_loading_player(
         info!("Sending player create message!");
         let msg = cosmos_encoder::serialize(&ServerReliableMessages::PlayerCreate {
             entity: player_entity,
+            parent: maybe_parent.map(|x| x.get()),
             id: load_player.id(),
             name: load_player.name().into(),
             body: netty_body,
diff --git a/cosmos_server/src/netty/server_events.rs b/cosmos_server/src/netty/server_events.rs
index dfe99e1d9..b70d03401 100644
--- a/cosmos_server/src/netty/server_events.rs
+++ b/cosmos_server/src/netty/server_events.rs
@@ -1,18 +1,12 @@
 //! Handles client connecting and disconnecting
 
 use bevy::prelude::*;
-use bevy_rapier3d::prelude::*;
 use bevy_renet2::renet2::transport::NetcodeServerTransport;
 use bevy_renet2::renet2::{ClientId, RenetServer, ServerEvent};
 use cosmos_core::ecs::NeedsDespawned;
-use cosmos_core::entities::player::render_distance::RenderDistance;
-use cosmos_core::netty::netty_rigidbody::NettyRigidBodyLocation;
 use cosmos_core::netty::server::ServerLobby;
 use cosmos_core::netty::server_reliable_messages::ServerReliableMessages;
-use cosmos_core::netty::sync::server_entity_syncing::RequestedEntityEvent;
 use cosmos_core::netty::{cosmos_encoder, NettyChannelServer};
-use cosmos_core::physics::location::Location;
-use cosmos_core::{entities::player::Player, netty::netty_rigidbody::NettyRigidBody};
 use renet2_visualizer::RenetServerVisualizer;
 
 use crate::entities::player::persistence::LoadPlayer;
@@ -35,9 +29,7 @@ pub(super) fn handle_server_events(
     mut server_events: EventReader<ServerEvent>,
     mut lobby: ResMut<ServerLobby>,
     mut client_ticks: ResMut<ClientTicks>,
-    q_players: Query<(Entity, &Player, &Transform, &Location, &Velocity, &RenderDistance)>,
     mut visualizer: ResMut<RenetServerVisualizer<200>>,
-    mut requested_entity: EventWriter<RequestedEntityEvent>,
 ) {
     for event in server_events.read() {
         match event {
@@ -46,21 +38,6 @@ pub(super) fn handle_server_events(
                 info!("Client {client_id} connected");
                 visualizer.add_client(client_id);
 
-                for (entity, player, transform, location, velocity, render_distance) in q_players.iter() {
-                    let body = NettyRigidBody::new(Some(*velocity), transform.rotation, NettyRigidBodyLocation::Absolute(*location));
-
-                    let msg = cosmos_encoder::serialize(&ServerReliableMessages::PlayerCreate {
-                        entity,
-                        id: player.id(),
-                        body,
-                        name: player.name().to_owned(),
-                        render_distance: Some(*render_distance),
-                    });
-
-                    server.send_message(client_id, NettyChannelServer::Reliable, msg);
-                    requested_entity.send(RequestedEntityEvent { client_id, entity });
-                }
-
                 let Some(user_data) = transport.user_data(client_id) else {
                     warn!("Unable to get user data!");
                     continue;
diff --git a/cosmos_server/src/netty/sync/sync_bodies.rs b/cosmos_server/src/netty/sync/sync_bodies.rs
index ff14edd4b..41456e0eb 100644
--- a/cosmos_server/src/netty/sync/sync_bodies.rs
+++ b/cosmos_server/src/netty/sync/sync_bodies.rs
@@ -51,7 +51,6 @@ fn send_bodies(
             };
 
             let message = cosmos_encoder::serialize(&sync_message);
-            info!("Sending BB!");
             server.send_message(player.id(), NettyChannelServer::Unreliable, message.clone());
         }
     }

From 4b6fd30b562a5557da7a2427948d2aa06bad140c Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Mon, 6 Jan 2025 17:05:52 -0500
Subject: [PATCH 20/31] Client now has 1 sec delay between loading world and
 playing

---
 .../src/asset/materials/material_types/animated_material.rs | 3 +--
 .../src/asset/materials/material_types/lod_material.rs      | 3 +--
 .../src/asset/materials/material_types/main_material.rs     | 3 +--
 cosmos_client/src/asset/materials/mod.rs                    | 1 +
 cosmos_client/src/netty/gameplay/receiver.rs                | 6 ++++--
 cosmos_client/src/netty/loading.rs                          | 6 +++++-
 cosmos_client/src/rendering/lod_renderer.rs                 | 2 +-
 cosmos_client/src/structure/systems/mining_laser_system.rs  | 2 +-
 8 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/cosmos_client/src/asset/materials/material_types/animated_material.rs b/cosmos_client/src/asset/materials/material_types/animated_material.rs
index 4568d576b..34950570c 100644
--- a/cosmos_client/src/asset/materials/material_types/animated_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/animated_material.rs
@@ -239,8 +239,7 @@ pub(super) fn register(app: &mut App) {
         (
             respond_to_remove_materails_event.in_set(MaterialsSystemSet::ProcessRemoveMaterialsEvents),
             respond_to_add_materials_event.in_set(MaterialsSystemSet::ProcessAddMaterialsEvents),
-        )
-            .run_if(in_state(GameState::Playing)),
+        ),
     )
     .add_systems(
         Update,
diff --git a/cosmos_client/src/asset/materials/material_types/lod_material.rs b/cosmos_client/src/asset/materials/material_types/lod_material.rs
index 34cdfdfd6..d59585b37 100644
--- a/cosmos_client/src/asset/materials/material_types/lod_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/lod_material.rs
@@ -128,8 +128,7 @@ pub(super) fn register(app: &mut App) {
         (
             respond_to_remove_materails_event.in_set(MaterialsSystemSet::ProcessRemoveMaterialsEvents),
             respond_to_add_materials_event.in_set(MaterialsSystemSet::ProcessAddMaterialsEvents),
-        )
-            .run_if(in_state(GameState::Playing)),
+        ),
     )
     .add_systems(
         Update,
diff --git a/cosmos_client/src/asset/materials/material_types/main_material.rs b/cosmos_client/src/asset/materials/material_types/main_material.rs
index 160cbb683..88ce0a2d2 100644
--- a/cosmos_client/src/asset/materials/material_types/main_material.rs
+++ b/cosmos_client/src/asset/materials/material_types/main_material.rs
@@ -128,8 +128,7 @@ pub(super) fn register(app: &mut App) {
         (
             respond_to_remove_materails_event.in_set(MaterialsSystemSet::ProcessRemoveMaterialsEvents),
             respond_to_add_materials_event.in_set(MaterialsSystemSet::ProcessAddMaterialsEvents),
-        )
-            .run_if(in_state(GameState::Playing)),
+        ),
     )
     .add_systems(
         Update,
diff --git a/cosmos_client/src/asset/materials/mod.rs b/cosmos_client/src/asset/materials/mod.rs
index 205df23cc..9114d74c4 100644
--- a/cosmos_client/src/asset/materials/mod.rs
+++ b/cosmos_client/src/asset/materials/mod.rs
@@ -343,6 +343,7 @@ pub(super) fn register(app: &mut App) {
             MaterialsSystemSet::ProcessAddMaterialsEvents,
         )
             .in_set(AssetsSet::AssetsReady)
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld)))
             .chain(),
     );
 
diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 2a5c5767a..3b7519698 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -437,14 +437,16 @@ pub(crate) fn client_sync_players(
                     ServerEntity(server_entity),
                 ));
 
+                let client_entity = entity_cmds.id();
+
                 if let Some(server_parent_entity) = server_parent_entity {
                     if let Some(parent_ent) = network_mapping.client_from_server(&server_parent_entity) {
                         entity_cmds.set_parent_in_place(parent_ent);
+                    } else {
+                        error!("No parent entity Server{server_parent_entity:?} exists for player {client_entity}!");
                     }
                 }
 
-                let client_entity = entity_cmds.id();
-
                 let player_info = PlayerInfo {
                     server_entity,
                     client_entity,
diff --git a/cosmos_client/src/netty/loading.rs b/cosmos_client/src/netty/loading.rs
index e34de826f..549765cde 100644
--- a/cosmos_client/src/netty/loading.rs
+++ b/cosmos_client/src/netty/loading.rs
@@ -33,7 +33,11 @@ pub(super) fn register(app: &mut App) {
         Update,
         wait_for_done_loading
             .in_set(NetworkingSystemsSet::Between)
-            .run_if(on_timer(Duration::from_secs(30)))
+            // This is stupid. For some reason, if the client doesn't get a couple updates first,
+            // if the player spawns in as a child of another entity, the transform heirarchy isn't
+            // loaded and the player seemingly gets despawned. This should really get fixed instead
+            // of patched like this, but I don't have the time to look into this right now.
+            .run_if(on_timer(Duration::from_secs(1)))
             .run_if(in_state(GameState::LoadingWorld)),
     );
 }
diff --git a/cosmos_client/src/rendering/lod_renderer.rs b/cosmos_client/src/rendering/lod_renderer.rs
index bb404a2d3..d171e6399 100644
--- a/cosmos_client/src/rendering/lod_renderer.rs
+++ b/cosmos_client/src/rendering/lod_renderer.rs
@@ -664,7 +664,7 @@ pub(super) fn register(app: &mut App) {
         )
             .chain()
             .in_set(MaterialsSystemSet::RequestMaterialChanges)
-            .run_if(in_state(GameState::Playing)),
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
     );
 
     add_statebound_resource::<RenderingLods, GameState>(app, GameState::Playing);
diff --git a/cosmos_client/src/structure/systems/mining_laser_system.rs b/cosmos_client/src/structure/systems/mining_laser_system.rs
index c2b290fcd..7dbc190b7 100644
--- a/cosmos_client/src/structure/systems/mining_laser_system.rs
+++ b/cosmos_client/src/structure/systems/mining_laser_system.rs
@@ -323,6 +323,6 @@ pub(super) fn register(app: &mut App) {
                 remove_dead_mining_beams.in_set(LasersSystemSet::UpdateLasers),
             )
                 .chain()
-                .run_if(in_state(GameState::Playing)),
+                .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
         );
 }

From d67197ad2150903d8472c0e66f9c90c33e5b26e9 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 11 Jan 2025 15:04:50 -0500
Subject: [PATCH 21/31] Making player joining more reliable on client side

Resolves #132
---
 cosmos_client/src/entities/player/mod.rs     | 39 +++++++++++++++++++-
 cosmos_client/src/netty/gameplay/receiver.rs | 33 +++--------------
 cosmos_core/src/entities/player/mod.rs       | 19 +++++++++-
 cosmos_server/src/persistence/loading.rs     |  2 +-
 4 files changed, 62 insertions(+), 31 deletions(-)

diff --git a/cosmos_client/src/entities/player/mod.rs b/cosmos_client/src/entities/player/mod.rs
index 0f52f2abf..fdb044e96 100644
--- a/cosmos_client/src/entities/player/mod.rs
+++ b/cosmos_client/src/entities/player/mod.rs
@@ -1,11 +1,48 @@
 //! Contains systems and components for the player
 
-use bevy::prelude::App;
+use bevy::{color::palettes::css, prelude::*};
+use bevy_rapier3d::prelude::{ActiveEvents, CoefficientCombineRule, Collider, Friction, LockedAxes, ReadMassProperties, RigidBody};
+use cosmos_core::{entities::player::Player, netty::system_sets::NetworkingSystemsSet, persistence::LoadingDistance, state::GameState};
 
 pub mod player_movement;
 pub mod render_distance;
 
+fn on_add_player(
+    mut commands: Commands,
+    mut materials: ResMut<Assets<StandardMaterial>>,
+    mut meshes: ResMut<Assets<Mesh>>,
+    q_player: Query<(Entity, &Player), Added<Player>>,
+) {
+    for (ent, player) in q_player.iter() {
+        commands.entity(ent).insert((
+            Mesh3d(meshes.add(Capsule3d::default())),
+            MeshMaterial3d(materials.add(StandardMaterial {
+                base_color: css::GREEN.into(),
+                ..Default::default()
+            })),
+            Collider::capsule_y(0.65, 0.25),
+            LockedAxes::ROTATION_LOCKED,
+            Name::new(format!("Player ({})", player.name())),
+            RigidBody::Dynamic,
+            Friction {
+                coefficient: 0.0,
+                combine_rule: CoefficientCombineRule::Min,
+            },
+            LoadingDistance::new(1, 2),
+            ReadMassProperties::default(),
+            ActiveEvents::COLLISION_EVENTS,
+        ));
+    }
+}
+
 pub(super) fn register(app: &mut App) {
+    app.add_systems(
+        Update,
+        on_add_player
+            .in_set(NetworkingSystemsSet::Between)
+            .run_if(in_state(GameState::Playing).or(in_state(GameState::LoadingWorld))),
+    );
+
     render_distance::register(app);
     player_movement::register(app);
 }
diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 3b7519698..53bcd548e 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -10,10 +10,7 @@ use bevy_rapier3d::prelude::*;
 use bevy_renet2::renet2::{transport::NetcodeClientTransport, RenetClient};
 use cosmos_core::{
     block::Block,
-    ecs::{
-        bundles::{BundleStartingRotation, CosmosPbrBundle},
-        NeedsDespawned,
-    },
+    ecs::{bundles::BundleStartingRotation, NeedsDespawned},
     entities::player::{render_distance::RenderDistance, Player},
     events::{
         block_events::{BlockChangedEvent, BlockDataChangedEvent},
@@ -189,8 +186,7 @@ fn lerp_towards(
 /// TODO: super split this up
 pub(crate) fn client_sync_players(
     mut commands: Commands,
-    (mut meshes, mut client, transport, mut lobby, mut network_mapping): (
-        ResMut<Assets<Mesh>>,
+    (mut client, transport, mut lobby, mut network_mapping): (
         ResMut<RenetClient>,
         Res<NetcodeClientTransport>,
         ResMut<ClientLobby>,
@@ -391,7 +387,7 @@ pub(crate) fn client_sync_players(
                     continue;
                 };
 
-                info!("Player {} ({}) connected!", name.as_str(), id);
+                info!("Player {} ({}) connected! {body:?}", name.as_str(), id);
 
                 // The player entity may have already been created if some of their components were already synced.
                 let mut entity_cmds = if let Some(player_entity) = network_mapping.client_from_server(&server_entity) {
@@ -409,31 +405,12 @@ pub(crate) fn client_sync_players(
                     }
                 };
 
-                error!("Player starting loc: {loc:?}");
-
-                // this will avoid any position mismatching
-                // loc.last_transform_loc = Some(loc.local);
-
                 entity_cmds.insert((
                     SetPosition::Location,
-                    CosmosPbrBundle {
-                        location: loc,
-                        rotation: body.rotation.into(),
-                        mesh: Mesh3d(meshes.add(Capsule3d::default())),
-                        ..default()
-                    },
-                    Collider::capsule_y(0.65, 0.25),
-                    LockedAxes::ROTATION_LOCKED,
-                    Name::new(format!("Player ({name})")),
-                    RigidBody::Dynamic,
-                    Friction {
-                        coefficient: 0.0,
-                        combine_rule: CoefficientCombineRule::Min,
-                    },
+                    Transform::from_rotation(body.rotation.into()),
+                    loc,
                     body.create_velocity(),
                     Player::new(name, id),
-                    ReadMassProperties::default(),
-                    ActiveEvents::COLLISION_EVENTS,
                     ServerEntity(server_entity),
                 ));
 
diff --git a/cosmos_core/src/entities/player/mod.rs b/cosmos_core/src/entities/player/mod.rs
index 5e3c0d386..a8fb1adfb 100644
--- a/cosmos_core/src/entities/player/mod.rs
+++ b/cosmos_core/src/entities/player/mod.rs
@@ -5,8 +5,11 @@ pub mod render_distance;
 
 use bevy::prelude::{App, Component};
 use bevy_renet2::renet2::ClientId;
+use serde::{Deserialize, Serialize};
 
-#[derive(Component, Debug)]
+use crate::netty::sync::{sync_component, IdentifiableComponent, SyncableComponent};
+
+#[derive(Component, Debug, Serialize, Deserialize, PartialEq, Eq, Clone)]
 /// Represents a player
 pub struct Player {
     name: String,
@@ -32,6 +35,20 @@ impl Player {
     }
 }
 
+impl IdentifiableComponent for Player {
+    fn get_component_unlocalized_name() -> &'static str {
+        "cosmos:player"
+    }
+}
+
+impl SyncableComponent for Player {
+    fn get_sync_type() -> crate::netty::sync::SyncType {
+        crate::netty::sync::SyncType::ServerAuthoritative
+    }
+}
+
 pub(super) fn register(app: &mut App) {
+    sync_component::<Player>(app);
+
     creative::register(app);
 }
diff --git a/cosmos_server/src/persistence/loading.rs b/cosmos_server/src/persistence/loading.rs
index 9d97ac56a..cd926fda6 100644
--- a/cosmos_server/src/persistence/loading.rs
+++ b/cosmos_server/src/persistence/loading.rs
@@ -12,7 +12,7 @@ use std::fs;
 use bevy::{
     ecs::schedule::{IntoSystemConfigs, IntoSystemSetConfigs, SystemSet},
     hierarchy::BuildChildren,
-    log::{error, warn},
+    log::{error, info, warn},
     prelude::{App, Commands, Component, Entity, Quat, Query, Update, With, Without},
     reflect::Reflect,
 };

From 23df6fcd90b140e0a08115fc1d7a0f79d28fbb96 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sat, 11 Jan 2025 16:19:40 -0500
Subject: [PATCH 22/31] cargo clippy --fix

---
 cosmos_client/src/netty/gameplay/receiver.rs  |   2 +-
 cosmos_core/src/physics/location/systems.rs   |   8 +-
 cosmos_core/src/utils/ownership.rs            |   4 +-
 .../src/blocks/interactable/gravity_well.rs   |   2 +-
 cosmos_server/src/persistence/loading.rs      |   2 +-
 .../src/persistence/make_persistent.rs        |   2 +-
 cosmos_server/src/physics/mod.rs              | 162 +-----------------
 7 files changed, 10 insertions(+), 172 deletions(-)

diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index 53bcd548e..f55927564 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -407,7 +407,7 @@ pub(crate) fn client_sync_players(
 
                 entity_cmds.insert((
                     SetPosition::Location,
-                    Transform::from_rotation(body.rotation.into()),
+                    Transform::from_rotation(body.rotation),
                     loc,
                     body.create_velocity(),
                     Player::new(name, id),
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 82833f155..86985c897 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -75,7 +75,7 @@ fn loc_from_trans(
 
     match set_pos {
         None | Some(SetPosition::Location) => loc.copied(),
-        Some(SetPosition::Transform) => calc_global_trans(entity, &q_trans).map(|t| Location::new(t.translation, Sector::ZERO)),
+        Some(SetPosition::Transform) => calc_global_trans(entity, q_trans).map(|t| Location::new(t.translation, Sector::ZERO)),
     }
 }
 
@@ -144,10 +144,7 @@ fn reposition_worlds_around_anchors(
 
             let Ok(location) = q_loc_no_parent
                 .get(player_entity)
-                .or_else(|_| match trans_query_with_parent.get(player_entity) {
-                    Ok(loc) => Ok(loc),
-                    Err(x) => Err(x),
-                })
+                .or_else(|_| trans_query_with_parent.get(player_entity))
             else {
                 // The player was just added & doesn't have a transform yet - only a location.
                 continue;
@@ -453,7 +450,6 @@ fn recursively_sync_transforms_and_locations(
         .remove::<SetTransformBasedOnLocationFlag>();
 
     let my_loc = *my_loc;
-    let my_g_trans = my_g_trans;
     let my_g_rot = parent_g_rot.mul_quat(local_rotation);
     let my_prev_loc = my_prev_loc.map(|x| x.0).unwrap_or(my_loc);
 
diff --git a/cosmos_core/src/utils/ownership.rs b/cosmos_core/src/utils/ownership.rs
index 2addc7de1..54106882c 100644
--- a/cosmos_core/src/utils/ownership.rs
+++ b/cosmos_core/src/utils/ownership.rs
@@ -12,7 +12,7 @@ pub enum MaybeOwned<'a, T> {
     Borrowed(&'a T),
 }
 
-impl<'a, T> AsRef<T> for MaybeOwned<'a, T> {
+impl<T> AsRef<T> for MaybeOwned<'_, T> {
     fn as_ref(&self) -> &T {
         match self {
             Self::Owned(owned) => owned.as_ref(),
@@ -21,7 +21,7 @@ impl<'a, T> AsRef<T> for MaybeOwned<'a, T> {
     }
 }
 
-impl<'a, T> Deref for MaybeOwned<'a, T> {
+impl<T> Deref for MaybeOwned<'_, T> {
     type Target = T;
 
     fn deref(&self) -> &Self::Target {
diff --git a/cosmos_server/src/blocks/interactable/gravity_well.rs b/cosmos_server/src/blocks/interactable/gravity_well.rs
index 51706a97a..d0dcc3dff 100644
--- a/cosmos_server/src/blocks/interactable/gravity_well.rs
+++ b/cosmos_server/src/blocks/interactable/gravity_well.rs
@@ -8,7 +8,7 @@ use bevy::{
         schedule::IntoSystemConfigs,
         system::{Commands, Query, ResMut},
     },
-    hierarchy::{BuildChildren, Parent},
+    hierarchy::Parent,
     log::info,
     math::Vec3,
     prelude::{BuildChildrenTransformExt, Res, With},
diff --git a/cosmos_server/src/persistence/loading.rs b/cosmos_server/src/persistence/loading.rs
index cd926fda6..9d97ac56a 100644
--- a/cosmos_server/src/persistence/loading.rs
+++ b/cosmos_server/src/persistence/loading.rs
@@ -12,7 +12,7 @@ use std::fs;
 use bevy::{
     ecs::schedule::{IntoSystemConfigs, IntoSystemSetConfigs, SystemSet},
     hierarchy::BuildChildren,
-    log::{error, info, warn},
+    log::{error, warn},
     prelude::{App, Commands, Component, Entity, Quat, Query, Update, With, Without},
     reflect::Reflect,
 };
diff --git a/cosmos_server/src/persistence/make_persistent.rs b/cosmos_server/src/persistence/make_persistent.rs
index 92b6eb566..d5f3644cb 100644
--- a/cosmos_server/src/persistence/make_persistent.rs
+++ b/cosmos_server/src/persistence/make_persistent.rs
@@ -146,7 +146,7 @@ pub struct EntityIdManager<'w, 's> {
     q_entity_ids: Query<'w, 's, (Entity, &'static EntityId)>,
 }
 
-impl<'w, 's> EntityIdManager<'w, 's> {
+impl EntityIdManager<'_, '_> {
     /// Gets an entity from the [`EntityId`] if one exists for that id. This will ONLY retrieve
     /// entities that are loaded in the world.
     pub fn entity_from_entity_id(&self, e_id: &EntityId) -> Option<Entity> {
diff --git a/cosmos_server/src/physics/mod.rs b/cosmos_server/src/physics/mod.rs
index 5a97c64b5..db7fa8fce 100644
--- a/cosmos_server/src/physics/mod.rs
+++ b/cosmos_server/src/physics/mod.rs
@@ -2,7 +2,7 @@
 //!
 //! Mostly used to move entities between worlds & sync up locations to their transforms.
 
-use bevy::{prelude::*, utils::HashSet};
+use bevy::prelude::*;
 use bevy_rapier3d::{
     plugin::{RapierConfiguration, RapierContextEntityLink},
     prelude::RapierContextSimulation,
@@ -10,7 +10,7 @@ use bevy_rapier3d::{
 use cosmos_core::{
     entities::player::Player,
     physics::{
-        location::{Location, LocationPhysicsSet, SECTOR_DIMENSIONS},
+        location::{Location, SECTOR_DIMENSIONS},
         player_world::{PlayerWorld, WorldWithin},
     },
 };
@@ -18,7 +18,6 @@ use cosmos_core::{
 mod collider_disabling;
 
 const WORLD_SWITCH_DISTANCE: f32 = SECTOR_DIMENSIONS / 2.0;
-const WORLD_SWITCH_DISTANCE_SQRD: f32 = WORLD_SWITCH_DISTANCE * WORLD_SWITCH_DISTANCE;
 
 fn create_physics_world(commands: &mut Commands) -> RapierContextEntityLink {
     let mut config = RapierConfiguration::new(1.0);
@@ -66,163 +65,6 @@ pub fn assign_player_world(
     }
 }
 
-fn move_players_between_worlds(
-    players: Query<(Entity, &Location), (With<WorldWithin>, With<Player>)>,
-    mut world_within_query: Query<(&mut WorldWithin, &mut RapierContextEntityLink)>,
-    mut commands: Commands,
-) {
-    let mut changed = true;
-
-    let mut getting_new_world = Vec::new();
-
-    while changed {
-        changed = false;
-
-        for (entity, location) in players.iter() {
-            let mut needs_new_world = false;
-
-            for (other_entity, other_location) in players.iter() {
-                if other_entity == entity || getting_new_world.contains(&other_entity) {
-                    continue;
-                }
-
-                let (other_world_entity, other_body_world) =
-                    world_within_query.get(other_entity).map(|(ent, world)| (ent.0, *world)).unwrap();
-
-                let (mut world_currently_in, mut body_world) = world_within_query.get_mut(entity).unwrap();
-
-                let distance = location.distance_sqrd(other_location);
-
-                if distance < WORLD_SWITCH_DISTANCE_SQRD {
-                    if world_currently_in.0 != other_world_entity {
-                        world_currently_in.0 = other_world_entity;
-                        *body_world = other_body_world;
-
-                        needs_new_world = false;
-                        changed = true;
-                    }
-                    break;
-                } else if world_currently_in.0 == other_world_entity {
-                    needs_new_world = true;
-                }
-            }
-
-            if needs_new_world {
-                getting_new_world.push(entity);
-
-                let link = create_physics_world(&mut commands);
-
-                info!("Creating new physics world!");
-                let world_entity = commands
-                    .spawn((Name::new("Player World"), PlayerWorld { player: entity }, *location, link))
-                    .id();
-
-                let (mut world_within, mut body_world) = world_within_query.get_mut(entity).unwrap();
-
-                world_within.0 = world_entity;
-                *body_world = link;
-            }
-        }
-    }
-}
-
-fn move_non_players_between_worlds(
-    mut needs_world: Query<
-        (Entity, &Location, Option<&mut WorldWithin>, Option<&mut RapierContextEntityLink>),
-        (Without<Player>, Without<Parent>),
-    >,
-    players_with_worlds: Query<(&WorldWithin, &Location, &RapierContextEntityLink), With<Player>>,
-    mut commands: Commands,
-) {
-    for (entity, location, maybe_within, maybe_body_world) in needs_world.iter_mut() {
-        let mut best_ww = None;
-        let mut best_dist = None;
-        let mut best_world_id = None;
-
-        for (ww, player_loc, body_world) in players_with_worlds.iter() {
-            let dist = player_loc.distance_sqrd(location);
-
-            if best_ww.is_none() || dist < best_dist.unwrap() {
-                best_ww = Some(*ww);
-                best_dist = Some(dist);
-                best_world_id = Some(*body_world);
-            }
-        }
-
-        if let Some(ww) = best_ww {
-            let world_link = best_world_id.expect("This should have a value if ww is some");
-
-            if let Some(mut world_within) = maybe_within {
-                let mut body_world = maybe_body_world.expect("Something should have a `RapierContextEntityLink` if it has a WorldWithin.");
-
-                if *body_world != world_link {
-                    *body_world = world_link;
-                }
-                if world_within.0 != ww.0 {
-                    world_within.0 = ww.0;
-                }
-            } else {
-                commands.entity(entity).insert(ww).insert(world_link);
-            }
-        }
-    }
-}
-
-/// Removes worlds with nothing inside of them
-///
-/// This should be run not every frame because it can be expensive and not super necessary
-fn remove_empty_worlds(
-    q_rapier_entity_links: Query<&RapierContextEntityLink>,
-    q_worlds: Query<(Entity, &RapierContextEntityLink), With<PlayerWorld>>,
-    mut commands: Commands,
-    q_rapier_contexts: Query<Entity, With<RapierContextSimulation>>,
-) {
-    let mut worlds = HashSet::new();
-
-    for w in q_rapier_entity_links.iter() {
-        worlds.insert(w.0);
-    }
-
-    let mut to_remove = Vec::new();
-    for world_id in q_rapier_contexts.iter() {
-        if !worlds.contains(&world_id) {
-            to_remove.push(world_id);
-        }
-    }
-
-    'world_loop: for world_id in to_remove {
-        // Verify that nothing else is a part of this world before removing it.
-        for body_world in q_rapier_entity_links.iter().map(|bw| bw.0) {
-            if world_id == body_world {
-                continue 'world_loop;
-            }
-        }
-
-        for (entity, bw) in q_worlds.iter() {
-            if bw.0 == world_id {
-                commands.entity(entity).despawn_recursive();
-            }
-        }
-
-        commands.entity(world_id).despawn_recursive();
-    }
-}
-
 pub(super) fn register(app: &mut App) {
     collider_disabling::register(app);
-
-    // .add_systems(
-    // Update,
-    // (), // .chain()
-    // .after(CosmosBundleSet::HandleCosmosBundles)
-    // .in_set(LocationPhysicsSet::DoPhysics)
-    // .run_if(in_state(GameState::Playing))
-    // .before(NetworkingSystemsSet::ReceiveMessages),
-    // )
-    // .add_systems(PostUpdate, fix_location)
-    // This must be last due to commands being delayed when adding PhysicsWorlds.
-    // .add_systems(
-    // Last,
-    // (move_players_between_worlds, move_non_players_between_worlds, remove_empty_worlds).chain(),
-    // )
 }

From d87048b5422d3d45479ede964a4d710cdffa6698 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 12 Jan 2025 15:42:00 -0500
Subject: [PATCH 23/31] Adding recipes

---
 ...test_crystal.png => photonium_crystal.png} | Bin
 .../assets/cosmos/lang/blocks/en_us.lang      |   2 +-
 .../assets/cosmos/lang/items/en_us.lang       |   2 +-
 cosmos_client/src/netty/gameplay/receiver.rs  |   2 +-
 cosmos_core/src/block/blocks/mod.rs           |   2 +-
 cosmos_core/src/item/items/mod.rs             |   2 +-
 cosmos_core/src/physics/location/mod.rs       |   4 +-
 cosmos_core/src/physics/location/systems.rs   |  49 ++++---
 cosmos_server/assets/cosmos/kits/starter.json |   2 +-
 .../basic_fabricator/laser_cannon.json        |   2 +-
 .../recipes/basic_fabricator/ship_core.json   |  26 ++++
 cosmos_server/config/cosmos/default_shop.json |   6 +-
 .../src/entities/player/persistence.rs        |   2 +-
 cosmos_server/src/netty/server_listener.rs    |   2 +-
 cosmos_server/src/shop/prices.rs              |   2 +-
 .../systems/energy_generation_system.rs       |   4 +-
 .../structure/systems/shield_system/mod.rs    |   7 +-
 needs_recipes.txt                             | 125 ++++++++++++++++++
 18 files changed, 198 insertions(+), 43 deletions(-)
 rename cosmos_client/assets/cosmos/images/items/{test_crystal.png => photonium_crystal.png} (100%)
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
 create mode 100644 needs_recipes.txt

diff --git a/cosmos_client/assets/cosmos/images/items/test_crystal.png b/cosmos_client/assets/cosmos/images/items/photonium_crystal.png
similarity index 100%
rename from cosmos_client/assets/cosmos/images/items/test_crystal.png
rename to cosmos_client/assets/cosmos/images/items/photonium_crystal.png
diff --git a/cosmos_client/assets/cosmos/lang/blocks/en_us.lang b/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
index daf8d5218..170cdeb0b 100644
--- a/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
+++ b/cosmos_client/assets/cosmos/lang/blocks/en_us.lang
@@ -8,7 +8,7 @@ cosmos:redwood_log=Redwood Log
 cosmos:redwood_leaf=Redwood Leaf
 cosmos:ship_core=Ship Core
 cosmos:energy_cell=Energy Cell
-cosmos:reactor=Reactor
+cosmos:passive_generator=Passive Generator
 cosmos:thruster=Thruster
 cosmos:light=Light
 cosmos:glass=Glass
diff --git a/cosmos_client/assets/cosmos/lang/items/en_us.lang b/cosmos_client/assets/cosmos/lang/items/en_us.lang
index 153823b27..d64698e16 100644
--- a/cosmos_client/assets/cosmos/lang/items/en_us.lang
+++ b/cosmos_client/assets/cosmos/lang/items/en_us.lang
@@ -1,2 +1,2 @@
-cosmos:test_crystal=Test Crystal
+cosmos:photonium_crystal=Test Crystal
 cosmos:iron_bar=Iron Bar
diff --git a/cosmos_client/src/netty/gameplay/receiver.rs b/cosmos_client/src/netty/gameplay/receiver.rs
index f55927564..c975e0a34 100644
--- a/cosmos_client/src/netty/gameplay/receiver.rs
+++ b/cosmos_client/src/netty/gameplay/receiver.rs
@@ -406,7 +406,7 @@ pub(crate) fn client_sync_players(
                 };
 
                 entity_cmds.insert((
-                    SetPosition::Location,
+                    SetPosition::Transform,
                     Transform::from_rotation(body.rotation),
                     loc,
                     body.create_velocity(),
diff --git a/cosmos_core/src/block/blocks/mod.rs b/cosmos_core/src/block/blocks/mod.rs
index 1f7576deb..43eb52081 100644
--- a/cosmos_core/src/block/blocks/mod.rs
+++ b/cosmos_core/src/block/blocks/mod.rs
@@ -76,7 +76,7 @@ fn add_cosmos_blocks(
     );
 
     blocks.register(
-        BlockBuilder::new("cosmos:reactor", 2.0, 20.0, 5.0)
+        BlockBuilder::new("cosmos:passive_generator", 2.0, 20.0, 5.0)
             .add_property(BlockProperty::Full)
             .add_connection_group("cosmos:produces_power")
             .create(),
diff --git a/cosmos_core/src/item/items/mod.rs b/cosmos_core/src/item/items/mod.rs
index 56e1db6af..2c436addb 100644
--- a/cosmos_core/src/item/items/mod.rs
+++ b/cosmos_core/src/item/items/mod.rs
@@ -14,7 +14,7 @@ fn add_cosmos_items(
 ) {
     let id = loading.register_loader(&mut start_writer);
 
-    items.register(Item::new("cosmos:test_crystal", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:photonium_crystal", DEFAULT_MAX_STACK_SIZE));
 
     items.register(Item::new("cosmos:fluid_cell", DEFAULT_MAX_STACK_SIZE));
     items.register(Item::new("cosmos:fluid_cell_filled", 1));
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 021f1fa40..57d3608d6 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -80,10 +80,10 @@ pub enum SetPosition {
     #[default]
     /// The source of truth is the [`Location`] component of this entity. The [`Transform`] will be
     /// updated to match this [`Location`].
-    Location,
+    Transform,
     /// The source of truth is the [`Transform`] component of this entity. The [`Location`] will be
     /// updated to match this [`Transform`].
-    Transform,
+    Location,
 }
 
 /// Datatype used to store sector coordinates
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 86985c897..c41022dba 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -32,7 +32,7 @@ use crate::{
 
 #[cfg(feature = "server")]
 use super::SECTOR_DIMENSIONS;
-use super::{Location, LocationPhysicsSet, Sector, SetPosition};
+use super::{Location, LocationPhysicsSet, SetPosition};
 
 #[cfg(doc)]
 use crate::netty::client::LocalPlayer;
@@ -53,29 +53,32 @@ use crate::netty::client::LocalPlayer;
 /// point for a [`PlayerWorld`].
 pub struct Anchor;
 
-fn calc_global_trans(entity: Entity, q_trans: &Query<(&Transform, Option<&Parent>)>) -> Option<Transform> {
-    let Ok((trans, parent)) = q_trans.get(entity) else {
-        error!("Inconsistent transform heirarchy!");
-        return None;
-    };
-
-    if let Some(parent) = parent {
-        calc_global_trans(parent.get(), q_trans).map(|t| t * *trans)
-    } else {
-        Some(*trans)
-    }
-}
-
 fn loc_from_trans(
     entity: Entity,
-    q_trans: &Query<(&Transform, Option<&Parent>)>,
+    q_trans: &Query<&Transform>,
     q_x: &Query<(Entity, Option<&Location>, Option<&SetPosition>)>,
+    q_g_trans: &Query<&GlobalTransform>,
+    q_parent: &Query<&Parent>,
 ) -> Option<Location> {
     let (entity, loc, set_pos) = q_x.get(entity).expect("Invalid entity given");
 
     match set_pos {
-        None | Some(SetPosition::Location) => loc.copied(),
-        Some(SetPosition::Transform) => calc_global_trans(entity, q_trans).map(|t| Location::new(t.translation, Sector::ZERO)),
+        None | Some(SetPosition::Transform) => loc.copied(),
+        Some(SetPosition::Location) => {
+            if let Ok(p) = q_parent.get(entity) {
+                let parent_g_trans = q_g_trans.get(p.get()).ok()?;
+                let my_trans = q_trans.get(entity).ok()?;
+
+                loc_from_trans(p.get(), q_trans, q_x, q_g_trans, q_parent)
+                    .map(|x| x + (parent_g_trans.rotation().inverse() * my_trans.translation))
+            } else {
+                warn!("Location set based solely on global transform - you probably didn't mean to do this.");
+                q_g_trans
+                    .get(entity)
+                    .ok()
+                    .map(|g_trans| Location::new(g_trans.translation(), Default::default()))
+            }
+        }
     }
 }
 
@@ -86,11 +89,12 @@ fn apply_set_position(
     q_location_added: Query<Entity, (Without<SetPosition>, Added<Location>)>,
     q_set_position: Query<(Entity, &SetPosition)>,
     q_x: Query<(Entity, Option<&Location>, Option<&SetPosition>)>,
-    q_trans: Query<(&Transform, Option<&Parent>)>,
+    q_trans: Query<&Transform>,
+    q_parent: Query<&Parent>,
     q_g_trans: Query<&GlobalTransform>,
     mut commands: Commands,
 ) {
-    const DEFAULT_SET_POS: SetPosition = SetPosition::Location;
+    const DEFAULT_SET_POS: SetPosition = SetPosition::Transform;
 
     for (entity, set_pos) in q_location_added
         .iter()
@@ -98,16 +102,17 @@ fn apply_set_position(
         .chain(q_set_position.iter())
     {
         match set_pos {
-            SetPosition::Location => {
+            SetPosition::Transform => {
                 let mut ecmds = commands.entity(entity);
                 if let Ok(g_trans) = q_g_trans.get(entity) {
                     ecmds.insert(LastTransformTranslation(g_trans.translation()));
                 }
                 ecmds.insert(SetTransformBasedOnLocationFlag).remove::<SetPosition>();
             }
-            SetPosition::Transform => {
-                if let Some(loc_from_trans) = loc_from_trans(entity, &q_trans, &q_x) {
+            SetPosition::Location => {
+                if let Some(loc_from_trans) = loc_from_trans(entity, &q_trans, &q_x, &q_g_trans, &q_parent) {
                     if let Ok(g_trans) = q_g_trans.get(entity) {
+                        info!("{loc_from_trans} | {}", g_trans.translation());
                         commands
                             .entity(entity)
                             .insert((loc_from_trans, LastTransformTranslation(g_trans.translation())))
diff --git a/cosmos_server/assets/cosmos/kits/starter.json b/cosmos_server/assets/cosmos/kits/starter.json
index f04ca3a3a..c7991d886 100644
--- a/cosmos_server/assets/cosmos/kits/starter.json
+++ b/cosmos_server/assets/cosmos/kits/starter.json
@@ -11,7 +11,7 @@
   },
   {
     "slot": 2,
-    "item": "cosmos:reactor",
+    "item": "cosmos:passive_generator",
     "quantity": 6
   },
   {
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
index 5392e6ebe..dde2b61bd 100644
--- a/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
@@ -8,7 +8,7 @@
     },
     {
       "item": {
-        "Item": "cosmos:test_crystal"
+        "Item": "cosmos:photonium_crystal"
       },
       "quantity": 5
     }
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
new file mode 100644
index 000000000..bba0341f1
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
@@ -0,0 +1,26 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper"
+      },
+      "quantity": 10
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 20
+    },
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:ship_core"
+  }
+}
diff --git a/cosmos_server/config/cosmos/default_shop.json b/cosmos_server/config/cosmos/default_shop.json
index da74db605..d36e06cfc 100644
--- a/cosmos_server/config/cosmos/default_shop.json
+++ b/cosmos_server/config/cosmos/default_shop.json
@@ -127,14 +127,14 @@
   },
   {
     "Selling": {
-      "item_id": "cosmos:reactor",
+      "item_id": "cosmos:passive_generator",
       "max_quantity_selling": 10000,
       "price_per": 300
     }
   },
   {
     "Buying": {
-      "item_id": "cosmos:reactor",
+      "item_id": "cosmos:passive_generator",
       "max_quantity_buying": null,
       "price_per": 270
     }
@@ -1007,4 +1007,4 @@
       "price_per": 540
     }
   }
-]
\ No newline at end of file
+]
diff --git a/cosmos_server/src/entities/player/persistence.rs b/cosmos_server/src/entities/player/persistence.rs
index e5e1011b8..289a6a7bc 100644
--- a/cosmos_server/src/entities/player/persistence.rs
+++ b/cosmos_server/src/entities/player/persistence.rs
@@ -268,7 +268,7 @@ fn finish_loading_player(
                 ActiveEvents::COLLISION_EVENTS,
                 Name::new(format!("Player ({})", load_player.name())),
                 Anchor,
-                SetPosition::Location,
+                SetPosition::Transform,
             ))
             // If we don't remove this, it won't automatically
             // generate a new one when we save the player next
diff --git a/cosmos_server/src/netty/server_listener.rs b/cosmos_server/src/netty/server_listener.rs
index b1052738c..5d63ad730 100644
--- a/cosmos_server/src/netty/server_listener.rs
+++ b/cosmos_server/src/netty/server_listener.rs
@@ -105,7 +105,7 @@ fn server_listen_messages(
                             };
 
                             *location = new_loc;
-                            commands.entity(player_entity).insert(SetPosition::Location);
+                            commands.entity(player_entity).insert(SetPosition::Transform);
                             currently_looking.rotation = looking;
                             velocity.linvel = body.body_vel.map(|x| x.linvel).unwrap_or(Vec3::ZERO);
                             transform.rotation = body.rotation;
diff --git a/cosmos_server/src/shop/prices.rs b/cosmos_server/src/shop/prices.rs
index 9d72498f3..6ec92f13d 100644
--- a/cosmos_server/src/shop/prices.rs
+++ b/cosmos_server/src/shop/prices.rs
@@ -82,7 +82,7 @@ fn create_default_shop_entires(mut commands: Commands, items: Res<Registry<Item>
             price_per: 300,
         },
         PrettyShopEntry::Selling {
-            item_id: "cosmos:reactor".into(),
+            item_id: "cosmos:passive_generator".into(),
             max_quantity_selling: 10_000,
             price_per: 300,
         },
diff --git a/cosmos_server/src/structure/systems/energy_generation_system.rs b/cosmos_server/src/structure/systems/energy_generation_system.rs
index 7039a210d..ff88081a8 100644
--- a/cosmos_server/src/structure/systems/energy_generation_system.rs
+++ b/cosmos_server/src/structure/systems/energy_generation_system.rs
@@ -22,7 +22,7 @@ use cosmos_core::{
 use super::sync::register_structure_system;
 
 fn register_energy_blocks(blocks: Res<Registry<Block>>, mut generation: ResMut<EnergyGenerationBlocks>) {
-    if let Some(block) = blocks.from_id("cosmos:reactor") {
+    if let Some(block) = blocks.from_id("cosmos:passive_generator") {
         generation.insert(block, EnergyGenerationProperty { generation_rate: 100.0 });
     }
 
@@ -111,5 +111,5 @@ pub(super) fn register(app: &mut App) {
         )
         .register_type::<EnergyGenerationSystem>();
 
-    register_structure_system::<EnergyGenerationSystem>(app, false, "cosmos:reactor");
+    register_structure_system::<EnergyGenerationSystem>(app, false, "cosmos:passive_generator");
 }
diff --git a/cosmos_server/src/structure/systems/shield_system/mod.rs b/cosmos_server/src/structure/systems/shield_system/mod.rs
index c2e9861f7..5c17ac874 100644
--- a/cosmos_server/src/structure/systems/shield_system/mod.rs
+++ b/cosmos_server/src/structure/systems/shield_system/mod.rs
@@ -33,7 +33,7 @@ use cosmos_core::{
         NettyChannelServer,
     },
     persistence::LoadingDistance,
-    physics::location::Location,
+    physics::location::{Location, SetPosition},
     projectiles::laser::LaserSystemSet,
     registry::{identifiable::Identifiable, Registry},
     state::GameState,
@@ -229,14 +229,13 @@ fn recalculate_shields_if_needed(
         commands.entity(structure_entity).with_children(|p| {
             for &(shield_coord, shield_details) in shield_details.iter().filter(|(c, _)| !done.contains(c)) {
                 let shield_pos = structure.block_relative_position(shield_coord);
-                // Locations don't account for parent rotation
-                let shield_loc = g_trans.affine().matrix3.mul_vec3(shield_pos);
+                warn!("Sheid pos: {shield_pos} | Shield coord: {shield_coord:?}");
 
                 let shield_ent = p
                     .spawn((
                         Name::new("Shield"),
                         Transform::from_translation(shield_pos),
-                        *loc + shield_loc,
+                        SetPosition::Location,
                         LoadingDistance::new(1, 2),
                         Shield {
                             max_strength: shield_details.max_strength,
diff --git a/needs_recipes.txt b/needs_recipes.txt
new file mode 100644
index 000000000..947efa2fc
--- /dev/null
+++ b/needs_recipes.txt
@@ -0,0 +1,125 @@
+cosmos:ship_core
+ - Energy Crystal 2
+ - Iron 20
+ - Copper 10
+cosmos:energy_cell
+ - Energy Crystal 1
+ - Copper 6
+cosmos:passive_generator
+ - Energy Crystal 1
+ - Copper 6
+cosmos:laser_cannon
+ - Focusing Crystal 4
+ - Copper 1
+ - Iron 2
+all ship hulls (done)
+cosmos:thruster
+ - Energy Crystal 1
+ - Iron 1
+cosmos:light
+ - Copper 1
+ - Glass 1
+all glass
+ - Sand 1
+ - Iron 1
+cosmos:build_block
+ - Gravatron 2
+ - Iron 5
+ - Copper 3
+cosmos:reactor_controller
+ - Energy Crystal 5
+ - Copper 10
+ - Lead 10
+ - Iron 20
+cosmos:reactor_casing
+ - Lead 5 
+cosmos:reactor_window
+ - Lead 5
+ - Glass
+cosmos:reactor_cell
+ - Energy Crystal 2
+ - Copper 5
+cosmos:fan
+ - Iron 1
+cosmos:storage
+ - Iron 2
+cosmos:station_core
+ - Energy Crystal 4 
+ - Iron 100 
+ - Copper 100 
+ - Gravitron 6
+cosmos:plasma_drill
+ - Iron 2
+ - Copper 1
+ - Focusing Crystal 1
+cosmos:camera
+ - Iron 2
+ - Copper 1
+ - Glass
+cosmos:gravity_well
+ - Gravatron 1
+ - Iron 2
+cosmos:ramp
+ - Iron 1
+cosmos:missile_launcher
+ - Iron 5
+ - Copper 3
+cosmos:shield_projector
+ - Focusing Crystal 6
+ - Copper 10
+cosmos:shield_generator
+ - Energy Crystal 6
+ - Copper 10
+cosmos:logic_on
+ - Copper 2
+ - Energy Crystal 1
+cosmos:power_cable
+ - Copper 1
+cosmos:ship_dock
+ - Copper 10
+ - Gravatron 1
+ - Iron 4
+cosmos:tank
+ - Glass 1
+ - Iron 1
+cosmos:logic_indicator
+ - Light 1
+ - Copper 1
+cosmos:and_gate
+ - Copper 1
+ - Iron 1
+cosmos:or_gate
+ - Copper 1
+ - Iron 1
+cosmos:not_gate
+ - Copper 1
+ - Iron 1
+cosmos:xor_gate
+ - Copper 1
+ - Iron 1
+cosmos:logic_bus
+ - Copper 2
+cosmos:door
+ - Iron 1
+ - Copper 2
+cosmos:basic_fabricator
+ - Iron 2
+ - Copper 2
+
+cosmos:fluid_cell
+ - Iron 2
+cosmos:missile
+ - Sulfur 5
+ - Iron 2
+cosmos:fuel_cell
+ - Uranium 10
+
+cosmos:photonium_crystal -> cosmos:focusing_crystal?
+
+TO Add:
+- Copper
+- Sulfur
+- Energy Crystals
+- Gravatron Crystals
+- Uranium
+- Lead

From e12753e6d108146c281118d98e3743476a2d015b Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Sun, 12 Jan 2025 16:18:35 -0500
Subject: [PATCH 24/31] Adding all recipes

---
 cosmos_core/src/block/blocks/mod.rs           |  36 +++++
 cosmos_core/src/item/items/mod.rs             |   7 +
 .../recipes/basic_fabricator/and_gate.json    |  20 +++
 .../basic_fabricator/basic_fabricator.json    |  20 +++
 .../recipes/basic_fabricator/build_block.json |  26 ++++
 .../recipes/basic_fabricator/camera.json      |  26 ++++
 .../cosmos/recipes/basic_fabricator/door.json |  20 +++
 .../recipes/basic_fabricator/energy_cell.json |  20 +++
 .../cosmos/recipes/basic_fabricator/fan.json  |  14 ++
 .../recipes/basic_fabricator/fluid_cell.json  |  14 ++
 .../recipes/basic_fabricator/fuel_cell.json   |  14 ++
 .../recipes/basic_fabricator/glass.json       |  20 +++
 .../basic_fabricator/gravity_well.json        |  20 +++
 .../basic_fabricator/laser_cannon.json        |   8 +-
 .../recipes/basic_fabricator/light.json       |  20 +++
 .../recipes/basic_fabricator/logic_bus.json   |  14 ++
 .../basic_fabricator/logic_indicator.json     |  20 +++
 .../recipes/basic_fabricator/logic_on.json    |  20 +++
 .../recipes/basic_fabricator/missile.json     |  20 +++
 .../basic_fabricator/missile_launcher.json    |  20 +++
 .../recipes/basic_fabricator/not_gate.json    |  20 +++
 .../recipes/basic_fabricator/or_gate.json     |  20 +++
 .../basic_fabricator/passive_generator.json   |  20 +++
 .../basic_fabricator/plasma_drill.json        |  26 ++++
 .../recipes/basic_fabricator/power_cable.json |  14 ++
 .../cosmos/recipes/basic_fabricator/ramp.json |  14 ++
 .../basic_fabricator/reactor_casing.json      |  14 ++
 .../basic_fabricator/reactor_cell.json        |  20 +++
 .../basic_fabricator/reactor_controller.json  |  32 +++++
 .../basic_fabricator/reactor_window.json      |  20 +++
 .../basic_fabricator/shield_generator.json    |  20 +++
 .../basic_fabricator/shield_projector.json    |  20 +++
 .../recipes/basic_fabricator/ship_core.json   |   2 +-
 .../recipes/basic_fabricator/ship_dock.json   |  26 ++++
 .../basic_fabricator/station_core.json        |  32 +++++
 .../recipes/basic_fabricator/storage.json     |  14 ++
 .../cosmos/recipes/basic_fabricator/tank.json |  20 +++
 .../recipes/basic_fabricator/thruster.json    |  20 +++
 .../recipes/basic_fabricator/uranium.json     |  14 ++
 .../recipes/basic_fabricator/xor_gate.json    |  20 +++
 needs_recipes.txt                             | 125 ------------------
 41 files changed, 765 insertions(+), 127 deletions(-)
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/and_gate.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/basic_fabricator.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/build_block.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/camera.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/door.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/energy_cell.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/fan.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/fluid_cell.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/fuel_cell.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/glass.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/gravity_well.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/light.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_bus.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_indicator.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_on.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/missile.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/missile_launcher.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/not_gate.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/or_gate.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/passive_generator.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/plasma_drill.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/power_cable.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/ramp.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_casing.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_cell.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_controller.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_window.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_generator.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_projector.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_dock.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/station_core.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/storage.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/tank.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/thruster.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/uranium.json
 create mode 100644 cosmos_server/assets/cosmos/recipes/basic_fabricator/xor_gate.json

diff --git a/cosmos_core/src/block/blocks/mod.rs b/cosmos_core/src/block/blocks/mod.rs
index 43eb52081..8e380584a 100644
--- a/cosmos_core/src/block/blocks/mod.rs
+++ b/cosmos_core/src/block/blocks/mod.rs
@@ -492,6 +492,42 @@ fn add_cosmos_blocks(
             .create(),
     );
 
+    blocks.register(
+        BlockBuilder::new("cosmos:copper_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:lead_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:uranium_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:sulfur_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:gravitron_crystal_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
+    blocks.register(
+        BlockBuilder::new("cosmos:energite_crystal_ore", 10.0, 50.0, 12.0)
+            .add_property(BlockProperty::Full)
+            .create(),
+    );
+
     loading.finish_loading(id, &mut end_writer);
 }
 
diff --git a/cosmos_core/src/item/items/mod.rs b/cosmos_core/src/item/items/mod.rs
index 2c436addb..066514286 100644
--- a/cosmos_core/src/item/items/mod.rs
+++ b/cosmos_core/src/item/items/mod.rs
@@ -21,6 +21,13 @@ fn add_cosmos_items(
 
     items.register(Item::new("cosmos:iron_bar", DEFAULT_MAX_STACK_SIZE));
 
+    items.register(Item::new("cosmos:copper_bar", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:lead_bar", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:uranium", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:sulfur", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:gravitron_crystal", DEFAULT_MAX_STACK_SIZE));
+    items.register(Item::new("cosmos:energite_crystal", DEFAULT_MAX_STACK_SIZE));
+
     loading.finish_loading(id, &mut end_writer);
 }
 
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/and_gate.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/and_gate.json
new file mode 100644
index 000000000..5b57ce3b6
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/and_gate.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:and_gate"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/basic_fabricator.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/basic_fabricator.json
new file mode 100644
index 000000000..6feeecab4
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/basic_fabricator.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:basic_fabricator"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/build_block.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/build_block.json
new file mode 100644
index 000000000..c81aef0a8
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/build_block.json
@@ -0,0 +1,26 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:gravitron_crystal"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 5
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 3
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:build_block"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/camera.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/camera.json
new file mode 100644
index 000000000..05ad97b88
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/camera.json
@@ -0,0 +1,26 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:glass"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:camera"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/door.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/door.json
new file mode 100644
index 000000000..a6e126ef3
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/door.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:door"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/energy_cell.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/energy_cell.json
new file mode 100644
index 000000000..f1fabd0a5
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/energy_cell.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 6
+    },
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:energy_cell"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/fan.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fan.json
new file mode 100644
index 000000000..982a50ae8
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fan.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:iron_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:fan"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/fluid_cell.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fluid_cell.json
new file mode 100644
index 000000000..773d9d644
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fluid_cell.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:fluid_cell"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/fuel_cell.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fuel_cell.json
new file mode 100644
index 000000000..eb097ead9
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/fuel_cell.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:uranium"
+      },
+      "quantity": 10
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:fuel_cell"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/glass.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/glass.json
new file mode 100644
index 000000000..e42c36c03
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/glass.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:sand"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:glass"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/gravity_well.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/gravity_well.json
new file mode 100644
index 000000000..759fcde50
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/gravity_well.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:gravitron_crystal"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:build_block"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
index dde2b61bd..66babc445 100644
--- a/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/laser_cannon.json
@@ -10,7 +10,13 @@
       "item": {
         "Item": "cosmos:photonium_crystal"
       },
-      "quantity": 5
+      "quantity": 4
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
     }
   ],
   "output": {
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/light.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/light.json
new file mode 100644
index 000000000..219f48498
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/light.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:glass"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:light"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_bus.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_bus.json
new file mode 100644
index 000000000..72e92acf2
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_bus.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:logic_bus"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_indicator.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_indicator.json
new file mode 100644
index 000000000..110c20aa4
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_indicator.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:light"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:logic_indicator"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_on.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_on.json
new file mode 100644
index 000000000..c3c0a967b
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/logic_on.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      }
+    },
+    {
+      "quantity": 2,
+      "item": {
+        "Item": "cosmos:copper_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:logic_on"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile.json
new file mode 100644
index 000000000..da0b9d043
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:sulfur"
+      },
+      "quantity": 5
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 2
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:missile"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile_launcher.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile_launcher.json
new file mode 100644
index 000000000..6122330ba
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/missile_launcher.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "quantity": 5,
+      "item": {
+        "Item": "cosmos:iron_bar"
+      }
+    },
+    {
+      "quantity": 3,
+      "item": {
+        "Item": "cosmos:copper_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:missile_launcher"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/not_gate.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/not_gate.json
new file mode 100644
index 000000000..d2f43e1d9
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/not_gate.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:not_gate"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/or_gate.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/or_gate.json
new file mode 100644
index 000000000..de7156258
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/or_gate.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:or_gate"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/passive_generator.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/passive_generator.json
new file mode 100644
index 000000000..42f8ce9a9
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/passive_generator.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 6
+    },
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:passive_generator"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/plasma_drill.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/plasma_drill.json
new file mode 100644
index 000000000..a983b27d5
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/plasma_drill.json
@@ -0,0 +1,26 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:iron_bar"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:photonium_crystal"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:plasma_drill"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/power_cable.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/power_cable.json
new file mode 100644
index 000000000..81dd93196
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/power_cable.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:copper_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 8,
+    "item": "cosmos:power_cable"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/ramp.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ramp.json
new file mode 100644
index 000000000..2db79358c
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ramp.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:iron_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:ramp"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_casing.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_casing.json
new file mode 100644
index 000000000..2b0f0411d
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_casing.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:lead_bar"
+      },
+      "quantity": 5
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:reactor_casing"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_cell.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_cell.json
new file mode 100644
index 000000000..89fccdf0c
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_cell.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 2
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 5
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:reactor_cell"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_controller.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_controller.json
new file mode 100644
index 000000000..83d439ee2
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_controller.json
@@ -0,0 +1,32 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 5
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 10
+    },
+    {
+      "item": {
+        "Item": "cosmos:lead_bar"
+      },
+      "quantity": 20
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 10
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:reactor_controller"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_window.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_window.json
new file mode 100644
index 000000000..d92eaa26a
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/reactor_window.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:lead_bar"
+      },
+      "quantity": 5
+    },
+    {
+      "item": {
+        "Item": "cosmos:glass"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:reactor_window"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_generator.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_generator.json
new file mode 100644
index 000000000..8a0ccb250
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_generator.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 6
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 10
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:shield_generator"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_projector.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_projector.json
new file mode 100644
index 000000000..afcb72953
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/shield_projector.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:photonium_crystal"
+      },
+      "quantity": 6
+    },
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 10
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:shield_projector"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
index bba0341f1..abab7b007 100644
--- a/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_core.json
@@ -2,7 +2,7 @@
   "inputs": [
     {
       "item": {
-        "Item": "cosmos:copper"
+        "Item": "cosmos:copper_bar"
       },
       "quantity": 10
     },
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_dock.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_dock.json
new file mode 100644
index 000000000..e0946e334
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/ship_dock.json
@@ -0,0 +1,26 @@
+{
+  "inputs": [
+    {
+      "quantity": 10,
+      "item": {
+        "Item": "cosmos:copper_bar"
+      }
+    },
+    {
+      "quantity": 4,
+      "item": {
+        "Item": "cosmos:iron"
+      }
+    },
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:gravitron_crystal"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:ship_dock"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/station_core.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/station_core.json
new file mode 100644
index 000000000..269ac9281
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/station_core.json
@@ -0,0 +1,32 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 100
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 100
+    },
+    {
+      "item": {
+        "Item": "cosmos:energite_crystal"
+      },
+      "quantity": 4
+    },
+    {
+      "item": {
+        "Item": "cosmos:gravitron_crystal"
+      },
+      "quantity": 4
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:station_core"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/storage.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/storage.json
new file mode 100644
index 000000000..4e1ea3a96
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/storage.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "quantity": 2,
+      "item": {
+        "Item": "cosmos:iron_bar"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:storage"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/tank.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/tank.json
new file mode 100644
index 000000000..e10148ad1
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/tank.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:iron_bar"
+      }
+    },
+    {
+      "quantity": 1,
+      "item": {
+        "Item": "cosmos:glass"
+      }
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:tank"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/thruster.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/thruster.json
new file mode 100644
index 000000000..8c10be741
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/thruster.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:iron_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:photonium_crystal"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:thruster"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/uranium.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/uranium.json
new file mode 100644
index 000000000..56086d4e6
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/uranium.json
@@ -0,0 +1,14 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:uranium_ore"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:uranium"
+  }
+}
diff --git a/cosmos_server/assets/cosmos/recipes/basic_fabricator/xor_gate.json b/cosmos_server/assets/cosmos/recipes/basic_fabricator/xor_gate.json
new file mode 100644
index 000000000..d75288556
--- /dev/null
+++ b/cosmos_server/assets/cosmos/recipes/basic_fabricator/xor_gate.json
@@ -0,0 +1,20 @@
+{
+  "inputs": [
+    {
+      "item": {
+        "Item": "cosmos:copper_bar"
+      },
+      "quantity": 1
+    },
+    {
+      "item": {
+        "Item": "cosmos:iron"
+      },
+      "quantity": 1
+    }
+  ],
+  "output": {
+    "quantity": 1,
+    "item": "cosmos:xor_gate"
+  }
+}
diff --git a/needs_recipes.txt b/needs_recipes.txt
index 947efa2fc..e69de29bb 100644
--- a/needs_recipes.txt
+++ b/needs_recipes.txt
@@ -1,125 +0,0 @@
-cosmos:ship_core
- - Energy Crystal 2
- - Iron 20
- - Copper 10
-cosmos:energy_cell
- - Energy Crystal 1
- - Copper 6
-cosmos:passive_generator
- - Energy Crystal 1
- - Copper 6
-cosmos:laser_cannon
- - Focusing Crystal 4
- - Copper 1
- - Iron 2
-all ship hulls (done)
-cosmos:thruster
- - Energy Crystal 1
- - Iron 1
-cosmos:light
- - Copper 1
- - Glass 1
-all glass
- - Sand 1
- - Iron 1
-cosmos:build_block
- - Gravatron 2
- - Iron 5
- - Copper 3
-cosmos:reactor_controller
- - Energy Crystal 5
- - Copper 10
- - Lead 10
- - Iron 20
-cosmos:reactor_casing
- - Lead 5 
-cosmos:reactor_window
- - Lead 5
- - Glass
-cosmos:reactor_cell
- - Energy Crystal 2
- - Copper 5
-cosmos:fan
- - Iron 1
-cosmos:storage
- - Iron 2
-cosmos:station_core
- - Energy Crystal 4 
- - Iron 100 
- - Copper 100 
- - Gravitron 6
-cosmos:plasma_drill
- - Iron 2
- - Copper 1
- - Focusing Crystal 1
-cosmos:camera
- - Iron 2
- - Copper 1
- - Glass
-cosmos:gravity_well
- - Gravatron 1
- - Iron 2
-cosmos:ramp
- - Iron 1
-cosmos:missile_launcher
- - Iron 5
- - Copper 3
-cosmos:shield_projector
- - Focusing Crystal 6
- - Copper 10
-cosmos:shield_generator
- - Energy Crystal 6
- - Copper 10
-cosmos:logic_on
- - Copper 2
- - Energy Crystal 1
-cosmos:power_cable
- - Copper 1
-cosmos:ship_dock
- - Copper 10
- - Gravatron 1
- - Iron 4
-cosmos:tank
- - Glass 1
- - Iron 1
-cosmos:logic_indicator
- - Light 1
- - Copper 1
-cosmos:and_gate
- - Copper 1
- - Iron 1
-cosmos:or_gate
- - Copper 1
- - Iron 1
-cosmos:not_gate
- - Copper 1
- - Iron 1
-cosmos:xor_gate
- - Copper 1
- - Iron 1
-cosmos:logic_bus
- - Copper 2
-cosmos:door
- - Iron 1
- - Copper 2
-cosmos:basic_fabricator
- - Iron 2
- - Copper 2
-
-cosmos:fluid_cell
- - Iron 2
-cosmos:missile
- - Sulfur 5
- - Iron 2
-cosmos:fuel_cell
- - Uranium 10
-
-cosmos:photonium_crystal -> cosmos:focusing_crystal?
-
-TO Add:
-- Copper
-- Sulfur
-- Energy Crystals
-- Gravatron Crystals
-- Uranium
-- Lead

From 3676b56d8af5537d4f38aff4753c75fefcadaa61 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Tue, 14 Jan 2025 23:30:28 -0500
Subject: [PATCH 25/31] Fixed location drift of children

---
 .../{reactor.json => passive_generator.json}  |   0
 .../{reactor.png => passive_generator.png}    | Bin
 .../crafting/blocks/basic_fabricator/ui.rs    | 148 +++++++++---------
 cosmos_client/src/inventory/mod.rs            |  42 ++++-
 .../ship/pilot_change_event_listener.rs       |   4 +-
 cosmos_core/src/physics/location/mod.rs       |  29 +++-
 cosmos_core/src/physics/location/systems.rs   |  81 +++++++---
 cosmos_server/assets/cosmos/kits/starter.json |   5 +
 needs_recipes.txt                             |   1 +
 9 files changed, 206 insertions(+), 104 deletions(-)
 rename cosmos_client/assets/cosmos/blocks/{reactor.json => passive_generator.json} (100%)
 rename cosmos_client/assets/cosmos/images/blocks/{reactor.png => passive_generator.png} (100%)

diff --git a/cosmos_client/assets/cosmos/blocks/reactor.json b/cosmos_client/assets/cosmos/blocks/passive_generator.json
similarity index 100%
rename from cosmos_client/assets/cosmos/blocks/reactor.json
rename to cosmos_client/assets/cosmos/blocks/passive_generator.json
diff --git a/cosmos_client/assets/cosmos/images/blocks/reactor.png b/cosmos_client/assets/cosmos/images/blocks/passive_generator.png
similarity index 100%
rename from cosmos_client/assets/cosmos/images/blocks/reactor.png
rename to cosmos_client/assets/cosmos/images/blocks/passive_generator.png
diff --git a/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
index b2785aef8..b26d481a2 100644
--- a/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
+++ b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
@@ -8,7 +8,7 @@ use bevy::{
         IntoSystemConfigs, Query, Res, Text, With,
     },
     text::TextFont,
-    ui::{AlignItems, BackgroundColor, FlexDirection, JustifyContent, Node, TargetCamera, UiRect, Val},
+    ui::{AlignItems, BackgroundColor, DrawUiMaterial, DrawUiMaterialNode, FlexDirection, JustifyContent, Node, TargetCamera, UiRect, Val},
 };
 use cosmos_core::{
     crafting::{
@@ -41,6 +41,7 @@ use crate::{
     ui::{
         components::{
             button::{register_button, Button, ButtonEvent, ButtonStyles},
+            scollable_container::ScrollBox,
             window::GuiWindow,
         },
         font::DefaultFont,
@@ -149,93 +150,96 @@ fn populate_menu(
         let mut slot_ents = vec![];
 
         ecmds.with_children(|p| {
-            p.spawn((Node {
-                flex_grow: 1.0,
-                flex_direction: FlexDirection::Column,
-                ..Default::default()
-            },))
-                .with_children(|p| {
-                    for recipe in crafting_recipes.iter() {
+            p.spawn((
+                ScrollBox::default(),
+                Node {
+                    flex_grow: 1.0,
+                    flex_direction: FlexDirection::Column,
+                    ..Default::default()
+                },
+            ))
+            .with_children(|p| {
+                for recipe in crafting_recipes.iter() {
+                    p.spawn((
+                        Node {
+                            height: Val::Px(100.0),
+                            width: Val::Percent(100.0),
+                            justify_content: JustifyContent::SpaceBetween,
+                            ..Default::default()
+                        },
+                        Button::<SelectItemEvent>::default(),
+                        Recipe(recipe.clone()),
+                    ))
+                    .with_children(|p| {
                         p.spawn((
                             Node {
-                                height: Val::Px(100.0),
-                                width: Val::Percent(100.0),
-                                justify_content: JustifyContent::SpaceBetween,
+                                width: Val::Px(64.0),
+                                height: Val::Px(64.0),
+                                margin: UiRect::all(Val::Auto),
+                                ..Default::default()
+                            },
+                            RenderItem {
+                                item_id: recipe.output.item,
+                            },
+                        ));
+
+                        let item = items.from_numeric_id(recipe.output.item);
+                        let name = lang.get_name_from_id(item.unlocalized_name()).unwrap_or(item.unlocalized_name());
+
+                        p.spawn((
+                            Name::new("Item name + inputs display"),
+                            Node {
+                                width: Val::Percent(80.0),
+                                flex_direction: FlexDirection::Column,
+                                justify_content: JustifyContent::SpaceEvenly,
                                 ..Default::default()
                             },
-                            Button::<SelectItemEvent>::default(),
-                            Recipe(recipe.clone()),
                         ))
                         .with_children(|p| {
                             p.spawn((
                                 Node {
-                                    width: Val::Px(64.0),
-                                    height: Val::Px(64.0),
-                                    margin: UiRect::all(Val::Auto),
+                                    width: Val::Percent(100.0),
+                                    // margin: UiRect::vertical(Val::Auto),
                                     ..Default::default()
                                 },
-                                RenderItem {
-                                    item_id: recipe.output.item,
-                                },
+                                Text::new(format!("{}x {}", recipe.output.quantity, name)),
+                                text_style.clone(),
                             ));
 
-                            let item = items.from_numeric_id(recipe.output.item);
-                            let name = lang.get_name_from_id(item.unlocalized_name()).unwrap_or(item.unlocalized_name());
-
-                            p.spawn((
-                                Name::new("Item name + inputs display"),
-                                Node {
-                                    width: Val::Percent(80.0),
-                                    flex_direction: FlexDirection::Column,
-                                    justify_content: JustifyContent::SpaceEvenly,
-                                    ..Default::default()
-                                },
-                            ))
+                            p.spawn(Node {
+                                flex_direction: FlexDirection::Row,
+                                width: Val::Percent(100.0),
+                                ..Default::default()
+                            })
                             .with_children(|p| {
-                                p.spawn((
-                                    Node {
-                                        width: Val::Percent(100.0),
-                                        // margin: UiRect::vertical(Val::Auto),
-                                        ..Default::default()
-                                    },
-                                    Text::new(format!("{}x {}", recipe.output.quantity, name)),
-                                    text_style.clone(),
-                                ));
-
-                                p.spawn(Node {
-                                    flex_direction: FlexDirection::Row,
-                                    width: Val::Percent(100.0),
-                                    ..Default::default()
-                                })
-                                .with_children(|p| {
-                                    for item in recipe.inputs.iter() {
-                                        let RecipeItem::Item(item_id) = item.item;
-
+                                for item in recipe.inputs.iter() {
+                                    let RecipeItem::Item(item_id) = item.item;
+
+                                    p.spawn((
+                                        Node {
+                                            width: Val::Px(64.0),
+                                            height: Val::Px(64.0),
+                                            flex_direction: FlexDirection::Column,
+                                            align_items: AlignItems::End,
+                                            justify_content: JustifyContent::End,
+                                            ..Default::default()
+                                        },
+                                        RenderItem { item_id },
+                                    ))
+                                    .with_children(|p| {
                                         p.spawn((
-                                            Node {
-                                                width: Val::Px(64.0),
-                                                height: Val::Px(64.0),
-                                                flex_direction: FlexDirection::Column,
-                                                align_items: AlignItems::End,
-                                                justify_content: JustifyContent::End,
-                                                ..Default::default()
-                                            },
-                                            RenderItem { item_id },
-                                        ))
-                                        .with_children(|p| {
-                                            p.spawn((
-                                                Name::new("Item recipe qty"),
-                                                TextNeedsTopRoot,
-                                                Text::new(format!("{}", item.quantity)),
-                                                text_style.clone(),
-                                            ));
-                                        });
-                                    }
-                                });
+                                            Name::new("Item recipe qty"),
+                                            TextNeedsTopRoot,
+                                            Text::new(format!("{}", item.quantity)),
+                                            text_style.clone(),
+                                        ));
+                                    });
+                                }
                             });
                         });
-                    }
-                });
+                    });
+                }
+            });
 
             p.spawn((
                 Name::new("Footer"),
diff --git a/cosmos_client/src/inventory/mod.rs b/cosmos_client/src/inventory/mod.rs
index a3aa68229..64cf4ba93 100644
--- a/cosmos_client/src/inventory/mod.rs
+++ b/cosmos_client/src/inventory/mod.rs
@@ -953,22 +953,48 @@ enum InventorySet {
     MoveWindows,
 }
 
+fn rec_make_render_middle_camera(
+    ent: Entity,
+    q_mid_cam: &Query<Entity, With<UiTopRoot>>,
+    q_children: &Query<&Children>,
+    q_target_cam: &mut Query<(Entity, &mut TargetCamera), (Changed<TargetCamera>, With<TextNeedsTopRoot>)>,
+    q_needs_target_cam: &Query<Entity, (Without<TargetCamera>, With<TextNeedsTopRoot>)>,
+    commands: &mut Commands,
+) {
+    let middle_camera_entity = q_mid_cam.single();
+
+    if let Ok((_, mut target_camera)) = q_target_cam.get_mut(ent) {
+        if target_camera.0 != middle_camera_entity {
+            target_camera.0 = middle_camera_entity;
+        }
+        if let Ok(children) = q_children.get(ent) {
+            for c in children.iter() {
+                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, q_needs_target_cam, commands);
+            }
+        }
+    } else {
+        commands.entity(ent).insert(TargetCamera(middle_camera_entity));
+        if let Ok(children) = q_children.get(ent) {
+            for c in children.iter() {
+                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, q_needs_target_cam, commands);
+            }
+        }
+    }
+}
+
 fn make_render_middle_camera(
     q_mid_cam: Query<Entity, With<UiTopRoot>>,
-    mut q_target_cam: Query<&mut TargetCamera, (Changed<TargetCamera>, With<TextNeedsTopRoot>)>,
+    q_children: Query<&Children>,
+    mut q_target_cam: Query<(Entity, &mut TargetCamera), (Changed<TargetCamera>, With<TextNeedsTopRoot>)>,
     q_needs_target_cam: Query<Entity, (Without<TargetCamera>, With<TextNeedsTopRoot>)>,
     mut commands: Commands,
 ) {
-    for mut target_camera in q_target_cam.iter_mut() {
-        let middle_camera_entity = q_mid_cam.single();
-        if target_camera.0 != middle_camera_entity {
-            target_camera.0 = middle_camera_entity;
-        }
+    for ent in q_target_cam.iter().map(|x| x.0).collect::<Vec<Entity>>() {
+        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &q_needs_target_cam, &mut commands);
     }
 
     for ent in q_needs_target_cam.iter() {
-        let middle_camera_entity = q_mid_cam.single();
-        commands.entity(ent).insert(TargetCamera(middle_camera_entity));
+        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &q_needs_target_cam, &mut commands);
     }
 }
 
diff --git a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
index 0b8242198..4b226a98e 100644
--- a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
+++ b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
@@ -68,9 +68,7 @@ fn event_listener(
 ///
 /// TODO: Having to do this is mega lame, find a better solution to this problem please.
 fn keep_pilot_centered(mut q_pilot_transform: Query<&mut Transform, (With<Pilot>, With<Player>)>) {
-    for mut trans in q_pilot_transform.iter_mut() {
-        trans.translation = Vec3::new(0.5, -0.25, 0.5);
-    }
+    for mut trans in q_pilot_transform.iter_mut() {}
 }
 
 #[derive(Debug, Event)]
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 57d3608d6..54e989c1b 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -20,6 +20,7 @@ use std::{
 #[cfg(doc)]
 use bevy::prelude::Transform;
 use bevy::{
+    log::info,
     prelude::{App, Component, Deref, DerefMut, SystemSet, Update, Vec3},
     reflect::Reflect,
 };
@@ -395,19 +396,21 @@ impl Location {
     ///
     /// If not, the sector coordinates & `local` will be modified to maintain this
     pub fn fix_bounds(&mut self) {
-        let over_x = (self.local.x / (SECTOR_DIMENSIONS / 2.0)) as i64;
+        const SD2: f32 = SECTOR_DIMENSIONS / 2.0;
+
+        let over_x = ((self.local.x + SD2) / SECTOR_DIMENSIONS).floor() as i64;
         if over_x != 0 {
             self.local.x -= over_x as f32 * SECTOR_DIMENSIONS;
             self.sector.set_x(self.sector.x() + over_x);
         }
 
-        let over_y = (self.local.y / (SECTOR_DIMENSIONS / 2.0)) as i64;
+        let over_y = ((self.local.y + SD2) / SECTOR_DIMENSIONS).floor() as i64;
         if over_y != 0 {
             self.local.y -= over_y as f32 * SECTOR_DIMENSIONS;
             self.sector.set_y(self.sector.y() + over_y);
         }
 
-        let over_z = (self.local.z / (SECTOR_DIMENSIONS / 2.0)) as i64;
+        let over_z = ((self.local.z + SD2) / SECTOR_DIMENSIONS).floor() as i64;
         if over_z != 0 {
             self.local.z -= over_z as f32 * SECTOR_DIMENSIONS;
             self.sector.set_z(self.sector.z() + over_z);
@@ -604,4 +607,24 @@ mod tests {
 
         assert_eq!(l1.relative_coords_to(&l2), result);
     }
+
+    #[test]
+    fn test_loc_adding_zero() {
+        let l1 = Location::ZERO;
+        let l2 = Location::new(Vec3::new(-9999.0, -9999.0, -9999.0), Sector::new(-9, 100, 0));
+
+        let res = l1 + l2;
+
+        assert_eq!(l2, res);
+    }
+
+    #[test]
+    fn test_loc_adding() {
+        let l1 = Location::new(Vec3::new(-100.0, -100.0, -100.0), Sector::new(10, -10, 12));
+        let l2 = Location::new(Vec3::new(-9999.0, -9999.0, -9999.0), Sector::new(-9, 100, 0));
+
+        let res = l1 + l2;
+
+        assert_eq!(Location::new(Vec3::new(9901.0, 9901.0, 9901.0), Sector::new(0, 89, 11)), res);
+    }
 }
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index c41022dba..367c3512b 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -8,8 +8,11 @@
 //!
 //!
 
+use std::time::Duration;
+
 use bevy::{
     prelude::*,
+    time::common_conditions::on_timer,
     transform::systems::{propagate_transforms, sync_simple_transforms},
 };
 
@@ -356,6 +359,7 @@ type TransformLocationQuery<'w, 's> = Query<
     'w,
     's,
     (
+        &'static Name,
         &'static mut Location,
         Option<&'static mut Transform>,
         Option<&'static PreviousLocation>,
@@ -406,7 +410,7 @@ fn recursively_sync_transforms_and_locations(
     q_data: &mut TransformLocationQuery,
     q_children: &Query<&Children>,
 ) {
-    let Ok((mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+    let Ok((name, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
         return;
     };
 
@@ -418,24 +422,59 @@ fn recursively_sync_transforms_and_locations(
         if set_trans.is_some() {
             my_transform.translation = parent_g_rot.inverse().normalize() * ((*my_loc - parent_loc).absolute_coords_f32());
         } else {
-            let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
-
-            let parent_delta_loc = parent_loc - parent_prev_loc;
-            delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
-
-            let delta_local_trans = delta_g_trans - parent_delta_g_trans;
-
+            // Calculates the change in location since the last time this ran
             // WARNING: THIS COULD BLOW UP if the delta loc is huge in f32 coords. Idk how to do this better
-            // though.
-            let delta_loc = my_prev_loc.map(|x| (*my_loc - x.0).absolute_coords_f32()).unwrap_or(Vec3::ZERO);
-            *my_loc = *my_loc + delta_local_trans + parent_delta_loc;
-            let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
-            let my_local_location_based_trans = parent_g_rot.inverse().normalize() * my_local_rotated_trans;
+            let delta_loc = (*my_loc - my_prev_loc.map(|x| x.0).unwrap_or(*my_loc)).absolute_coords_f32();
 
-            my_transform.translation = my_local_location_based_trans;
+            // Applies that change to the transform
+            let delta = parent_g_rot.inverse().mul_vec3(delta_loc);
+            if delta != Vec3::ZERO {
+                my_transform.translation += delta;
+            }
+
+            // Calculates how far away the entity was from its parent + its delta location.
+            let transform_delta_parent = parent_g_rot.mul_vec3(my_transform.translation);
+            let new_loc = parent_loc + transform_delta_parent;
+            if *my_loc != new_loc {
+                info!("{name}: {} -> {new_loc}", *my_loc);
+                *my_loc = new_loc;
+            }
+            // info!("{name}: {transform_delta_parent} / {}", *my_loc);
+
+            // let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
+            //
+            // let parent_delta_loc = parent_loc - parent_prev_loc;
+            // delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
+            //
+            // let delta_local_trans = delta_g_trans - parent_delta_g_trans;
+            // if name.contains("Player") {
+            //     info!("PLAYER DELTA: {}", delta_local_trans);
+            //     info!(
+            //         "Player T: {:?}; G T: {:?}; PREV T: {:?}; PARENT_GT: {:?}",
+            //         my_transform.translation,
+            //         g_trans,
+            //         last_trans_trans.map(|x| x.0).unwrap_or(Vec3::ZERO),
+            //         parent_g_trans
+            //     );
+            // }
+            //
+            //             // // though.
+            // let delta_loc = my_prev_loc.map(|x| (*my_loc - x.0).absolute_coords_f32()).unwrap_or(Vec3::ZERO);
+            // let my_new_loc = *my_loc + delta_local_trans + parent_delta_loc;
+            // if *my_loc != my_new_loc {
+            //     *my_loc = my_new_loc;
+            // }
+            // let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
+            // let my_local_location_based_trans = parent_g_rot.inverse().normalize() * my_local_rotated_trans;
+            //
+            // info!("{}, {}", name, my_local_location_based_trans - my_transform.translation);
+            // // Change detection limiting
+            // if my_transform.translation != my_local_location_based_trans {
+            //     my_transform.translation = my_local_location_based_trans;
+            // }
 
             // Changes in location mess up the children.
-            delta_g_trans += delta_loc;
+            // delta_g_trans += delta_loc;
         }
 
         (my_transform.translation, my_transform.rotation, delta_g_trans)
@@ -455,7 +494,7 @@ fn recursively_sync_transforms_and_locations(
         .remove::<SetTransformBasedOnLocationFlag>();
 
     let my_loc = *my_loc;
-    let my_g_rot = parent_g_rot.mul_quat(local_rotation);
+    let my_g_rot = parent_g_rot * local_rotation;
     let my_prev_loc = my_prev_loc.map(|x| x.0).unwrap_or(my_loc);
 
     if let Ok(children) = q_children.get(ent) {
@@ -481,7 +520,7 @@ pub(super) fn register(app: &mut App) {
         (
             (sync_simple_transforms, propagate_transforms).chain(), // TODO: Maybe not this?
             apply_set_position,
-            reposition_worlds_around_anchors,
+            reposition_worlds_around_anchors.run_if(on_timer(Duration::from_secs(5))),
             #[cfg(feature = "server")]
             (move_anchors_between_worlds, move_non_anchors_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
@@ -493,5 +532,11 @@ pub(super) fn register(app: &mut App) {
             .in_set(NetworkingSystemsSet::Between),
     );
 
-    app.add_systems(PostUpdate, sync_transforms_and_locations);
+    // app.add_systems(PostUpdate, sync_transforms_and_locations);
+}
+
+#[cfg(test)]
+mod test {
+    #[test]
+    fn test_loc_updates() {}
 }
diff --git a/cosmos_server/assets/cosmos/kits/starter.json b/cosmos_server/assets/cosmos/kits/starter.json
index c7991d886..8ee319c3c 100644
--- a/cosmos_server/assets/cosmos/kits/starter.json
+++ b/cosmos_server/assets/cosmos/kits/starter.json
@@ -28,5 +28,10 @@
     "slot": 5,
     "item": "cosmos:laser_cannon",
     "quantity": 6
+  },
+  {
+    "slot": 6,
+    "item": "cosmos:basic_fabricator",
+    "quantity": 1
   }
 ]
diff --git a/needs_recipes.txt b/needs_recipes.txt
index e69de29bb..8b1378917 100644
--- a/needs_recipes.txt
+++ b/needs_recipes.txt
@@ -0,0 +1 @@
+

From db4bb2536f24324bbfd2cbeb4fa9ae830f2b7cb7 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Tue, 14 Jan 2025 23:36:18 -0500
Subject: [PATCH 26/31] Log be gone

---
 cosmos_core/src/physics/location/mod.rs     | 1 -
 cosmos_core/src/physics/location/systems.rs | 1 -
 2 files changed, 2 deletions(-)

diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index 54e989c1b..f85d1e310 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -20,7 +20,6 @@ use std::{
 #[cfg(doc)]
 use bevy::prelude::Transform;
 use bevy::{
-    log::info,
     prelude::{App, Component, Deref, DerefMut, SystemSet, Update, Vec3},
     reflect::Reflect,
 };
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index 367c3512b..aff7055e9 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -436,7 +436,6 @@ fn recursively_sync_transforms_and_locations(
             let transform_delta_parent = parent_g_rot.mul_vec3(my_transform.translation);
             let new_loc = parent_loc + transform_delta_parent;
             if *my_loc != new_loc {
-                info!("{name}: {} -> {new_loc}", *my_loc);
                 *my_loc = new_loc;
             }
             // info!("{name}: {transform_delta_parent} / {}", *my_loc);

From a356e8e07134682ffda7d33038640373e4b69348 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Tue, 14 Jan 2025 23:49:06 -0500
Subject: [PATCH 27/31] Removing useless garbage

---
 .../crafting/blocks/basic_fabricator/ui.rs    |   2 +-
 .../ship/pilot_change_event_listener.rs       |  20 +---
 cosmos_core/src/physics/location/mod.rs       |   3 -
 cosmos_core/src/physics/location/systems.rs   | 110 +++---------------
 .../structure/systems/shield_system/mod.rs    |  10 +-
 5 files changed, 21 insertions(+), 124 deletions(-)

diff --git a/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
index b26d481a2..79b6c734c 100644
--- a/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
+++ b/cosmos_client/src/crafting/blocks/basic_fabricator/ui.rs
@@ -8,7 +8,7 @@ use bevy::{
         IntoSystemConfigs, Query, Res, Text, With,
     },
     text::TextFont,
-    ui::{AlignItems, BackgroundColor, DrawUiMaterial, DrawUiMaterialNode, FlexDirection, JustifyContent, Node, TargetCamera, UiRect, Val},
+    ui::{AlignItems, BackgroundColor, FlexDirection, JustifyContent, Node, TargetCamera, UiRect, Val},
 };
 use cosmos_core::{
     crafting::{
diff --git a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
index 4b226a98e..e60e9b4e6 100644
--- a/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
+++ b/cosmos_core/src/events/structure/ship/pilot_change_event_listener.rs
@@ -1,10 +1,9 @@
 use bevy::prelude::{
     in_state, App, BuildChildren, Commands, Component, Entity, Event, EventReader, EventWriter, IntoSystemConfigs, IntoSystemSetConfigs,
-    Quat, Query, RemovedComponents, States, SystemSet, Transform, Update, Vec3, With,
+    Quat, Query, RemovedComponents, States, SystemSet, Transform, Update, Vec3,
 };
 use bevy_rapier3d::prelude::{RigidBody, Sensor};
 
-use crate::entities::player::Player;
 use crate::events::structure::change_pilot_event::ChangePilotEvent;
 use crate::physics::location::{Location, LocationPhysicsSet};
 use crate::structure::ship::pilot::Pilot;
@@ -63,14 +62,6 @@ fn event_listener(
     }
 }
 
-/// This is to combat floating point issues. The pilot will slowly drift from the center
-/// due to location syncing floating point errors.
-///
-/// TODO: Having to do this is mega lame, find a better solution to this problem please.
-fn keep_pilot_centered(mut q_pilot_transform: Query<&mut Transform, (With<Pilot>, With<Player>)>) {
-    for mut trans in q_pilot_transform.iter_mut() {}
-}
-
 #[derive(Debug, Event)]
 struct RemoveSensorFrom(Entity, u8);
 
@@ -149,14 +140,7 @@ pub(super) fn register<T: States + Clone + Copy>(app: &mut App, playing_state: T
 
     app.add_systems(
         Update,
-        (
-            keep_pilot_centered,
-            pilot_removed,
-            remove_sensor,
-            bouncer,
-            verify_pilot_exists,
-            event_listener,
-        )
+        (pilot_removed, remove_sensor, bouncer, verify_pilot_exists, event_listener)
             .in_set(PilotEventSystemSet::ChangePilotListener)
             .in_set(StructureTypeSet::Ship)
             .chain()
diff --git a/cosmos_core/src/physics/location/mod.rs b/cosmos_core/src/physics/location/mod.rs
index f85d1e310..04d8feae7 100644
--- a/cosmos_core/src/physics/location/mod.rs
+++ b/cosmos_core/src/physics/location/mod.rs
@@ -71,9 +71,6 @@ pub struct Location {
     pub sector: Sector,
 }
 
-#[derive(Default, Component, Debug, PartialEq, Serialize, Deserialize, Reflect, Clone, Copy)]
-struct LastTransformTranslation(Vec3);
-
 #[derive(Default, Component, Debug, PartialEq, Eq, Reflect, Clone, Copy)]
 /// Sets the position of this entity based on the specified source of truth
 pub enum SetPosition {
diff --git a/cosmos_core/src/physics/location/systems.rs b/cosmos_core/src/physics/location/systems.rs
index aff7055e9..89e54dd8b 100644
--- a/cosmos_core/src/physics/location/systems.rs
+++ b/cosmos_core/src/physics/location/systems.rs
@@ -1,12 +1,4 @@
-//!
-//!
-//! - Apply set position
-//! - Set location based on transform
-//!     This can only be done for children - doesn't make sense for parents
-//! - Update Worlds
-//! - sync transforms and locations
-//!
-//!
+//! Handles the systems that sync up worlds, locations, and transforms
 
 use std::time::Duration;
 
@@ -27,10 +19,7 @@ use bevy_rapier3d::{
 
 use crate::{
     netty::system_sets::NetworkingSystemsSet,
-    physics::{
-        location::LastTransformTranslation,
-        player_world::{PlayerWorld, WorldWithin},
-    },
+    physics::player_world::{PlayerWorld, WorldWithin},
 };
 
 #[cfg(feature = "server")]
@@ -107,19 +96,13 @@ fn apply_set_position(
         match set_pos {
             SetPosition::Transform => {
                 let mut ecmds = commands.entity(entity);
-                if let Ok(g_trans) = q_g_trans.get(entity) {
-                    ecmds.insert(LastTransformTranslation(g_trans.translation()));
-                }
                 ecmds.insert(SetTransformBasedOnLocationFlag).remove::<SetPosition>();
             }
             SetPosition::Location => {
                 if let Some(loc_from_trans) = loc_from_trans(entity, &q_trans, &q_x, &q_g_trans, &q_parent) {
                     if let Ok(g_trans) = q_g_trans.get(entity) {
                         info!("{loc_from_trans} | {}", g_trans.translation());
-                        commands
-                            .entity(entity)
-                            .insert((loc_from_trans, LastTransformTranslation(g_trans.translation())))
-                            .remove::<SetPosition>();
+                        commands.entity(entity).insert(loc_from_trans).remove::<SetPosition>();
                     }
                 }
             }
@@ -129,7 +112,7 @@ fn apply_set_position(
 
 fn reposition_worlds_around_anchors(
     q_loc_no_parent: Query<&Location, (Without<PlayerWorld>, Without<Parent>)>,
-    mut q_everything: Query<(&mut LastTransformTranslation, &mut Transform, &WorldWithin, Option<&Parent>), With<Location>>,
+    mut q_trans_no_parent: Query<(&mut Transform, &WorldWithin), (Without<Parent>, With<Location>)>,
     trans_query_with_parent: Query<&Location, (Without<PlayerWorld>, With<Parent>)>,
     #[cfg(feature = "server")] q_anchors: Query<(&WorldWithin, Entity), With<Anchor>>,
     #[cfg(feature = "server")] everything_query: Query<(&WorldWithin, Entity)>,
@@ -161,11 +144,8 @@ fn reposition_worlds_around_anchors(
             let delta = (*location - *world_location).absolute_coords_f32();
             *world_location = *location;
 
-            for (mut ltt, mut t, _, parent) in q_everything.iter_mut().filter(|(_, _, ww, _)| ww.0 == world_entity) {
-                ltt.0 -= delta;
-                if parent.is_none() {
-                    t.translation -= delta;
-                }
+            for (mut t, _) in q_trans_no_parent.iter_mut().filter(|(_, ww)| ww.0 == world_entity) {
+                t.translation -= delta;
             }
         } else {
             #[cfg(feature = "server")]
@@ -359,11 +339,9 @@ type TransformLocationQuery<'w, 's> = Query<
     'w,
     's,
     (
-        &'static Name,
         &'static mut Location,
         Option<&'static mut Transform>,
         Option<&'static PreviousLocation>,
-        Option<&'static LastTransformTranslation>,
         Option<&'static SetTransformBasedOnLocationFlag>,
     ),
     Without<PlayerWorld>,
@@ -382,17 +360,7 @@ fn sync_transforms_and_locations(
             continue;
         };
 
-        recursively_sync_transforms_and_locations(
-            *pw_loc,
-            *pw_loc,
-            Vec3::ZERO,
-            Quat::IDENTITY,
-            Vec3::ZERO,
-            entity,
-            &mut commands,
-            &mut q_data,
-            &q_children,
-        );
+        recursively_sync_transforms_and_locations(*pw_loc, Vec3::ZERO, Quat::IDENTITY, entity, &mut commands, &mut q_data, &q_children);
     }
 }
 
@@ -401,24 +369,20 @@ struct PreviousLocation(Location);
 
 fn recursively_sync_transforms_and_locations(
     parent_loc: Location,
-    parent_prev_loc: Location,
     parent_g_trans: Vec3,
     parent_g_rot: Quat,
-    parent_delta_g_trans: Vec3,
     ent: Entity,
     commands: &mut Commands,
     q_data: &mut TransformLocationQuery,
     q_children: &Query<&Children>,
 ) {
-    let Ok((name, mut my_loc, my_transform, my_prev_loc, last_trans_trans, set_trans)) = q_data.get_mut(ent) else {
+    let Ok((mut my_loc, my_transform, my_prev_loc, set_trans)) = q_data.get_mut(ent) else {
         return;
     };
 
     let parent_g_rot = parent_g_rot.normalize();
 
-    let (local_translation, local_rotation, delta_g_trans) = if let Some(mut my_transform) = my_transform {
-        let mut delta_g_trans = Vec3::ZERO;
-
+    let (local_translation, local_rotation) = if let Some(mut my_transform) = my_transform {
         if set_trans.is_some() {
             my_transform.translation = parent_g_rot.inverse().normalize() * ((*my_loc - parent_loc).absolute_coords_f32());
         } else {
@@ -438,58 +402,21 @@ fn recursively_sync_transforms_and_locations(
             if *my_loc != new_loc {
                 *my_loc = new_loc;
             }
-            // info!("{name}: {transform_delta_parent} / {}", *my_loc);
-
-            // let g_trans = parent_g_trans + (parent_g_rot * my_transform.translation);
-            //
-            // let parent_delta_loc = parent_loc - parent_prev_loc;
-            // delta_g_trans = last_trans_trans.map(|x| g_trans - x.0).unwrap_or(Vec3::ZERO);
-            //
-            // let delta_local_trans = delta_g_trans - parent_delta_g_trans;
-            // if name.contains("Player") {
-            //     info!("PLAYER DELTA: {}", delta_local_trans);
-            //     info!(
-            //         "Player T: {:?}; G T: {:?}; PREV T: {:?}; PARENT_GT: {:?}",
-            //         my_transform.translation,
-            //         g_trans,
-            //         last_trans_trans.map(|x| x.0).unwrap_or(Vec3::ZERO),
-            //         parent_g_trans
-            //     );
-            // }
-            //
-            //             // // though.
-            // let delta_loc = my_prev_loc.map(|x| (*my_loc - x.0).absolute_coords_f32()).unwrap_or(Vec3::ZERO);
-            // let my_new_loc = *my_loc + delta_local_trans + parent_delta_loc;
-            // if *my_loc != my_new_loc {
-            //     *my_loc = my_new_loc;
-            // }
-            // let my_local_rotated_trans = (*my_loc - parent_loc).absolute_coords_f32();
-            // let my_local_location_based_trans = parent_g_rot.inverse().normalize() * my_local_rotated_trans;
-            //
-            // info!("{}, {}", name, my_local_location_based_trans - my_transform.translation);
-            // // Change detection limiting
-            // if my_transform.translation != my_local_location_based_trans {
-            //     my_transform.translation = my_local_location_based_trans;
-            // }
-
-            // Changes in location mess up the children.
-            // delta_g_trans += delta_loc;
         }
 
-        (my_transform.translation, my_transform.rotation, delta_g_trans)
+        (my_transform.translation, my_transform.rotation)
     } else {
         let translation = parent_g_rot.inverse() * ((*my_loc - parent_loc).absolute_coords_f32());
 
         commands.entity(ent).insert(Transform::from_translation(translation));
 
-        (translation, Quat::IDENTITY, Vec3::ZERO)
+        (translation, Quat::IDENTITY)
     };
 
     let my_g_trans = parent_g_trans + parent_g_rot * local_translation;
-    let ltt = LastTransformTranslation(my_g_trans);
     commands
         .entity(ent)
-        .insert((ltt, PreviousLocation(*my_loc)))
+        .insert(PreviousLocation(*my_loc))
         .remove::<SetTransformBasedOnLocationFlag>();
 
     let my_loc = *my_loc;
@@ -498,17 +425,7 @@ fn recursively_sync_transforms_and_locations(
 
     if let Ok(children) = q_children.get(ent) {
         for &child in children.iter() {
-            recursively_sync_transforms_and_locations(
-                my_loc,
-                my_prev_loc,
-                my_g_trans,
-                my_g_rot,
-                delta_g_trans,
-                child,
-                commands,
-                q_data,
-                q_children,
-            );
+            recursively_sync_transforms_and_locations(my_prev_loc, my_g_trans, my_g_rot, child, commands, q_data, q_children);
         }
     }
 }
@@ -523,7 +440,6 @@ pub(super) fn register(app: &mut App) {
             #[cfg(feature = "server")]
             (move_anchors_between_worlds, move_non_anchors_between_worlds, remove_empty_worlds).chain(),
             sync_transforms_and_locations,
-            // set_transform_based_on_location,
         )
             .chain()
             .in_set(LocationPhysicsSet::DoPhysics)
diff --git a/cosmos_server/src/structure/systems/shield_system/mod.rs b/cosmos_server/src/structure/systems/shield_system/mod.rs
index 5c17ac874..7338eb14d 100644
--- a/cosmos_server/src/structure/systems/shield_system/mod.rs
+++ b/cosmos_server/src/structure/systems/shield_system/mod.rs
@@ -19,7 +19,7 @@ use bevy::{
     },
     reflect::Reflect,
     time::Time,
-    transform::components::{GlobalTransform, Transform},
+    transform::components::Transform,
     utils::hashbrown::HashMap,
 };
 
@@ -33,7 +33,7 @@ use cosmos_core::{
         NettyChannelServer,
     },
     persistence::LoadingDistance,
-    physics::location::{Location, SetPosition},
+    physics::location::SetPosition,
     projectiles::laser::LaserSystemSet,
     registry::{identifiable::Identifiable, Registry},
     state::GameState,
@@ -175,7 +175,7 @@ fn recalculate_shields_if_needed(
     q_placed_shields: Query<&PlacedShields>,
     mut q_shield: Query<&mut Shield>,
     mut q_shield_system: Query<(&mut ShieldSystem, &StructureSystem), Changed<ShieldSystem>>,
-    q_structure: Query<(&Location, &GlobalTransform, &Structure)>,
+    q_structure: Query<&Structure>,
 ) {
     for (mut shield_system, ss) in &mut q_shield_system {
         if !shield_system.needs_shields_recalculated() {
@@ -221,8 +221,8 @@ fn recalculate_shields_if_needed(
             }
         }
 
-        let Ok((loc, g_trans, structure)) = q_structure.get(structure_entity) else {
-            warn!("No loc/g-trans/structure");
+        let Ok(structure) = q_structure.get(structure_entity) else {
+            warn!("No structure - bad");
             continue;
         };
 

From 4760454a7e158943d43208fbfff1e766083325e8 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Tue, 14 Jan 2025 23:56:52 -0500
Subject: [PATCH 28/31] Fixing warning

---
 cosmos_client/src/inventory/mod.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cosmos_client/src/inventory/mod.rs b/cosmos_client/src/inventory/mod.rs
index 64cf4ba93..b68d3dd50 100644
--- a/cosmos_client/src/inventory/mod.rs
+++ b/cosmos_client/src/inventory/mod.rs
@@ -958,7 +958,6 @@ fn rec_make_render_middle_camera(
     q_mid_cam: &Query<Entity, With<UiTopRoot>>,
     q_children: &Query<&Children>,
     q_target_cam: &mut Query<(Entity, &mut TargetCamera), (Changed<TargetCamera>, With<TextNeedsTopRoot>)>,
-    q_needs_target_cam: &Query<Entity, (Without<TargetCamera>, With<TextNeedsTopRoot>)>,
     commands: &mut Commands,
 ) {
     let middle_camera_entity = q_mid_cam.single();
@@ -969,14 +968,14 @@ fn rec_make_render_middle_camera(
         }
         if let Ok(children) = q_children.get(ent) {
             for c in children.iter() {
-                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, q_needs_target_cam, commands);
+                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, commands);
             }
         }
     } else {
         commands.entity(ent).insert(TargetCamera(middle_camera_entity));
         if let Ok(children) = q_children.get(ent) {
             for c in children.iter() {
-                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, q_needs_target_cam, commands);
+                rec_make_render_middle_camera(*c, q_mid_cam, q_children, q_target_cam, commands);
             }
         }
     }
@@ -990,11 +989,11 @@ fn make_render_middle_camera(
     mut commands: Commands,
 ) {
     for ent in q_target_cam.iter().map(|x| x.0).collect::<Vec<Entity>>() {
-        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &q_needs_target_cam, &mut commands);
+        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &mut commands);
     }
 
     for ent in q_needs_target_cam.iter() {
-        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &q_needs_target_cam, &mut commands);
+        rec_make_render_middle_camera(ent, &q_mid_cam, &q_children, &mut q_target_cam, &mut commands);
     }
 }
 

From bd8fe2de18591d0fba9b3e6567d32e7dbe7c5a09 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Tue, 14 Jan 2025 23:58:47 -0500
Subject: [PATCH 29/31] Fixing clippy lints

---
 cosmos_server/src/persistence/loading.rs | 3 ++-
 cosmos_server/src/shop/prices.rs         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cosmos_server/src/persistence/loading.rs b/cosmos_server/src/persistence/loading.rs
index 9d97ac56a..499ccc33a 100644
--- a/cosmos_server/src/persistence/loading.rs
+++ b/cosmos_server/src/persistence/loading.rs
@@ -78,7 +78,8 @@ fn check_needs_loaded(
             continue;
         };
 
-        let serialized_data: SerializedData = cosmos_encoder::deserialize(&data).expect("Error deserializing data for {path}");
+        let serialized_data: SerializedData =
+            cosmos_encoder::deserialize(&data).unwrap_or_else(|| panic!("Error deserializing data for {path}"));
 
         match &nl.identifier_type {
             SaveFileIdentifierType::Base(entity_id, _, _) => {
diff --git a/cosmos_server/src/shop/prices.rs b/cosmos_server/src/shop/prices.rs
index 6ec92f13d..0448d82ab 100644
--- a/cosmos_server/src/shop/prices.rs
+++ b/cosmos_server/src/shop/prices.rs
@@ -428,7 +428,7 @@ fn get_entries(entries: Vec<PrettyShopEntry>, items: &Registry<Item>) -> Vec<Sho
                 max_quantity_selling,
                 price_per,
             } => ShopEntry::Selling {
-                item_id: items.from_id(&item_id).expect("Missing {item_id}").id(),
+                item_id: items.from_id(&item_id).unwrap_or_else(|| panic!("Missing {item_id}")).id(),
                 max_quantity_selling,
                 price_per,
             },

From 4fde5e18a2fc5beac8c8aa9f123426c04f60c976 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Wed, 15 Jan 2025 00:08:11 -0500
Subject: [PATCH 30/31] Clippy fix

---
 cosmos_client/src/rendering/mod.rs       | 2 +-
 cosmos_server/src/persistence/loading.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cosmos_client/src/rendering/mod.rs b/cosmos_client/src/rendering/mod.rs
index 6d70eca1c..124b440ce 100644
--- a/cosmos_client/src/rendering/mod.rs
+++ b/cosmos_client/src/rendering/mod.rs
@@ -943,7 +943,7 @@ impl MeshBuilder for LodMeshBuilder {
 
                 let packed_normal = BlockDirection::from_vec3((*normal).into()).index() as u32;
 
-                let packed_data: u32 = packed_normal << 29 | packed_uv << 27 | (0b00000111_11111111_11111111_11111111 & texture_index);
+                let packed_data: u32 = (packed_normal << 29) | (packed_uv << 27) | (0b00000111_11111111_11111111_11111111 & texture_index);
 
                 packed_data
             }));
diff --git a/cosmos_server/src/persistence/loading.rs b/cosmos_server/src/persistence/loading.rs
index 499ccc33a..d5650a4fe 100644
--- a/cosmos_server/src/persistence/loading.rs
+++ b/cosmos_server/src/persistence/loading.rs
@@ -79,7 +79,7 @@ fn check_needs_loaded(
         };
 
         let serialized_data: SerializedData =
-            cosmos_encoder::deserialize(&data).unwrap_or_else(|| panic!("Error deserializing data for {path}"));
+            cosmos_encoder::deserialize(&data).unwrap_or_else(|_| panic!("Error deserializing data for {path}"));
 
         match &nl.identifier_type {
             SaveFileIdentifierType::Base(entity_id, _, _) => {

From 3a85f9a5fb30055aab25e9beb53ecb701a270889 Mon Sep 17 00:00:00 2001
From: Anthony Tornetta <cornchipgonecodin@gmail.com>
Date: Wed, 15 Jan 2025 00:18:23 -0500
Subject: [PATCH 31/31] I should really update my clippy version

---
 cosmos_server/src/shop/prices.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cosmos_server/src/shop/prices.rs b/cosmos_server/src/shop/prices.rs
index 0448d82ab..ab09d122b 100644
--- a/cosmos_server/src/shop/prices.rs
+++ b/cosmos_server/src/shop/prices.rs
@@ -419,7 +419,7 @@ fn get_entries(entries: Vec<PrettyShopEntry>, items: &Registry<Item>) -> Vec<Sho
                 max_quantity_buying,
                 price_per,
             } => ShopEntry::Buying {
-                item_id: items.from_id(&item_id).expect("Missing {item_id}").id(),
+                item_id: items.from_id(&item_id).unwrap_or_else(|| panic!("Missing {item_id}")).id(),
                 max_quantity_buying,
                 price_per,
             },