Move ResourceClaim and ResourceClaimLayer to Mods.Common

OpenRA.Mods.Cnc/Activities/HarvesterDockSequence.cs

@@ -10,6 +10,7 @@
 
 using System;
 using System.Collections.Generic;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;

OpenRA.Mods.Common/CommonTraitsInterfaces.cs

@@ -13,5 +13,10 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.Common
 {
+	public interface INotifyResourceClaimLost
+	{
+		void OnNotifyResourceClaimLost(Actor self, ResourceClaim claim, Actor claimer);
+	}
+
 	public interface INotifyChat { bool OnChat(string from, string message); }
 }

OpenRA.Mods.Common/OpenRA.Mods.Common.csproj

@@ -100,6 +100,8 @@
     <Compile Include="Widgets\ResourceBarWidget.cs" />
     <Compile Include="World\PlayMusicOnMapLoad.cs" />
     <Compile Include="World\RadarPings.cs" />
+    <Compile Include="World\ResourceClaim.cs" />
+    <Compile Include="World\ResourceClaimLayer.cs" />
     <Compile Include="World\SmudgeLayer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

OpenRA.Mods.Common/World/ResourceClaim.cs

@@ -8,7 +8,7 @@
  */
 #endregion
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	public sealed class ResourceClaim
 	{

OpenRA.Mods.Common/World/ResourceClaimLayer.cs

@@ -1,8 +1,18 @@
-using System.Collections.Generic;
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using System.Collections.Generic;
 using OpenRA.Graphics;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.RA
+namespace OpenRA.Mods.Common
 {
 	[Desc("Allows harvesters to coordinate their operations. Attach this to the world actor.")]
 	public sealed class ResourceClaimLayerInfo : TraitInfo<ResourceClaimLayer> { }

OpenRA.Mods.RA/Activities/FindResources.cs

@@ -12,6 +12,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Traits;
 

OpenRA.Mods.RA/Harvester.cs

@@ -11,6 +11,7 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
+using OpenRA.Mods.Common;
 using OpenRA.Mods.RA.Activities;
 using OpenRA.Mods.RA.Move;
 using OpenRA.Mods.RA.Orders;

OpenRA.Mods.RA/OpenRA.Mods.RA.csproj

@@ -396,8 +396,6 @@
     <Compile Include="Widgets\StrategicProgressWidget.cs" />
     <Compile Include="Widgets\SupportPowerTimerWidget.cs" />
     <Compile Include="Widgets\WorldCommandWidget.cs" />
-    <Compile Include="World\ResourceClaim.cs" />
-    <Compile Include="World\ResourceClaimLayer.cs" />
     <Compile Include="Player\BaseAttackNotifier.cs" />
     <Compile Include="Player\HarvesterAttackNotifier.cs" />
     <Compile Include="Infiltration\InfiltrateForExploration.cs" />

OpenRA.Mods.RA/TraitsInterfaces.cs

@@ -42,11 +42,6 @@ namespace OpenRA.Mods.RA
 		IEnumerable<string> ProvidesPrerequisites {get;}
 	}
 
-	public interface INotifyResourceClaimLost
-	{
-		void OnNotifyResourceClaimLost(Actor self, ResourceClaim claim, Actor claimer);
-	}
-
 	public interface INotifyParachuteLanded { void OnLanded(); }
 	public interface INotifyTransform { void BeforeTransform(Actor self); void OnTransform(Actor self); void AfterTransform(Actor toActor); }
 	public interface INotifyAttack { void Attacking(Actor self, Target target, Armament a, Barrel barrel); }