From da29250711a1c11f2fe6fea69f56790494a7afcc Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Fri, 27 Apr 2018 19:20:21 +0000
Subject: [PATCH] Move PlayerResources to Mods.Common.

---
 OpenRA.Game/OpenRA.Game.csproj                                 | 1 -
 OpenRA.Mods.Common/AI/BaseBuilder.cs                           | 1 -
 OpenRA.Mods.Common/OpenRA.Mods.Common.csproj                   | 1 +
 OpenRA.Mods.Common/Scripting/Properties/ResourceProperties.cs  | 1 +
 .../Traits/Player/PlayerResources.cs                           | 3 ++-
 OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs  | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename {OpenRA.Game => OpenRA.Mods.Common}/Traits/Player/PlayerResources.cs (98%)

diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj
index 42091b6c03..516da4b424 100644
--- a/OpenRA.Game/OpenRA.Game.csproj
+++ b/OpenRA.Game/OpenRA.Game.csproj
@@ -181,7 +181,6 @@
     <Compile Include="Sync.cs" />
     <Compile Include="TraitDictionary.cs" />
     <Compile Include="Traits\LintAttributes.cs" />
-    <Compile Include="Traits\Player\PlayerResources.cs" />
     <Compile Include="Traits\Player\Shroud.cs" />
     <Compile Include="Traits\Selectable.cs" />
     <Compile Include="Traits\Target.cs" />
diff --git a/OpenRA.Mods.Common/AI/BaseBuilder.cs b/OpenRA.Mods.Common/AI/BaseBuilder.cs
index 1774231633..add3c688de 100644
--- a/OpenRA.Mods.Common/AI/BaseBuilder.cs
+++ b/OpenRA.Mods.Common/AI/BaseBuilder.cs
@@ -13,7 +13,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using OpenRA.Mods.Common.Traits;
-using OpenRA.Support;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common.AI
diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
index b1835e72b2..9fa0585ebd 100644
--- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
+++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj
@@ -863,6 +863,7 @@
     <Compile Include="UpdateRules\Rules\RemoveWithReloadingSpriteTurret.cs" />
     <Compile Include="UpdateRules\Rules\AddEditorPlayer.cs" />
     <Compile Include="UpdateRules\Rules\RemovePaletteFromCurrentTileset.cs" />
+    <Compile Include="Traits\Player\PlayerResources.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="AfterBuild">
diff --git a/OpenRA.Mods.Common/Scripting/Properties/ResourceProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/ResourceProperties.cs
index 2e17b8659f..f7db499990 100644
--- a/OpenRA.Mods.Common/Scripting/Properties/ResourceProperties.cs
+++ b/OpenRA.Mods.Common/Scripting/Properties/ResourceProperties.cs
@@ -10,6 +10,7 @@
 #endregion
 
 using System;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Scripting;
 using OpenRA.Traits;
 
diff --git a/OpenRA.Game/Traits/Player/PlayerResources.cs b/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
similarity index 98%
rename from OpenRA.Game/Traits/Player/PlayerResources.cs
rename to OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
index 27a7f637be..e91cc95ee6 100644
--- a/OpenRA.Game/Traits/Player/PlayerResources.cs
+++ b/OpenRA.Mods.Common/Traits/Player/PlayerResources.cs
@@ -12,8 +12,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using OpenRA.Traits;
 
-namespace OpenRA.Traits
+namespace OpenRA.Mods.Common.Traits
 {
 	public class PlayerResourcesInfo : ITraitInfo, ILobbyOptions
 	{
diff --git a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
index 3c0a8a98c9..163a822eb1 100644
--- a/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
+++ b/OpenRA.Mods.Common/Widgets/Logic/Ingame/IngameSiloBarLogic.cs
@@ -10,7 +10,7 @@
 #endregion
 
 using System.Drawing;
-using OpenRA.Traits;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Widgets;
 
 namespace OpenRA.Mods.Common.Widgets.Logic