From d050fe9f26dc6e69be516476eb54e6214ffcc631 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Fri, 10 Jun 2022 22:18:41 +0100 Subject: [PATCH] Move UnitOrderGenerator to Mods.Common. --- OpenRA.Mods.Common/Orders/ForceModifiersOrderGenerator.cs | 1 - OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs | 1 - .../Orders/UnitOrderGenerator.cs | 3 ++- OpenRA.Mods.Common/Traits/AttackMove.cs | 2 +- OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs | 1 - OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs | 2 +- 6 files changed, 4 insertions(+), 6 deletions(-) rename {OpenRA.Game => OpenRA.Mods.Common}/Orders/UnitOrderGenerator.cs (99%) diff --git a/OpenRA.Mods.Common/Orders/ForceModifiersOrderGenerator.cs b/OpenRA.Mods.Common/Orders/ForceModifiersOrderGenerator.cs index ce2e0b5863..f38392a9db 100644 --- a/OpenRA.Mods.Common/Orders/ForceModifiersOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/ForceModifiersOrderGenerator.cs @@ -10,7 +10,6 @@ #endregion using System.Collections.Generic; -using OpenRA.Orders; namespace OpenRA.Mods.Common.Orders { diff --git a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs index 6f6691314e..9196fb022d 100644 --- a/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/GuardOrderGenerator.cs @@ -12,7 +12,6 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common.Traits; -using OpenRA.Orders; using OpenRA.Traits; namespace OpenRA.Mods.Common.Orders diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Mods.Common/Orders/UnitOrderGenerator.cs similarity index 99% rename from OpenRA.Game/Orders/UnitOrderGenerator.cs rename to OpenRA.Mods.Common/Orders/UnitOrderGenerator.cs index ffd7ea24c2..c1958a86f2 100644 --- a/OpenRA.Game/Orders/UnitOrderGenerator.cs +++ b/OpenRA.Mods.Common/Orders/UnitOrderGenerator.cs @@ -12,10 +12,11 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; +using OpenRA.Orders; using OpenRA.Traits; using OpenRA.Widgets; -namespace OpenRA.Orders +namespace OpenRA.Mods.Common.Orders { public class UnitOrderGenerator : IOrderGenerator { diff --git a/OpenRA.Mods.Common/Traits/AttackMove.cs b/OpenRA.Mods.Common/Traits/AttackMove.cs index 6ca69ba735..b33d563f87 100644 --- a/OpenRA.Mods.Common/Traits/AttackMove.cs +++ b/OpenRA.Mods.Common/Traits/AttackMove.cs @@ -12,7 +12,7 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common.Activities; -using OpenRA.Orders; +using OpenRA.Mods.Common.Orders; using OpenRA.Primitives; using OpenRA.Traits; diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs index 0118596061..43e7cce2b0 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs @@ -14,7 +14,6 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Traits; -using OpenRA.Orders; using OpenRA.Traits; using OpenRA.Widgets; diff --git a/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs index 1b51636b9a..fb92f4ce23 100644 --- a/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs +++ b/OpenRA.Mods.Common/Widgets/WorldInteractionControllerWidget.cs @@ -12,8 +12,8 @@ using System.Collections.Generic; using System.Linq; using OpenRA.Graphics; +using OpenRA.Mods.Common.Orders; using OpenRA.Mods.Common.Traits; -using OpenRA.Orders; using OpenRA.Primitives; using OpenRA.Traits; using OpenRA.Widgets;