From 0e1773ac5d05859088551f2c8618f8b43f6bad0e Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 5 Jan 2015 21:15:43 +0100
Subject: [PATCH 1/3] Move Production to Mods.Common

---
 OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs |  2 +-
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj         | 12 ++++++++++++
 .../Traits/Buildings/PrimaryBuilding.cs              |  6 +++---
 .../Traits}/Player/ClassicProductionQueue.cs         |  4 +---
 .../Traits}/Player/PlaceBuilding.cs                  |  4 +---
 .../Traits}/Player/ProductionQueue.cs                |  4 +---
 .../Traits}/Production.cs                            |  4 +---
 .../Traits}/ProductionQueueFromSelection.cs          |  5 ++---
 .../Traits/Render}/ProductionBar.cs                  |  3 +--
 .../Traits}/Render/RenderBuildingWarFactory.cs       |  3 +--
 .../Widgets/Logic/ProductionTooltipLogic.cs          |  2 +-
 .../Widgets/ProductionPaletteWidget.cs               |  5 ++---
 .../Widgets/ProductionTabsWidget.cs                  |  4 ++--
 .../Widgets/ProductionTypeButtonWidget.cs            |  2 +-
 .../Traits/World/ChooseBuildTabOnSelect.cs           |  2 +-
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                 | 12 ------------
 .../Widgets/Logic/ClassicProductionLogic.cs          |  1 +
 17 files changed, 32 insertions(+), 43 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Traits/Buildings/PrimaryBuilding.cs (92%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Player/ClassicProductionQueue.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Player/PlaceBuilding.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Player/ProductionQueue.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Production.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/ProductionQueueFromSelection.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits/Render}/ProductionBar.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/RenderBuildingWarFactory.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/Logic/ProductionTooltipLogic.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/ProductionPaletteWidget.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/ProductionTabsWidget.cs (99%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Widgets/ProductionTypeButtonWidget.cs (95%)

diff --git a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
index 9d6fc6de3c..4c5a63fd09 100644
--- a/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
+++ b/OpenRA.Mods.Cnc/Widgets/Logic/ProductionTabsLogic.cs
@@ -9,7 +9,7 @@
 #endregion
 
 using System;
-using OpenRA.Mods.RA.Widgets;
+using OpenRA.Mods.Common.Widgets;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Cnc.Widgets.Logic
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index f76059daa3..bb5bcf8ea7 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -194,6 +194,7 @@
     <Compile Include="Traits\Buildings\FreeActor.cs" />
     <Compile Include="Traits\Buildings\LineBuild.cs" />
     <Compile Include="Traits\Buildings\LineBuildNode.cs" />
+    <Compile Include="Traits\Buildings\PrimaryBuilding.cs" />
     <Compile Include="Traits\Buildings\RallyPoint.cs" />
     <Compile Include="Traits\Buildings\RepairableBuilding.cs" />
     <Compile Include="Traits\Buildings\RepairsUnits.cs" />
@@ -245,11 +246,14 @@
     <Compile Include="Traits\PaletteEffects\WaterPaletteRotation.cs" />
     <Compile Include="Traits\Player\ActorGroupProxy.cs" />
     <Compile Include="Traits\Player\AllyRepair.cs" />
+    <Compile Include="Traits\Player\ClassicProductionQueue.cs" />
     <Compile Include="Traits\Player\ConquestVictoryConditions.cs" />
     <Compile Include="Traits\Player\GlobalUpgradeManager.cs" />
     <Compile Include="Traits\Player\MissionObjectives.cs" />
     <Compile Include="Traits\Player\PlaceBeacon.cs" />
+    <Compile Include="Traits\Player\PlaceBuilding.cs" />
     <Compile Include="Traits\Player\PlayerStatistics.cs" />
+    <Compile Include="Traits\Player\ProductionQueue.cs" />
     <Compile Include="Traits\Player\ProvidesCustomPrerequisite.cs" />
     <Compile Include="Traits\Player\ProvidesTechPrerequisite.cs" />
     <Compile Include="Traits\Player\StrategicVictoryConditions.cs" />
@@ -260,6 +264,8 @@
     <Compile Include="Traits\Power\Power.cs" />
     <Compile Include="Traits\Power\RequiresPower.cs" />
     <Compile Include="Traits\Power\ScalePowerWithHealth.cs" />
+    <Compile Include="Traits\Production.cs" />
+    <Compile Include="Traits\ProductionQueueFromSelection.cs" />
     <Compile Include="Traits\ProvidesRadar.cs" />
     <Compile Include="Traits\ProximityCaptor.cs" />
     <Compile Include="Traits\ProximityCapturable.cs" />
@@ -269,10 +275,12 @@
     <Compile Include="Traits\Render\RenderBuilding.cs" />
     <Compile Include="Traits\Render\RenderBuildingCharge.cs" />
     <Compile Include="Traits\Render\RenderBuildingTurreted.cs" />
+    <Compile Include="Traits\Render\RenderBuildingWarFactory.cs" />
     <Compile Include="Traits\Render\RenderEditorOnly.cs" />
     <Compile Include="Traits\Render\RenderFlare.cs" />
     <Compile Include="Traits\Render\RenderInfantry.cs" />
     <Compile Include="Traits\Render\RenderNameTag.cs" />
+    <Compile Include="Traits\Render\ProductionBar.cs" />
     <Compile Include="Traits\Render\RenderSimple.cs" />
     <Compile Include="Traits\Render\RenderSprites.cs" />
     <Compile Include="Traits\Render\RenderUnit.cs" />
@@ -381,7 +389,11 @@
     <Compile Include="Widgets\Logic\Ingame\IngameRadarDisplayLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\LoadIngamePlayerOrObserverUILogic.cs" />
     <Compile Include="Widgets\Logic\ModBrowserLogic.cs" />
+    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
     <Compile Include="Widgets\MenuButtonWidget.cs" />
+    <Compile Include="Widgets\ProductionPaletteWidget.cs" />
+    <Compile Include="Widgets\ProductionTabsWidget.cs" />
+    <Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
     <Compile Include="Widgets\RadarWidget.cs" />
     <Compile Include="Widgets\ResourceBarWidget.cs" />
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
diff --git a/OpenRA.Mods.RA/Traits/Buildings/PrimaryBuilding.cs b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs
similarity index 92%
rename from OpenRA.Mods.RA/Traits/Buildings/PrimaryBuilding.cs
rename to OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs
index bb8975a0de..dfed3647df 100644
--- a/OpenRA.Mods.RA/Traits/Buildings/PrimaryBuilding.cs
+++ b/OpenRA.Mods.Common/Traits/Buildings/PrimaryBuilding.cs
@@ -13,7 +13,7 @@ using System.Linq;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	static class PrimaryExts
 	{
@@ -25,9 +25,9 @@ namespace OpenRA.Mods.RA.Traits
 	}
 
 	[Desc("Used together with ClassicProductionQueue.")]
-	class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { }
+	public class PrimaryBuildingInfo : TraitInfo<PrimaryBuilding> { }
 
-	class PrimaryBuilding : IIssueOrder, IResolveOrder, ITags
+	public class PrimaryBuilding : IIssueOrder, IResolveOrder, ITags
 	{
 		bool isPrimary = false;
 		public bool IsPrimary { get { return isPrimary; } }
diff --git a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
similarity index 97%
rename from OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
rename to OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
index 9a96bdb973..4bb1068451 100644
--- a/OpenRA.Mods.RA/Player/ClassicProductionQueue.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ClassicProductionQueue.cs
@@ -10,11 +10,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to the player actor (not a building!) to define a new shared build queue.",
 		"Will only work together with the Production: trait on the actor that actually does the production.",
diff --git a/OpenRA.Mods.RA/Player/PlaceBuilding.cs b/OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
similarity index 97%
rename from OpenRA.Mods.RA/Player/PlaceBuilding.cs
rename to OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
index 4f76631061..6175073611 100644
--- a/OpenRA.Mods.RA/Player/PlaceBuilding.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlaceBuilding.cs
@@ -10,12 +10,10 @@
 
 using System.Linq;
 using OpenRA.Effects;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Allows to execute build orders.", " Attach this to the player actor.")]
 	class PlaceBuildingInfo : TraitInfo<PlaceBuilding> { }
diff --git a/OpenRA.Mods.RA/Player/ProductionQueue.cs b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
similarity index 99%
rename from OpenRA.Mods.RA/Player/ProductionQueue.cs
rename to OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
index a86e5df0c6..06e275b470 100644
--- a/OpenRA.Mods.RA/Player/ProductionQueue.cs
+++ b/OpenRA.Mods.Common/Traits/Player/ProductionQueue.cs
@@ -11,11 +11,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Attach this to an actor (usually a building) to let it produce units or construct buildings.",
 		"If one builds another actor of this type, he will get a separate queue to create two actors",
diff --git a/OpenRA.Mods.RA/Production.cs b/OpenRA.Mods.Common/Traits/Production.cs
similarity index 97%
rename from OpenRA.Mods.RA/Production.cs
rename to OpenRA.Mods.Common/Traits/Production.cs
index 2ac97c6fad..2526322f7d 100644
--- a/OpenRA.Mods.RA/Production.cs
+++ b/OpenRA.Mods.Common/Traits/Production.cs
@@ -12,13 +12,11 @@ using System;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Activities;
-using OpenRA.Mods.Common;
 using OpenRA.Mods.Common.Activities;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("This unit has access to build queues.")]
 	public class ProductionInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/ProductionQueueFromSelection.cs b/OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs
similarity index 96%
rename from OpenRA.Mods.RA/ProductionQueueFromSelection.cs
rename to OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs
index a71f71e8e7..c4568e4e1c 100644
--- a/OpenRA.Mods.RA/ProductionQueueFromSelection.cs
+++ b/OpenRA.Mods.Common/Traits/ProductionQueueFromSelection.cs
@@ -10,12 +10,11 @@
 
 using System;
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
-using OpenRA.Mods.RA.Widgets;
+using OpenRA.Mods.Common.Widgets;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	class ProductionQueueFromSelectionInfo : ITraitInfo
 	{
diff --git a/OpenRA.Mods.RA/ProductionBar.cs b/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
similarity index 97%
rename from OpenRA.Mods.RA/ProductionBar.cs
rename to OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
index 23087fbdc4..0ed003b441 100644
--- a/OpenRA.Mods.RA/ProductionBar.cs
+++ b/OpenRA.Mods.Common/Traits/Render/ProductionBar.cs
@@ -11,10 +11,9 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Visualizes the remaining build time of actor produced here.")]
 	class ProductionBarInfo : ITraitInfo
diff --git a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs b/OpenRA.Mods.Common/Traits/Render/RenderBuildingWarFactory.cs
similarity index 97%
rename from OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
rename to OpenRA.Mods.Common/Traits/Render/RenderBuildingWarFactory.cs
index f551a23ad0..498764b8da 100644
--- a/OpenRA.Mods.RA/Render/RenderBuildingWarFactory.cs
+++ b/OpenRA.Mods.Common/Traits/Render/RenderBuildingWarFactory.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	class RenderBuildingWarFactoryInfo : RenderBuildingInfo
 	{
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/ProductionTooltipLogic.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
rename to OpenRA.Mods.Common/Widgets/Logic/ProductionTooltipLogic.cs
index 3513a47a4e..5ddcfd5733 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ProductionTooltipLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/ProductionTooltipLogic.cs
@@ -15,7 +15,7 @@ using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets.Logic
+namespace OpenRA.Mods.Common.Widgets.Logic
 {
 	public class ProductionTooltipLogic
 	{
diff --git a/OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
rename to OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
index aae01fe4cb..4472d16d6d 100644
--- a/OpenRA.Mods.RA/Widgets/ProductionPaletteWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
@@ -14,12 +14,11 @@ using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Traits;
+using OpenRA.Mods.Common.Orders;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class ProductionIcon
 	{
diff --git a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs b/OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
similarity index 99%
rename from OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
rename to OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
index 9cf8910229..9e172d08c3 100644
--- a/OpenRA.Mods.RA/Widgets/ProductionTabsWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ProductionTabsWidget.cs
@@ -13,10 +13,10 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.RA;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class ProductionTab
 	{
diff --git a/OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs b/OpenRA.Mods.Common/Widgets/ProductionTypeButtonWidget.cs
similarity index 95%
rename from OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs
rename to OpenRA.Mods.Common/Widgets/ProductionTypeButtonWidget.cs
index 8b05b2ac27..69f749af53 100644
--- a/OpenRA.Mods.RA/Widgets/ProductionTypeButtonWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ProductionTypeButtonWidget.cs
@@ -10,7 +10,7 @@
 
 using OpenRA.Widgets;
 
-namespace OpenRA.Mods.RA.Widgets
+namespace OpenRA.Mods.Common.Widgets
 {
 	public class ProductionTypeButtonWidget : ButtonWidget
 	{
diff --git a/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs b/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
index e83836d230..0e9474abe0 100644
--- a/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
+++ b/OpenRA.Mods.D2k/Traits/World/ChooseBuildTabOnSelect.cs
@@ -9,8 +9,8 @@
 #endregion
 
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.D2k.Widgets;
-using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 using OpenRA.Widgets;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index fecc130015..273c866bc7 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -135,16 +135,10 @@
     <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
     <Compile Include="ParaDrop.cs" />
-    <Compile Include="Player\ClassicProductionQueue.cs" />
-    <Compile Include="Player\PlaceBuilding.cs" />
-    <Compile Include="Player\ProductionQueue.cs" />
     <Compile Include="Traits\PortableChrono.cs" />
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
-    <Compile Include="Production.cs" />
-    <Compile Include="ProductionBar.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
-    <Compile Include="Render\RenderBuildingWarFactory.cs" />
     <Compile Include="Render\RenderHarvester.cs" />
     <Compile Include="Render\RenderDisguise.cs" />
     <Compile Include="Render\RenderLandingCraft.cs" />
@@ -161,7 +155,6 @@
     <Compile Include="TraitsInterfaces.cs" />
     <Compile Include="Traits\Buildings\Fake.cs" />
     <Compile Include="Traits\Buildings\OreRefinery.cs" />
-    <Compile Include="Traits\Buildings\PrimaryBuilding.cs" />
     <Compile Include="Traits\Harvester.cs" />
     <Compile Include="Traits\HarvesterHuskModifier.cs" />
     <Compile Include="Traits\LeavesHusk.cs" />
@@ -244,10 +237,6 @@
     <Compile Include="SupportPowers\SpawnActorPower.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
-    <Compile Include="Widgets\ProductionPaletteWidget.cs" />
-    <Compile Include="Widgets\ProductionTabsWidget.cs" />
-    <Compile Include="Widgets\ProductionTypeButtonWidget.cs" />
-    <Compile Include="Widgets\Logic\ProductionTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngameCashCounterLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngamePowerCounterLogic.cs" />
     <Compile Include="Widgets\Logic\Ingame\IngamePowerBarLogic.cs" />
@@ -258,7 +247,6 @@
     <Compile Include="Widgets\Logic\SupportPowerTooltipLogic.cs" />
     <Compile Include="Widgets\Logic\SupportPowerBinLogic.cs" />
     <Compile Include="Widgets\Logic\DebugMenuLogic.cs" />
-    <Compile Include="ProductionQueueFromSelection.cs" />
     <Compile Include="GainsStatUpgrades.cs" />
     <Compile Include="Warheads\PerCellDamageWarhead.cs" />
     <Compile Include="Scripting\Properties\HarvesterProperties.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
index 6fe141b636..2721d1e231 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/ClassicProductionLogic.cs
@@ -10,6 +10,7 @@
 
 using System;
 using System.Linq;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
 using OpenRA.Mods.RA.Widgets;
 using OpenRA.Network;

From 5b8c97ae37303eeae1cd3c19123b2aebaf7ff032 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 5 Jan 2015 22:55:27 +0100
Subject: [PATCH 2/3] Move OrderGenerators to Mods.Common

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                  | 3 +++
 .../Orders/BeaconOrderGenerator.cs                            | 2 +-
 .../Orders/GlobalButtonOrderGenerator.cs                      | 3 +--
 .../Orders/PlaceBuildingOrderGenerator.cs                     | 3 +--
 OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs         | 2 +-
 OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs                 | 4 +---
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                          | 3 ---
 OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs       | 1 -
 8 files changed, 8 insertions(+), 13 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Orders/BeaconOrderGenerator.cs (97%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Orders/GlobalButtonOrderGenerator.cs (97%)
 mode change 100755 => 100644
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common}/Orders/PlaceBuildingOrderGenerator.cs (98%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index bb5bcf8ea7..613dbdd609 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -126,9 +126,12 @@
     <Compile Include="Graphics\VoxelActorPreview.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
     <Compile Include="LoadScreens\ModChooserLoadScreen.cs" />
+    <Compile Include="Orders\BeaconOrderGenerator.cs" />
     <Compile Include="Orders\DeployOrderTargeter.cs" />
     <Compile Include="Orders\EnterAlliedActorTargeter.cs" />
     <Compile Include="Orders\RepairOrderGenerator.cs" />
+    <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
+    <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
     <Compile Include="Orders\UnitOrderTargeter.cs" />
     <Compile Include="PlayerExtensions.cs" />
     <Compile Include="ServerTraits\ColorValidator.cs" />
diff --git a/OpenRA.Mods.RA/Orders/BeaconOrderGenerator.cs b/OpenRA.Mods.Common/Orders/BeaconOrderGenerator.cs
similarity index 97%
rename from OpenRA.Mods.RA/Orders/BeaconOrderGenerator.cs
rename to OpenRA.Mods.Common/Orders/BeaconOrderGenerator.cs
index a444bc06b7..6caaaa5b99 100644
--- a/OpenRA.Mods.RA/Orders/BeaconOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/BeaconOrderGenerator.cs
@@ -11,7 +11,7 @@
 using System.Collections.Generic;
 using OpenRA.Graphics;
 
-namespace OpenRA.Mods.RA.Orders
+namespace OpenRA.Mods.Common.Orders
 {
 	public class BeaconOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
old mode 100755
new mode 100644
similarity index 97%
rename from OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs
rename to OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
index cefff53dfe..8228c47ad4
--- a/OpenRA.Mods.RA/Orders/GlobalButtonOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Orders
+namespace OpenRA.Mods.Common.Orders
 {
 	public class GlobalButtonOrderGenerator<T> : IOrderGenerator
 	{
diff --git a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
similarity index 98%
rename from OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
rename to OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
index a0d4c71534..ff32d9d52d 100644
--- a/OpenRA.Mods.RA/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs
@@ -14,11 +14,10 @@ using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Primitives;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Orders
+namespace OpenRA.Mods.Common.Orders
 {
 	public class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
index 4472d16d6d..25d15d4e71 100644
--- a/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
+++ b/OpenRA.Mods.Common/Widgets/ProductionPaletteWidget.cs
@@ -13,8 +13,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Orders;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Network;
 using OpenRA.Widgets;
 
diff --git a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
index c76adc5294..6060e4a67d 100644
--- a/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
+++ b/OpenRA.Mods.D2k/Widgets/BuildPaletteWidget.cs
@@ -13,10 +13,8 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using OpenRA.Graphics;
+using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Mods.RA;
-using OpenRA.Mods.RA.Orders;
-using OpenRA.Mods.RA.Traits;
 using OpenRA.Network;
 using OpenRA.Primitives;
 using OpenRA.Traits;
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 273c866bc7..7f71a7d537 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -132,8 +132,6 @@
     <Compile Include="Traits\MadTank.cs" />
     <Compile Include="Traits\Mine.cs" />
     <Compile Include="Traits\Minelayer.cs" />
-    <Compile Include="Orders\PlaceBuildingOrderGenerator.cs" />
-    <Compile Include="Orders\GlobalButtonOrderGenerator.cs" />
     <Compile Include="ParaDrop.cs" />
     <Compile Include="Traits\PortableChrono.cs" />
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
@@ -216,7 +214,6 @@
     <Compile Include="Widgets\Logic\ReplayControlBarLogic.cs" />
     <Compile Include="Traits\Attack\AttackGarrisoned.cs" />
     <Compile Include="Widgets\Logic\LobbyMapPreviewLogic.cs" />
-    <Compile Include="Orders\BeaconOrderGenerator.cs" />
     <Compile Include="Widgets\Logic\ControlGroupLogic.cs" />
     <Compile Include="Scripting\Global\ReinforcementsGlobal.cs" />
     <Compile Include="Scripting\Properties\ProductionProperties.cs" />
diff --git a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
index da52e3045b..0f1ff1c60b 100644
--- a/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
+++ b/OpenRA.Mods.RA/Widgets/Logic/OrderButtonsChromeLogic.cs
@@ -13,7 +13,6 @@ using System.Linq;
 using OpenRA.Mods.Common.Orders;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Mods.Common.Widgets;
-using OpenRA.Mods.RA.Orders;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.RA.Widgets.Logic

From c431545a44ff31c2594d9758cce7950f77bc93c3 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Mon, 5 Jan 2015 23:08:29 +0100
Subject: [PATCH 3/3] Wrap up Render traits move

---
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj           |  2 ++
 .../Traits}/Render/WithActiveAnimation.cs              |  3 +--
 .../Traits}/Render/WithIdleOverlay.cs                  |  3 +--
 OpenRA.Mods.RA/OpenRA.Mods.RA.csproj                   | 10 ++++------
 OpenRA.Mods.RA/{ => Traits}/Render/RenderDisguise.cs   |  0
 OpenRA.Mods.RA/{ => Traits}/Render/RenderHarvester.cs  |  0
 .../{ => Traits}/Render/RenderLandingCraft.cs          |  0
 OpenRA.Mods.RA/{ => Traits}/Render/RenderUnitReload.cs |  0
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithActiveAnimation.cs (96%)
 rename {OpenRA.Mods.RA => OpenRA.Mods.Common/Traits}/Render/WithIdleOverlay.cs (98%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderDisguise.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderHarvester.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderLandingCraft.cs (100%)
 rename OpenRA.Mods.RA/{ => Traits}/Render/RenderUnitReload.cs (100%)

diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index 613dbdd609..84c20944bb 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -294,11 +294,13 @@
     <Compile Include="Traits\Render\RenderBuildingWall.cs" />
     <Compile Include="Traits\Render\RenderDetectionCircle.cs" />
     <Compile Include="Traits\Render\RenderRangeCircle.cs" />
+    <Compile Include="Traits\Render\WithActiveAnimation.cs" />
     <Compile Include="Traits\Render\WithBuildingPlacedAnimation.cs" />
     <Compile Include="Traits\Render\WithMakeAnimation.cs" />
     <Compile Include="Traits\Render\WithCrateBody.cs" />
     <Compile Include="Traits\Render\WithDeathAnimation.cs" />
     <Compile Include="Traits\Render\WithHarvestAnimation.cs" />
+    <Compile Include="Traits\Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\Render\WithMuzzleFlash.cs" />
     <Compile Include="Traits\Render\WithRangeCircle.cs" />
     <Compile Include="Traits\Render\WithRepairAnimation.cs" />
diff --git a/OpenRA.Mods.RA/Render/WithActiveAnimation.cs b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
similarity index 96%
rename from OpenRA.Mods.RA/Render/WithActiveAnimation.cs
rename to OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
index 965c657548..a372ee24d9 100644
--- a/OpenRA.Mods.RA/Render/WithActiveAnimation.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithActiveAnimation.cs
@@ -11,10 +11,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Replaces the idle animation of a building.")]
 	public class WithActiveAnimationInfo : ITraitInfo, Requires<RenderBuildingInfo>
diff --git a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
similarity index 98%
rename from OpenRA.Mods.RA/Render/WithIdleOverlay.cs
rename to OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
index b50d585e3e..0b67e178b1 100644
--- a/OpenRA.Mods.RA/Render/WithIdleOverlay.cs
+++ b/OpenRA.Mods.Common/Traits/Render/WithIdleOverlay.cs
@@ -12,10 +12,9 @@ using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
-using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Renders a decorative animation on units and buildings.")]
 	public class WithIdleOverlayInfo : ITraitInfo, IRenderActorPreviewSpritesInfo, Requires<RenderSpritesInfo>, Requires<IBodyOrientationInfo>
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index 7f71a7d537..6214752d43 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -81,7 +81,6 @@
     <Compile Include="AI\AttackOrFleeFuzzy.cs" />
     <Compile Include="AI\BaseBuilder.cs" />
     <Compile Include="AI\HackyAI.cs" />
-    <Compile Include="Render\WithIdleOverlay.cs" />
     <Compile Include="Traits\AcceptsSupplies.cs" />
     <Compile Include="Activities\DeliverResources.cs" />
     <Compile Include="Activities\Demolish.cs" />
@@ -96,7 +95,7 @@
     <Compile Include="Effects\GpsSatellite.cs" />
     <Compile Include="Effects\SatelliteLaunch.cs" />
     <Compile Include="Effects\TeslaZap.cs" />
-    <Compile Include="Render\RenderUnitReload.cs" />
+    <Compile Include="Traits\Render\RenderUnitReload.cs" />
     <Compile Include="Graphics\TeslaZapRenderable.cs" />
     <Compile Include="EjectOnDeath.cs" />
     <Compile Include="AI\RushFuzzy.cs" />
@@ -137,9 +136,9 @@
     <Compile Include="Scripting\Properties\GuardProperties.cs" />
     <Compile Include="Widgets\Logic\TabCompletionLogic.cs" />
     <Compile Include="Traits\Render\RenderJammerCircle.cs" />
-    <Compile Include="Render\RenderHarvester.cs" />
-    <Compile Include="Render\RenderDisguise.cs" />
-    <Compile Include="Render\RenderLandingCraft.cs" />
+    <Compile Include="Traits\Render\RenderHarvester.cs" />
+    <Compile Include="Traits\Render\RenderDisguise.cs" />
+    <Compile Include="Traits\Render\RenderLandingCraft.cs" />
     <Compile Include="Disguise.cs" />
     <Compile Include="Traits\SupplyTruck.cs" />
     <Compile Include="SupportPowers\AirstrikePower.cs" />
@@ -230,7 +229,6 @@
     <Compile Include="Parachutable.cs" />
     <Compile Include="Widgets\Logic\InstallFromCDLogic.cs" />
     <Compile Include="Widgets\Logic\InstallMusicLogic.cs" />
-    <Compile Include="Render\WithActiveAnimation.cs" />
     <Compile Include="SupportPowers\SpawnActorPower.cs" />
     <Compile Include="Traits\Buildings\ClonesProducedUnits.cs" />
     <Compile Include="Cloneable.cs" />
diff --git a/OpenRA.Mods.RA/Render/RenderDisguise.cs b/OpenRA.Mods.RA/Traits/Render/RenderDisguise.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderDisguise.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderDisguise.cs
diff --git a/OpenRA.Mods.RA/Render/RenderHarvester.cs b/OpenRA.Mods.RA/Traits/Render/RenderHarvester.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderHarvester.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderHarvester.cs
diff --git a/OpenRA.Mods.RA/Render/RenderLandingCraft.cs b/OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderLandingCraft.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderLandingCraft.cs
diff --git a/OpenRA.Mods.RA/Render/RenderUnitReload.cs b/OpenRA.Mods.RA/Traits/Render/RenderUnitReload.cs
similarity index 100%
rename from OpenRA.Mods.RA/Render/RenderUnitReload.cs
rename to OpenRA.Mods.RA/Traits/Render/RenderUnitReload.cs