From 2f57f11771bb38099d1f1594e64eb6669a7f07de Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Tue, 29 Oct 2024 12:18:35 +0300 Subject: [PATCH] Cargo namespace --- .../_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs | 2 +- .../_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs | 2 +- .../_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs | 2 +- Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs | 2 +- Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs | 4 ++-- Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs | 2 +- Content.Server/_CP14/Cargo/CP14CargoSystem.cs | 4 ++-- .../_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs | 2 +- .../CP14CargoMoneyBoxComponent.cs | 2 +- .../{TravelingStoreShip => Cargo}/CP14CargoStoreComponent.cs | 2 +- .../CP14SellingPalettComponent.cs | 2 +- .../{TravelingStoreShip => Cargo}/CP14SharedCargoSystem.cs | 2 +- .../CP14StationTravelingStoreShipTargetComponent.cs | 4 ++-- .../_CP14/{TravelingStoreShip => Cargo}/CP14StoreUI.cs | 2 +- .../Prototype/BuyServices/CP14BuyItemsService.cs | 2 +- .../Prototype/CP14StoreBuyPositionPrototype.cs | 2 +- .../Prototype/CP14StoreSellPositionPrototype.cs | 2 +- .../Prototype/SellServices/CP14SellStackService.cs | 2 +- .../Prototype/SellServices/CP14SellWhitelistService.cs | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14CargoMoneyBoxComponent.cs (81%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14CargoStoreComponent.cs (84%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14SellingPalettComponent.cs (78%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14SharedCargoSystem.cs (89%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14StationTravelingStoreShipTargetComponent.cs (92%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/CP14StoreUI.cs (97%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/Prototype/BuyServices/CP14BuyItemsService.cs (93%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/Prototype/CP14StoreBuyPositionPrototype.cs (96%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/Prototype/CP14StoreSellPositionPrototype.cs (96%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/Prototype/SellServices/CP14SellStackService.cs (95%) rename Content.Shared/_CP14/{TravelingStoreShip => Cargo}/Prototype/SellServices/CP14SellWhitelistService.cs (94%) diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs index 6725d0cc82..9df18283d3 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreBoundUserInterface.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using JetBrains.Annotations; using Robust.Client.UserInterface; diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs index 9dd352e2cb..77e1f65f3b 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreProductControl.xaml.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; using Robust.Client.UserInterface; diff --git a/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs b/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs index 00f7080119..b5cebc1f54 100644 --- a/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs +++ b/Content.Client/_CP14/TravelingStoreShip/CP14StoreWindow.xaml.cs @@ -1,4 +1,4 @@ -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Robust.Client.AutoGenerated; using Robust.Client.UserInterface.CustomControls; using Robust.Client.UserInterface.XAML; diff --git a/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs b/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs index b05f45d2a0..ad11b611dd 100644 --- a/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs +++ b/Content.IntegrationTests/Tests/_CP14/CP14CargoTest.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo.Prototype; using Robust.Shared.GameObjects; using Robust.Shared.Prototypes; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs index 60df0233ca..a759a1b493 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.Shuttle.cs @@ -1,8 +1,8 @@ using System.Numerics; using Content.Server.Shuttles.Components; using Content.Server.Shuttles.Events; -using Content.Shared._CP14.TravelingStoreShip; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo; +using Content.Shared._CP14.Cargo.Prototype; using Robust.Shared.Map; using Robust.Shared.Random; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs index 49bd2fc956..3afb297936 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.UI.cs @@ -1,5 +1,5 @@ using System.Text; -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Content.Shared.UserInterface; namespace Content.Server._CP14.Cargo; diff --git a/Content.Server/_CP14/Cargo/CP14CargoSystem.cs b/Content.Server/_CP14/Cargo/CP14CargoSystem.cs index 83fa2f3a25..341c0fdd84 100644 --- a/Content.Server/_CP14/Cargo/CP14CargoSystem.cs +++ b/Content.Server/_CP14/Cargo/CP14CargoSystem.cs @@ -3,8 +3,8 @@ using Content.Server.Shuttles.Systems; using Content.Server.Station.Events; using Content.Server.Station.Systems; using Content.Shared._CP14.Currency; -using Content.Shared._CP14.TravelingStoreShip; -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo; +using Content.Shared._CP14.Cargo.Prototype; using Content.Shared.Maps; using Content.Shared.Paper; using Content.Shared.Physics; diff --git a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs index 70d3ebb56d..e4ed6abfa3 100644 --- a/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs +++ b/Content.Server/_CP14/Objectives/Systems/CP14TownSendConditionSystem.cs @@ -1,6 +1,6 @@ using Content.Server._CP14.Objectives.Components; using Content.Server.Objectives.Components.Targets; -using Content.Shared._CP14.TravelingStoreShip; +using Content.Shared._CP14.Cargo; using Content.Shared.Objectives.Components; using Content.Shared.Objectives.Systems; using Content.Shared.Stacks; diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs b/Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs similarity index 81% rename from Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs rename to Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs index 1fa6473692..a793f28730 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoMoneyBoxComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14CargoMoneyBoxComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// marks an entity into which trade with the city will put money when selling, or take it when buying. diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs b/Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs similarity index 84% rename from Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs rename to Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs index 07bf641536..4a31906485 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14CargoStoreComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14CargoStoreComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Allows users to view information on city trading opportunities diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs b/Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs similarity index 78% rename from Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs rename to Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs index 89692e4c47..97f106298f 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14SellingPalettComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14SellingPalettComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; [RegisterComponent] public sealed partial class CP14SellingPalettComponent : Component diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs b/Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs similarity index 89% rename from Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs rename to Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs index 4a04188993..6243f76ed9 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14SharedCargoSystem.cs +++ b/Content.Shared/_CP14/Cargo/CP14SharedCargoSystem.cs @@ -1,4 +1,4 @@ -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; public class CP14SharedCargoSystem : EntitySystem { diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs b/Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs similarity index 92% rename from Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs rename to Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs index 66a24d9f90..62e30eb775 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14StationTravelingStoreShipTargetComponent.cs +++ b/Content.Shared/_CP14/Cargo/CP14StationTravelingStoreShipTargetComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared._CP14.TravelingStoreShip.Prototype; +using Content.Shared._CP14.Cargo.Prototype; using Content.Shared.Destructible.Thresholds; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Add to the station so that traveling store ship starts running on it diff --git a/Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs b/Content.Shared/_CP14/Cargo/CP14StoreUI.cs similarity index 97% rename from Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs rename to Content.Shared/_CP14/Cargo/CP14StoreUI.cs index c9081e98d9..cac6bf0cf5 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/CP14StoreUI.cs +++ b/Content.Shared/_CP14/Cargo/CP14StoreUI.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; [Serializable, NetSerializable] public enum CP14StoreUiKey diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs b/Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs similarity index 93% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs rename to Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs index ea3b12eded..4edff18cb9 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/BuyServices/CP14BuyItemsService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/BuyServices/CP14BuyItemsService.cs @@ -1,7 +1,7 @@ using System.Text; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.BuyServices; +namespace Content.Shared._CP14.Cargo.Prototype.BuyServices; public sealed partial class CP14BuyItemsService : CP14StoreBuyService { diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs similarity index 96% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs rename to Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs index f34a006d5e..163a5d64b8 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreBuyPositionPrototype.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreBuyPositionPrototype.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype; +namespace Content.Shared._CP14.Cargo.Prototype; /// /// Stores the price and product/service pair that players can buy. diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs similarity index 96% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs rename to Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs index aa5afda5bc..0b1d736f94 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/CP14StoreSellPositionPrototype.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/CP14StoreSellPositionPrototype.cs @@ -3,7 +3,7 @@ using JetBrains.Annotations; using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Shared._CP14.TravelingStoreShip; +namespace Content.Shared._CP14.Cargo; /// /// Stores the price and product/service pair that players can buy. diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs similarity index 95% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs rename to Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs index 766b8714ad..79dc0dfed3 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellStackService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellStackService.cs @@ -1,7 +1,7 @@ using Content.Shared.Stacks; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.SellServices; +namespace Content.Shared._CP14.Cargo.Prototype.SellServices; public sealed partial class CP14SellStackService : CP14StoreSellService { diff --git a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs similarity index 94% rename from Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs rename to Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs index 6305f22256..0277f438a8 100644 --- a/Content.Shared/_CP14/TravelingStoreShip/Prototype/SellServices/CP14SellWhitelistService.cs +++ b/Content.Shared/_CP14/Cargo/Prototype/SellServices/CP14SellWhitelistService.cs @@ -1,7 +1,7 @@ using Content.Shared.Whitelist; using Robust.Shared.Prototypes; -namespace Content.Shared._CP14.TravelingStoreShip.Prototype.SellServices; +namespace Content.Shared._CP14.Cargo.Prototype.SellServices; public sealed partial class CP14SellWhitelistService : CP14StoreSellService {