diff --git a/apps/backend/Data/WorldDefinitions.cs b/apps/backend/Definitions/WorldDefinitions.cs similarity index 99% rename from apps/backend/Data/WorldDefinitions.cs rename to apps/backend/Definitions/WorldDefinitions.cs index 7ebb2c2..06bb039 100644 --- a/apps/backend/Data/WorldDefinitions.cs +++ b/apps/backend/Definitions/WorldDefinitions.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace SpaceGame.Api.Data; +namespace SpaceGame.Api.Definitions; public sealed class ConstructionDefinition { diff --git a/apps/backend/Contracts/Economy.cs b/apps/backend/Economy/Contracts/Economy.cs similarity index 95% rename from apps/backend/Contracts/Economy.cs rename to apps/backend/Economy/Contracts/Economy.cs index 012600a..23a80ce 100644 --- a/apps/backend/Contracts/Economy.cs +++ b/apps/backend/Economy/Contracts/Economy.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Economy.Contracts; public sealed record MarketOrderSnapshot( string Id, diff --git a/apps/backend/Simulation/Model/CommerceRuntimeModels.cs b/apps/backend/Economy/Runtime/CommerceRuntimeModels.cs similarity index 96% rename from apps/backend/Simulation/Model/CommerceRuntimeModels.cs rename to apps/backend/Economy/Runtime/CommerceRuntimeModels.cs index 0b0f3fb..e344b92 100644 --- a/apps/backend/Simulation/Model/CommerceRuntimeModels.cs +++ b/apps/backend/Economy/Runtime/CommerceRuntimeModels.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Economy.Runtime; public sealed class MarketOrderRuntime { diff --git a/apps/backend/Simulation/Systems/CommanderPlanningService.cs b/apps/backend/Factions/AI/CommanderPlanningService.cs similarity index 96% rename from apps/backend/Simulation/Systems/CommanderPlanningService.cs rename to apps/backend/Factions/AI/CommanderPlanningService.cs index 6e3b399..3699683 100644 --- a/apps/backend/Simulation/Systems/CommanderPlanningService.cs +++ b/apps/backend/Factions/AI/CommanderPlanningService.cs @@ -1,10 +1,6 @@ -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.AI; -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Factions.AI; internal sealed class CommanderPlanningService { diff --git a/apps/backend/Simulation/AI/FactionController.cs b/apps/backend/Factions/AI/FactionController.cs similarity index 97% rename from apps/backend/Simulation/AI/FactionController.cs rename to apps/backend/Factions/AI/FactionController.cs index 65a54c2..17b9358 100644 --- a/apps/backend/Simulation/AI/FactionController.cs +++ b/apps/backend/Factions/AI/FactionController.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Factions.AI; // ─── Planning State ──────────────────────────────────────────────────────────── diff --git a/apps/backend/Contracts/Factions.cs b/apps/backend/Factions/Contracts/Factions.cs similarity index 95% rename from apps/backend/Contracts/Factions.cs rename to apps/backend/Factions/Contracts/Factions.cs index 49bf91b..c8d84ea 100644 --- a/apps/backend/Contracts/Factions.cs +++ b/apps/backend/Factions/Contracts/Factions.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Factions.Contracts; public sealed record FactionGoapStateSnapshot( int MilitaryShipCount, diff --git a/apps/backend/Simulation/Model/FactionRuntimeModels.cs b/apps/backend/Factions/Runtime/FactionRuntimeModels.cs similarity index 97% rename from apps/backend/Simulation/Model/FactionRuntimeModels.cs rename to apps/backend/Factions/Runtime/FactionRuntimeModels.cs index e9a6b41..9b1a695 100644 --- a/apps/backend/Simulation/Model/FactionRuntimeModels.cs +++ b/apps/backend/Factions/Runtime/FactionRuntimeModels.cs @@ -1,6 +1,5 @@ -using SpaceGame.Api.Simulation.AI; -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Factions.Runtime; public sealed class FactionRuntime { diff --git a/apps/backend/GlobalUsings.cs b/apps/backend/GlobalUsings.cs new file mode 100644 index 0000000..f15d054 --- /dev/null +++ b/apps/backend/GlobalUsings.cs @@ -0,0 +1,21 @@ +global using SpaceGame.Api.Definitions; +global using SpaceGame.Api.Economy.Contracts; +global using SpaceGame.Api.Economy.Runtime; +global using SpaceGame.Api.Factions.AI; +global using SpaceGame.Api.Factions.Contracts; +global using SpaceGame.Api.Factions.Runtime; +global using SpaceGame.Api.Shared.AI; +global using SpaceGame.Api.Shared.Contracts; +global using SpaceGame.Api.Shared.Runtime; +global using SpaceGame.Api.Ships.AI; +global using SpaceGame.Api.Ships.Contracts; +global using SpaceGame.Api.Ships.Runtime; +global using SpaceGame.Api.Ships.Simulation; +global using SpaceGame.Api.Simulation.Core; +global using SpaceGame.Api.Stations.Contracts; +global using SpaceGame.Api.Stations.Runtime; +global using SpaceGame.Api.Stations.Simulation; +global using SpaceGame.Api.Universe.Contracts; +global using SpaceGame.Api.Universe.Runtime; +global using SpaceGame.Api.Universe.Scenario; +global using SpaceGame.Api.Universe.Simulation; diff --git a/apps/backend/Program.cs b/apps/backend/Program.cs index 93e312e..32ce291 100644 --- a/apps/backend/Program.cs +++ b/apps/backend/Program.cs @@ -1,5 +1,5 @@ using FastEndpoints; -using SpaceGame.Api.Simulation; +using SpaceGame.Api.Universe.Simulation; var builder = WebApplication.CreateBuilder(args); diff --git a/apps/backend/Simulation/AI/GoapCore.cs b/apps/backend/Shared/AI/GoapCore.cs similarity index 95% rename from apps/backend/Simulation/AI/GoapCore.cs rename to apps/backend/Shared/AI/GoapCore.cs index 2ae67f3..a46481f 100644 --- a/apps/backend/Simulation/AI/GoapCore.cs +++ b/apps/backend/Shared/AI/GoapCore.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Shared.AI; public abstract class GoapAction { diff --git a/apps/backend/Contracts/Common.cs b/apps/backend/Shared/Contracts/Common.cs similarity index 59% rename from apps/backend/Contracts/Common.cs rename to apps/backend/Shared/Contracts/Common.cs index dce1126..593665e 100644 --- a/apps/backend/Contracts/Common.cs +++ b/apps/backend/Shared/Contracts/Common.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Shared.Contracts; public sealed record Vector3Dto(float X, float Y, float Z); diff --git a/apps/backend/Simulation/Model/SimulationKinds.cs b/apps/backend/Shared/Runtime/SimulationKinds.cs similarity index 99% rename from apps/backend/Simulation/Model/SimulationKinds.cs rename to apps/backend/Shared/Runtime/SimulationKinds.cs index 18add31..ea1cb72 100644 --- a/apps/backend/Simulation/Model/SimulationKinds.cs +++ b/apps/backend/Shared/Runtime/SimulationKinds.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Shared.Runtime; public enum SpatialNodeKind { diff --git a/apps/backend/Simulation/Support/SimulationRuntimeSupport.cs b/apps/backend/Shared/Runtime/SimulationRuntimeSupport.cs similarity index 98% rename from apps/backend/Simulation/Support/SimulationRuntimeSupport.cs rename to apps/backend/Shared/Runtime/SimulationRuntimeSupport.cs index 90019d7..7dec5f5 100644 --- a/apps/backend/Simulation/Support/SimulationRuntimeSupport.cs +++ b/apps/backend/Shared/Runtime/SimulationRuntimeSupport.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.Support; +namespace SpaceGame.Api.Shared.Runtime; internal static class SimulationRuntimeSupport { diff --git a/apps/backend/Simulation/Model/SimulationUnits.cs b/apps/backend/Shared/Runtime/SimulationUnits.cs similarity index 91% rename from apps/backend/Simulation/Model/SimulationUnits.cs rename to apps/backend/Shared/Runtime/SimulationUnits.cs index e32b75d..c9ffb11 100644 --- a/apps/backend/Simulation/Model/SimulationUnits.cs +++ b/apps/backend/Shared/Runtime/SimulationUnits.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Shared.Runtime; public static class SimulationUnits { diff --git a/apps/backend/Simulation/Model/Vector3.cs b/apps/backend/Shared/Runtime/Vector3.cs similarity index 96% rename from apps/backend/Simulation/Model/Vector3.cs rename to apps/backend/Shared/Runtime/Vector3.cs index 6738838..843d01b 100644 --- a/apps/backend/Simulation/Model/Vector3.cs +++ b/apps/backend/Shared/Runtime/Vector3.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Shared.Runtime; public readonly record struct Vector3(float X, float Y, float Z) { diff --git a/apps/backend/Simulation/AI/IShipBehaviorState.cs b/apps/backend/Ships/AI/IShipBehaviorState.cs similarity index 68% rename from apps/backend/Simulation/AI/IShipBehaviorState.cs rename to apps/backend/Ships/AI/IShipBehaviorState.cs index 421f61d..344f8e8 100644 --- a/apps/backend/Simulation/AI/IShipBehaviorState.cs +++ b/apps/backend/Ships/AI/IShipBehaviorState.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Ships.AI; internal interface IShipBehaviorState { diff --git a/apps/backend/Simulation/AI/ShipBehaviorStateMachine.cs b/apps/backend/Ships/AI/ShipBehaviorStateMachine.cs similarity index 92% rename from apps/backend/Simulation/AI/ShipBehaviorStateMachine.cs rename to apps/backend/Ships/AI/ShipBehaviorStateMachine.cs index cd77fcd..24d25e4 100644 --- a/apps/backend/Simulation/AI/ShipBehaviorStateMachine.cs +++ b/apps/backend/Ships/AI/ShipBehaviorStateMachine.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Ships.AI; internal sealed class ShipBehaviorStateMachine { diff --git a/apps/backend/Simulation/AI/ShipBehaviorStates.cs b/apps/backend/Ships/AI/ShipBehaviorStates.cs similarity index 97% rename from apps/backend/Simulation/AI/ShipBehaviorStates.cs rename to apps/backend/Ships/AI/ShipBehaviorStates.cs index 848bc1a..9249525 100644 --- a/apps/backend/Simulation/AI/ShipBehaviorStates.cs +++ b/apps/backend/Ships/AI/ShipBehaviorStates.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Ships.AI; internal sealed class IdleShipBehaviorState : IShipBehaviorState { diff --git a/apps/backend/Simulation/AI/ShipController.cs b/apps/backend/Ships/AI/ShipController.cs similarity index 98% rename from apps/backend/Simulation/AI/ShipController.cs rename to apps/backend/Ships/AI/ShipController.cs index cd9ddc7..0dd3511 100644 --- a/apps/backend/Simulation/AI/ShipController.cs +++ b/apps/backend/Ships/AI/ShipController.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation.AI; +namespace SpaceGame.Api.Ships.AI; // ─── Planning State ──────────────────────────────────────────────────────────── diff --git a/apps/backend/Contracts/Ships.cs b/apps/backend/Ships/Contracts/Ships.cs similarity index 97% rename from apps/backend/Contracts/Ships.cs rename to apps/backend/Ships/Contracts/Ships.cs index 1e561f5..27d14b3 100644 --- a/apps/backend/Contracts/Ships.cs +++ b/apps/backend/Ships/Contracts/Ships.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Ships.Contracts; public sealed record ShipSnapshot( string Id, diff --git a/apps/backend/Simulation/Model/ShipRuntimeModels.cs b/apps/backend/Ships/Runtime/ShipRuntimeModels.cs similarity index 97% rename from apps/backend/Simulation/Model/ShipRuntimeModels.cs rename to apps/backend/Ships/Runtime/ShipRuntimeModels.cs index e1f4441..8c58d34 100644 --- a/apps/backend/Simulation/Model/ShipRuntimeModels.cs +++ b/apps/backend/Ships/Runtime/ShipRuntimeModels.cs @@ -1,6 +1,5 @@ -using SpaceGame.Api.Data; -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Ships.Runtime; public sealed class ShipRuntime { diff --git a/apps/backend/Simulation/Systems/ShipControlService.cs b/apps/backend/Ships/Simulation/ShipControlService.cs similarity index 98% rename from apps/backend/Simulation/Systems/ShipControlService.cs rename to apps/backend/Ships/Simulation/ShipControlService.cs index da81067..a947a1b 100644 --- a/apps/backend/Simulation/Systems/ShipControlService.cs +++ b/apps/backend/Ships/Simulation/ShipControlService.cs @@ -1,11 +1,7 @@ -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.AI; -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.InfrastructureSimulationService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Stations.Simulation.InfrastructureSimulationService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Ships.Simulation; internal sealed class ShipControlService { diff --git a/apps/backend/Simulation/Systems/ShipTaskExecutionService.Actions.cs b/apps/backend/Ships/Simulation/ShipTaskExecutionService.Actions.cs similarity index 98% rename from apps/backend/Simulation/Systems/ShipTaskExecutionService.Actions.cs rename to apps/backend/Ships/Simulation/ShipTaskExecutionService.Actions.cs index 2611a85..d920867 100644 --- a/apps/backend/Simulation/Systems/ShipTaskExecutionService.Actions.cs +++ b/apps/backend/Ships/Simulation/ShipTaskExecutionService.Actions.cs @@ -1,9 +1,7 @@ -using SpaceGame.Api.Simulation.Model; -using SpaceGame.Api.Simulation.Support; -using static SpaceGame.Api.Simulation.Systems.InfrastructureSimulationService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Stations.Simulation.InfrastructureSimulationService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Ships.Simulation; internal sealed partial class ShipTaskExecutionService { diff --git a/apps/backend/Simulation/Systems/ShipTaskExecutionService.cs b/apps/backend/Ships/Simulation/ShipTaskExecutionService.cs similarity index 98% rename from apps/backend/Simulation/Systems/ShipTaskExecutionService.cs rename to apps/backend/Ships/Simulation/ShipTaskExecutionService.cs index 87b8ce4..c530048 100644 --- a/apps/backend/Simulation/Systems/ShipTaskExecutionService.cs +++ b/apps/backend/Ships/Simulation/ShipTaskExecutionService.cs @@ -1,8 +1,7 @@ -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.InfrastructureSimulationService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Stations.Simulation.InfrastructureSimulationService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Ships.Simulation; internal sealed partial class ShipTaskExecutionService { diff --git a/apps/backend/Simulation/Engine/SimulationEngine.cs b/apps/backend/Simulation/Core/SimulationEngine.cs similarity index 94% rename from apps/backend/Simulation/Engine/SimulationEngine.cs rename to apps/backend/Simulation/Core/SimulationEngine.cs index 0ef05a0..0b4f092 100644 --- a/apps/backend/Simulation/Engine/SimulationEngine.cs +++ b/apps/backend/Simulation/Core/SimulationEngine.cs @@ -1,9 +1,5 @@ -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.Model; -using SpaceGame.Api.Simulation.Support; -using SpaceGame.Api.Simulation.Systems; -namespace SpaceGame.Api.Simulation.Engine; +namespace SpaceGame.Api.Simulation.Core; public sealed class SimulationEngine { diff --git a/apps/backend/Simulation/Systems/SimulationProjectionService.cs b/apps/backend/Simulation/Core/SimulationProjectionService.cs similarity index 98% rename from apps/backend/Simulation/Systems/SimulationProjectionService.cs rename to apps/backend/Simulation/Core/SimulationProjectionService.cs index 0736c7c..728c562 100644 --- a/apps/backend/Simulation/Systems/SimulationProjectionService.cs +++ b/apps/backend/Simulation/Core/SimulationProjectionService.cs @@ -1,10 +1,8 @@ -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.InfrastructureSimulationService; -using static SpaceGame.Api.Simulation.Systems.StationSimulationService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Stations.Simulation.InfrastructureSimulationService; +using static SpaceGame.Api.Stations.Simulation.StationSimulationService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Simulation.Core; internal sealed class SimulationProjectionService { diff --git a/apps/backend/Contracts/Infrastructure.cs b/apps/backend/Stations/Contracts/Infrastructure.cs similarity index 98% rename from apps/backend/Contracts/Infrastructure.cs rename to apps/backend/Stations/Contracts/Infrastructure.cs index 4ef7ba3..028f29a 100644 --- a/apps/backend/Contracts/Infrastructure.cs +++ b/apps/backend/Stations/Contracts/Infrastructure.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Stations.Contracts; public sealed record InventoryEntry( string ItemId, diff --git a/apps/backend/Simulation/Model/ConstructionRuntimeModels.cs b/apps/backend/Stations/Runtime/ConstructionRuntimeModels.cs similarity index 97% rename from apps/backend/Simulation/Model/ConstructionRuntimeModels.cs rename to apps/backend/Stations/Runtime/ConstructionRuntimeModels.cs index 97772f8..c7a303b 100644 --- a/apps/backend/Simulation/Model/ConstructionRuntimeModels.cs +++ b/apps/backend/Stations/Runtime/ConstructionRuntimeModels.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Stations.Runtime; public sealed class ClaimRuntime { diff --git a/apps/backend/Simulation/Model/StationRuntimeModels.cs b/apps/backend/Stations/Runtime/StationRuntimeModels.cs similarity index 97% rename from apps/backend/Simulation/Model/StationRuntimeModels.cs rename to apps/backend/Stations/Runtime/StationRuntimeModels.cs index 07a7b9a..56d29c8 100644 --- a/apps/backend/Simulation/Model/StationRuntimeModels.cs +++ b/apps/backend/Stations/Runtime/StationRuntimeModels.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Stations.Runtime; public sealed class StationRuntime { diff --git a/apps/backend/Simulation/Systems/InfrastructureSimulationService.cs b/apps/backend/Stations/Simulation/InfrastructureSimulationService.cs similarity index 98% rename from apps/backend/Simulation/Systems/InfrastructureSimulationService.cs rename to apps/backend/Stations/Simulation/InfrastructureSimulationService.cs index 45ec836..d47df8a 100644 --- a/apps/backend/Simulation/Systems/InfrastructureSimulationService.cs +++ b/apps/backend/Stations/Simulation/InfrastructureSimulationService.cs @@ -1,9 +1,6 @@ -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Stations.Simulation; internal sealed class InfrastructureSimulationService { diff --git a/apps/backend/Simulation/Systems/StationLifecycleService.cs b/apps/backend/Stations/Simulation/StationLifecycleService.cs similarity index 94% rename from apps/backend/Simulation/Systems/StationLifecycleService.cs rename to apps/backend/Stations/Simulation/StationLifecycleService.cs index 2d2170b..8a0cbfd 100644 --- a/apps/backend/Simulation/Systems/StationLifecycleService.cs +++ b/apps/backend/Stations/Simulation/StationLifecycleService.cs @@ -1,10 +1,7 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.ShipControlService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Ships.Simulation.ShipControlService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Stations.Simulation; internal sealed class StationLifecycleService { diff --git a/apps/backend/Simulation/Systems/StationSimulationService.cs b/apps/backend/Stations/Simulation/StationSimulationService.cs similarity index 98% rename from apps/backend/Simulation/Systems/StationSimulationService.cs rename to apps/backend/Stations/Simulation/StationSimulationService.cs index b335e80..1e65b1c 100644 --- a/apps/backend/Simulation/Systems/StationSimulationService.cs +++ b/apps/backend/Stations/Simulation/StationSimulationService.cs @@ -1,10 +1,7 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.CommanderPlanningService; -using static SpaceGame.Api.Simulation.Support.SimulationRuntimeSupport; +using static SpaceGame.Api.Factions.AI.CommanderPlanningService; +using static SpaceGame.Api.Shared.Runtime.SimulationRuntimeSupport; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Stations.Simulation; internal sealed class StationSimulationService { diff --git a/apps/backend/Handlers/GetWorldHandler.cs b/apps/backend/Universe/Api/GetWorldHandler.cs similarity index 83% rename from apps/backend/Handlers/GetWorldHandler.cs rename to apps/backend/Universe/Api/GetWorldHandler.cs index 31ca33d..12589a5 100644 --- a/apps/backend/Handlers/GetWorldHandler.cs +++ b/apps/backend/Universe/Api/GetWorldHandler.cs @@ -1,7 +1,6 @@ using FastEndpoints; -using SpaceGame.Api.Simulation; -namespace SpaceGame.Api.Handlers; +namespace SpaceGame.Api.Universe.Api; public sealed class GetWorldHandler(WorldService worldService) : EndpointWithoutRequest { diff --git a/apps/backend/Handlers/GetWorldHealthHandler.cs b/apps/backend/Universe/Api/GetWorldHealthHandler.cs similarity index 88% rename from apps/backend/Handlers/GetWorldHealthHandler.cs rename to apps/backend/Universe/Api/GetWorldHealthHandler.cs index e89b411..93be569 100644 --- a/apps/backend/Handlers/GetWorldHealthHandler.cs +++ b/apps/backend/Universe/Api/GetWorldHealthHandler.cs @@ -1,7 +1,6 @@ using FastEndpoints; -using SpaceGame.Api.Simulation; -namespace SpaceGame.Api.Handlers; +namespace SpaceGame.Api.Universe.Api; public sealed class GetWorldHealthHandler(WorldService worldService) : EndpointWithoutRequest { diff --git a/apps/backend/Handlers/ResetWorldHandler.cs b/apps/backend/Universe/Api/ResetWorldHandler.cs similarity index 83% rename from apps/backend/Handlers/ResetWorldHandler.cs rename to apps/backend/Universe/Api/ResetWorldHandler.cs index a124b43..4e84b05 100644 --- a/apps/backend/Handlers/ResetWorldHandler.cs +++ b/apps/backend/Universe/Api/ResetWorldHandler.cs @@ -1,7 +1,6 @@ using FastEndpoints; -using SpaceGame.Api.Simulation; -namespace SpaceGame.Api.Handlers; +namespace SpaceGame.Api.Universe.Api; public sealed class ResetWorldHandler(WorldService worldService) : EndpointWithoutRequest { diff --git a/apps/backend/Handlers/RootRedirectHandler.cs b/apps/backend/Universe/Api/RootRedirectHandler.cs similarity index 89% rename from apps/backend/Handlers/RootRedirectHandler.cs rename to apps/backend/Universe/Api/RootRedirectHandler.cs index eb94d0b..ebc6604 100644 --- a/apps/backend/Handlers/RootRedirectHandler.cs +++ b/apps/backend/Universe/Api/RootRedirectHandler.cs @@ -1,6 +1,6 @@ using FastEndpoints; -namespace SpaceGame.Api.Handlers; +namespace SpaceGame.Api.Universe.Api; public sealed class RootRedirectHandler : EndpointWithoutRequest { diff --git a/apps/backend/Handlers/StreamWorldHandler.cs b/apps/backend/Universe/Api/StreamWorldHandler.cs similarity index 95% rename from apps/backend/Handlers/StreamWorldHandler.cs rename to apps/backend/Universe/Api/StreamWorldHandler.cs index 46b6bfa..a91ca5a 100644 --- a/apps/backend/Handlers/StreamWorldHandler.cs +++ b/apps/backend/Universe/Api/StreamWorldHandler.cs @@ -1,9 +1,7 @@ using System.Text.Json; using FastEndpoints; -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation; -namespace SpaceGame.Api.Handlers; +namespace SpaceGame.Api.Universe.Api; public sealed class StreamWorldHandler(WorldService worldService) : EndpointWithoutRequest { diff --git a/apps/backend/Contracts/Celestial.cs b/apps/backend/Universe/Contracts/Celestial.cs similarity index 97% rename from apps/backend/Contracts/Celestial.cs rename to apps/backend/Universe/Contracts/Celestial.cs index 50a9716..c6f6300 100644 --- a/apps/backend/Contracts/Celestial.cs +++ b/apps/backend/Universe/Contracts/Celestial.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Universe.Contracts; public sealed record StarSnapshot( string Kind, diff --git a/apps/backend/Contracts/World.cs b/apps/backend/Universe/Contracts/World.cs similarity index 97% rename from apps/backend/Contracts/World.cs rename to apps/backend/Universe/Contracts/World.cs index 15c1350..8fcfcd4 100644 --- a/apps/backend/Contracts/World.cs +++ b/apps/backend/Universe/Contracts/World.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Contracts; +namespace SpaceGame.Api.Universe.Contracts; public sealed record WorldSnapshot( string Label, diff --git a/apps/backend/Simulation/Model/SimulationWorld.cs b/apps/backend/Universe/Runtime/SimulationWorld.cs similarity index 95% rename from apps/backend/Simulation/Model/SimulationWorld.cs rename to apps/backend/Universe/Runtime/SimulationWorld.cs index 7c5cbb0..29f17f9 100644 --- a/apps/backend/Simulation/Model/SimulationWorld.cs +++ b/apps/backend/Universe/Runtime/SimulationWorld.cs @@ -1,6 +1,5 @@ -using SpaceGame.Api.Data; -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Universe.Runtime; public sealed class SimulationWorld { diff --git a/apps/backend/Simulation/Model/SpatialRuntimeModels.cs b/apps/backend/Universe/Runtime/SpatialRuntimeModels.cs similarity index 96% rename from apps/backend/Simulation/Model/SpatialRuntimeModels.cs rename to apps/backend/Universe/Runtime/SpatialRuntimeModels.cs index d0e6163..ee08686 100644 --- a/apps/backend/Simulation/Model/SpatialRuntimeModels.cs +++ b/apps/backend/Universe/Runtime/SpatialRuntimeModels.cs @@ -1,6 +1,5 @@ -using SpaceGame.Api.Data; -namespace SpaceGame.Api.Simulation.Model; +namespace SpaceGame.Api.Universe.Runtime; public sealed class SystemRuntime { diff --git a/apps/backend/Simulation/Scenario/DataCatalogLoader.cs b/apps/backend/Universe/Scenario/DataCatalogLoader.cs similarity index 98% rename from apps/backend/Simulation/Scenario/DataCatalogLoader.cs rename to apps/backend/Universe/Scenario/DataCatalogLoader.cs index fb4671e..7be568e 100644 --- a/apps/backend/Simulation/Scenario/DataCatalogLoader.cs +++ b/apps/backend/Universe/Scenario/DataCatalogLoader.cs @@ -1,9 +1,7 @@ using System.Text.Json; -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.LoaderSupport; +using static SpaceGame.Api.Universe.Scenario.LoaderSupport; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal sealed class DataCatalogLoader(string dataRoot) { diff --git a/apps/backend/Simulation/Scenario/LoaderSupport.cs b/apps/backend/Universe/Scenario/LoaderSupport.cs similarity index 98% rename from apps/backend/Simulation/Scenario/LoaderSupport.cs rename to apps/backend/Universe/Scenario/LoaderSupport.cs index a3dc5d3..ecb322e 100644 --- a/apps/backend/Simulation/Scenario/LoaderSupport.cs +++ b/apps/backend/Universe/Scenario/LoaderSupport.cs @@ -1,7 +1,5 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal static class LoaderSupport { diff --git a/apps/backend/Simulation/Scenario/ScenarioLoader.cs b/apps/backend/Universe/Scenario/ScenarioLoader.cs similarity index 91% rename from apps/backend/Simulation/Scenario/ScenarioLoader.cs rename to apps/backend/Universe/Scenario/ScenarioLoader.cs index 285fdf0..7dbd032 100644 --- a/apps/backend/Simulation/Scenario/ScenarioLoader.cs +++ b/apps/backend/Universe/Scenario/ScenarioLoader.cs @@ -1,6 +1,5 @@ -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; public sealed class ScenarioLoader { diff --git a/apps/backend/Simulation/Scenario/SpatialBuilder.cs b/apps/backend/Universe/Scenario/SpatialBuilder.cs similarity index 98% rename from apps/backend/Simulation/Scenario/SpatialBuilder.cs rename to apps/backend/Universe/Scenario/SpatialBuilder.cs index 1a1054c..91d2f40 100644 --- a/apps/backend/Simulation/Scenario/SpatialBuilder.cs +++ b/apps/backend/Universe/Scenario/SpatialBuilder.cs @@ -1,8 +1,6 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.LoaderSupport; +using static SpaceGame.Api.Universe.Scenario.LoaderSupport; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal sealed class SpatialBuilder { diff --git a/apps/backend/Simulation/Scenario/SystemGenerationService.cs b/apps/backend/Universe/Scenario/SystemGenerationService.cs similarity index 99% rename from apps/backend/Simulation/Scenario/SystemGenerationService.cs rename to apps/backend/Universe/Scenario/SystemGenerationService.cs index d5f9a4a..e489377 100644 --- a/apps/backend/Simulation/Scenario/SystemGenerationService.cs +++ b/apps/backend/Universe/Scenario/SystemGenerationService.cs @@ -1,8 +1,6 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.LoaderSupport; +using static SpaceGame.Api.Universe.Scenario.LoaderSupport; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal sealed class SystemGenerationService { diff --git a/apps/backend/Simulation/Scenario/WorldBuilder.cs b/apps/backend/Universe/Scenario/WorldBuilder.cs similarity index 97% rename from apps/backend/Simulation/Scenario/WorldBuilder.cs rename to apps/backend/Universe/Scenario/WorldBuilder.cs index d64e215..991d7ff 100644 --- a/apps/backend/Simulation/Scenario/WorldBuilder.cs +++ b/apps/backend/Universe/Scenario/WorldBuilder.cs @@ -1,8 +1,6 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.LoaderSupport; +using static SpaceGame.Api.Universe.Scenario.LoaderSupport; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal sealed class WorldBuilder( WorldGenerationOptions worldGeneration, diff --git a/apps/backend/Simulation/Scenario/WorldSeedingService.cs b/apps/backend/Universe/Scenario/WorldSeedingService.cs similarity index 98% rename from apps/backend/Simulation/Scenario/WorldSeedingService.cs rename to apps/backend/Universe/Scenario/WorldSeedingService.cs index 223631b..502d131 100644 --- a/apps/backend/Simulation/Scenario/WorldSeedingService.cs +++ b/apps/backend/Universe/Scenario/WorldSeedingService.cs @@ -1,8 +1,6 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.LoaderSupport; +using static SpaceGame.Api.Universe.Scenario.LoaderSupport; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Scenario; internal sealed class WorldSeedingService { diff --git a/apps/backend/Simulation/OrbitalSimulationOptions.cs b/apps/backend/Universe/Simulation/OrbitalSimulationOptions.cs similarity index 72% rename from apps/backend/Simulation/OrbitalSimulationOptions.cs rename to apps/backend/Universe/Simulation/OrbitalSimulationOptions.cs index a175209..6002fa5 100644 --- a/apps/backend/Simulation/OrbitalSimulationOptions.cs +++ b/apps/backend/Universe/Simulation/OrbitalSimulationOptions.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Simulation; public sealed class OrbitalSimulationOptions { diff --git a/apps/backend/Simulation/Systems/OrbitalStateUpdater.cs b/apps/backend/Universe/Simulation/OrbitalStateUpdater.cs similarity index 98% rename from apps/backend/Simulation/Systems/OrbitalStateUpdater.cs rename to apps/backend/Universe/Simulation/OrbitalStateUpdater.cs index 1e2a3a3..8a1e7b2 100644 --- a/apps/backend/Simulation/Systems/OrbitalStateUpdater.cs +++ b/apps/backend/Universe/Simulation/OrbitalStateUpdater.cs @@ -1,8 +1,6 @@ -using SpaceGame.Api.Data; -using SpaceGame.Api.Simulation.Model; -using static SpaceGame.Api.Simulation.Systems.InfrastructureSimulationService; +using static SpaceGame.Api.Stations.Simulation.InfrastructureSimulationService; -namespace SpaceGame.Api.Simulation.Systems; +namespace SpaceGame.Api.Universe.Simulation; internal sealed class OrbitalStateUpdater { diff --git a/apps/backend/Simulation/SimulationHostedService.cs b/apps/backend/Universe/Simulation/SimulationHostedService.cs similarity index 92% rename from apps/backend/Simulation/SimulationHostedService.cs rename to apps/backend/Universe/Simulation/SimulationHostedService.cs index 46d4db2..657797e 100644 --- a/apps/backend/Simulation/SimulationHostedService.cs +++ b/apps/backend/Universe/Simulation/SimulationHostedService.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Simulation; public sealed class SimulationHostedService(WorldService worldService) : BackgroundService { diff --git a/apps/backend/Simulation/WorldGenerationOptions.cs b/apps/backend/Universe/Simulation/WorldGenerationOptions.cs similarity index 69% rename from apps/backend/Simulation/WorldGenerationOptions.cs rename to apps/backend/Universe/Simulation/WorldGenerationOptions.cs index 3305288..5fd95c9 100644 --- a/apps/backend/Simulation/WorldGenerationOptions.cs +++ b/apps/backend/Universe/Simulation/WorldGenerationOptions.cs @@ -1,4 +1,4 @@ -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Simulation; public sealed class WorldGenerationOptions { diff --git a/apps/backend/Simulation/WorldService.cs b/apps/backend/Universe/Simulation/WorldService.cs similarity index 98% rename from apps/backend/Simulation/WorldService.cs rename to apps/backend/Universe/Simulation/WorldService.cs index e2ce956..b10ce6c 100644 --- a/apps/backend/Simulation/WorldService.cs +++ b/apps/backend/Universe/Simulation/WorldService.cs @@ -1,10 +1,7 @@ using System.Threading.Channels; using Microsoft.Extensions.Options; -using SpaceGame.Api.Contracts; -using SpaceGame.Api.Simulation.Engine; -using SpaceGame.Api.Simulation.Model; -namespace SpaceGame.Api.Simulation; +namespace SpaceGame.Api.Universe.Simulation; public sealed class WorldService( IWebHostEnvironment environment,