Replace ResourceLayer references with IResourceLayer in traits/warheads.

OpenRA.Mods.Cnc/Traits/TransformsNearResources.cs

@@ -46,12 +46,12 @@ namespace OpenRA.Mods.Cnc.Traits
 	public class TransformsNearResources : ITick
 	{
 		readonly TransformsNearResourcesInfo info;
-		readonly ResourceLayer resourceLayer;
+		readonly IResourceLayer resourceLayer;
 		int delay;
 
 		public TransformsNearResources(Actor self, TransformsNearResourcesInfo info)
 		{
-			resourceLayer = self.World.WorldActor.Trait<ResourceLayer>();
+			resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
 			delay = Common.Util.RandomDelay(self.World, info.Delay);
 			this.info = info;
 		}
@@ -66,12 +66,11 @@ namespace OpenRA.Mods.Cnc.Traits
 			{
 				var location = self.Location + direction;
 
-				var resource = resourceLayer.GetResourceType(location);
+				var resource = resourceLayer.GetResource(location);
-				if (resource == null || resource.Info.Type != info.Type)
+				if (resource.Type == null || resource.Type.Info.Type != info.Type)
 					continue;
 
-				var density = resourceLayer.GetResourceDensity(location);
+				if (resource.Density < info.Density)
-				if (density < info.Density)
 					continue;
 
 				if (++adjacent < info.Adjacency)

OpenRA.Mods.Common/Activities/HarvestResource.cs

@@ -24,7 +24,7 @@ namespace OpenRA.Mods.Common.Activities
 		readonly HarvesterInfo harvInfo;
 		readonly IFacing facing;
 		readonly ResourceClaimLayer claimLayer;
-		readonly ResourceLayer resLayer;
+		readonly IResourceLayer resourceLayer;
 		readonly BodyOrientation body;
 		readonly IMove move;
 		readonly CPos targetCell;
@@ -38,7 +38,7 @@ namespace OpenRA.Mods.Common.Activities
 			body = self.Trait<BodyOrientation>();
 			move = self.Trait<IMove>();
 			claimLayer = self.World.WorldActor.Trait<ResourceClaimLayer>();
-			resLayer = self.World.WorldActor.Trait<ResourceLayer>();
+			resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
 			this.targetCell = targetCell;
 			notifyHarvesterActions = self.TraitsImplementing<INotifyHarvesterAction>().ToArray();
 		}
@@ -81,14 +81,14 @@ namespace OpenRA.Mods.Common.Activities
 				}
 			}
 
-			var resourceType = resLayer.GetResourceType(self.Location);
+			var resource = resourceLayer.GetResource(self.Location);
-			if (resourceType == null || resLayer.RemoveResource(resourceType, self.Location) != 1)
+			if (resource.Type == null || resourceLayer.RemoveResource(resource.Type, self.Location) != 1)
 				return true;
 
-			harv.AcceptResource(self, resourceType);
+			harv.AcceptResource(self, resource.Type);
 
 			foreach (var t in notifyHarvesterActions)
-				t.Harvested(self, resourceType);
+				t.Harvested(self, resource.Type);
 
 			QueueChild(new Wait(harvInfo.BaleLoadDelay));
 			return false;

OpenRA.Mods.Common/EditorBrushes/EditorResourceBrush.cs

@@ -33,7 +33,7 @@ namespace OpenRA.Mods.Common.Widgets
 		public EditorResourceBrush(EditorViewportControllerWidget editorWidget, ResourceType resource, WorldRenderer wr)
 		{
 			this.editorWidget = editorWidget;
-			ResourceType = resource.Info;
+			ResourceType = resource;
 			worldRenderer = wr;
 			world = wr.World;
 			editorActionManager = world.WorldActor.Trait<EditorActionManager>();
@@ -41,7 +41,7 @@ namespace OpenRA.Mods.Common.Widgets
 			resourceLayer = world.WorldActor.Trait<IResourceLayer>();
 			action = new AddResourcesEditorAction(world.Map, resourceLayer, resource);
 
-			cursorToken = editorCursor.SetResource(wr, resource.Info);
+			cursorToken = editorCursor.SetResource(wr, resource);
 		}
 
 		public bool HandleMouseInput(MouseInput mi)

OpenRA.Mods.Common/Orders/PlaceBuildingOrderGenerator.cs

@@ -87,7 +87,7 @@ namespace OpenRA.Mods.Common.Orders
 		readonly World world;
 		readonly ProductionQueue queue;
 		readonly PlaceBuildingInfo placeBuildingInfo;
-		readonly ResourceLayer resourceLayer;
+		readonly IResourceLayer resourceLayer;
 		readonly Viewport viewport;
 		readonly VariantWrapper[] variants;
 		int variant;
@@ -97,7 +97,7 @@ namespace OpenRA.Mods.Common.Orders
 			this.queue = queue;
 			world = queue.Actor.World;
 			placeBuildingInfo = queue.Actor.Owner.PlayerActor.Info.TraitInfo<PlaceBuildingInfo>();
-			resourceLayer = world.WorldActor.TraitOrDefault<ResourceLayer>();
+			resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
 			viewport = worldRenderer.Viewport;
 
 			// Clear selection if using Left-Click Orders
@@ -279,7 +279,7 @@ namespace OpenRA.Mods.Common.Orders
 			{
 				var isCloseEnough = buildingInfo.IsCloseEnoughToBase(world, world.LocalPlayer, actorInfo, topLeft);
 				foreach (var t in buildingInfo.Tiles(topLeft))
-					footprint.Add(t, MakeCellType(isCloseEnough && world.IsCellBuildable(t, actorInfo, buildingInfo) && (resourceLayer == null || resourceLayer.GetResourceType(t) == null)));
+					footprint.Add(t, MakeCellType(isCloseEnough && world.IsCellBuildable(t, actorInfo, buildingInfo) && (resourceLayer == null || resourceLayer.GetResource(t).Type == null)));
 			}
 
 			return preview?.Render(wr, topLeft, footprint) ?? Enumerable.Empty<IRenderable>();

OpenRA.Mods.Common/Traits/BotModules/HarvesterBotModule.cs

@@ -63,7 +63,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		IPathFinder pathfinder;
 		DomainIndex domainIndex;
-		ResourceLayer resLayer;
+		IResourceLayer resourceLayer;
 		ResourceClaimLayer claimLayer;
 		IBotRequestUnitProduction[] requestUnitProduction;
 		int scanForIdleHarvestersTicks;
@@ -85,7 +85,7 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			pathfinder = world.WorldActor.Trait<IPathFinder>();
 			domainIndex = world.WorldActor.Trait<DomainIndex>();
-			resLayer = world.WorldActor.TraitOrDefault<ResourceLayer>();
+			resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
 			claimLayer = world.WorldActor.TraitOrDefault<ResourceClaimLayer>();
 
 			// Avoid all AIs scanning for idle harvesters on the same tick, randomize their initial scan delay.
@@ -94,7 +94,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		void IBotTick.BotTick(IBot bot)
 		{
-			if (resLayer == null || resLayer.IsResourceLayerEmpty)
+			if (resourceLayer == null || resourceLayer.IsEmpty)
 				return;
 
 			if (--scanForIdleHarvestersTicks > 0)

OpenRA.Mods.Common/Traits/Buildings/BuildingUtils.cs

@@ -87,9 +87,9 @@ namespace OpenRA.Mods.Common.Traits
 			if (bi.AllowInvalidPlacement)
 				return true;
 
-			var res = world.WorldActor.TraitOrDefault<ResourceLayer>();
+			var resourceLayer = world.WorldActor.TraitOrDefault<IResourceLayer>();
 			return bi.Tiles(cell).All(t => world.Map.Contains(t) &&
-				(bi.AllowPlacementOnResources || res == null || res.GetResourceType(t) == null) &&
+				(bi.AllowPlacementOnResources || resourceLayer == null || resourceLayer.GetResource(t).Type == null) &&
 					world.IsCellBuildable(t, ai, bi, toIgnore));
 		}
 

OpenRA.Mods.Common/Traits/Harvester.cs

@@ -106,7 +106,7 @@ namespace OpenRA.Mods.Common.Traits
 		public readonly IReadOnlyDictionary<ResourceTypeInfo, int> Contents;
 
 		readonly Mobile mobile;
-		readonly ResourceLayer resLayer;
+		readonly IResourceLayer resourceLayer;
 		readonly ResourceClaimLayer claimLayer;
 		readonly Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>();
 		int conditionToken = Actor.InvalidConditionToken;
@@ -138,7 +138,7 @@ namespace OpenRA.Mods.Common.Traits
 			Contents = new ReadOnlyDictionary<ResourceTypeInfo, int>(contents);
 
 			mobile = self.Trait<Mobile>();
-			resLayer = self.World.WorldActor.Trait<ResourceLayer>();
+			resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
 			claimLayer = self.World.WorldActor.Trait<ResourceClaimLayer>();
 		}
 
@@ -276,12 +276,12 @@ namespace OpenRA.Mods.Common.Traits
 			if (cell.Layer != 0)
 				return false;
 
-			var resType = resLayer.GetResourceType(cell);
+			var resourceType = resourceLayer.GetResource(cell).Type;
-			if (resType == null)
+			if (resourceType == null)
 				return false;
 
 			// Can the harvester collect this kind of resource?
-			return Info.Resources.Contains(resType.Info.Type);
+			return Info.Resources.Contains(resourceType.Info.Type);
 		}
 
 		IEnumerable<IOrderTargeter> IIssueOrder.Orders

OpenRA.Mods.Common/Traits/SeedsResource.cs

@@ -30,7 +30,7 @@ namespace OpenRA.Mods.Common.Traits
 		readonly SeedsResourceInfo info;
 
 		readonly ResourceType resourceType;
-		readonly ResourceLayer resLayer;
+		readonly IResourceLayer resourceLayer;
 
 		public SeedsResource(Actor self, SeedsResourceInfo info)
 			: base(info)
@@ -43,7 +43,7 @@ namespace OpenRA.Mods.Common.Traits
 			if (resourceType == null)
 				throw new InvalidOperationException("No such resource type `{0}`".F(info.ResourceType));
 
-			resLayer = self.World.WorldActor.Trait<ResourceLayer>();
+			resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
 		}
 
 		int ticks;
@@ -64,12 +64,11 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			var cell = Util.RandomWalk(self.Location, self.World.SharedRandom)
 				.Take(info.MaxRange)
-				.SkipWhile(p => !self.World.Map.Contains(p) ||
+				.SkipWhile(p => resourceLayer.GetResource(p).Type == resourceType && !resourceLayer.CanAddResource(resourceType, p))
-					(resLayer.GetResourceType(p) == resourceType && resLayer.IsFull(p)))
 				.Cast<CPos?>().FirstOrDefault();
 
-			if (cell != null && resLayer.CanAddResource(resourceType, cell.Value))
+			if (cell != null && resourceLayer.CanAddResource(resourceType, cell.Value))
-				resLayer.AddResource(resourceType, cell.Value);
+				resourceLayer.AddResource(resourceType, cell.Value);
 		}
 	}
 }

OpenRA.Mods.Common/Traits/World/EditorResourceLayer.cs

@@ -35,12 +35,13 @@ namespace OpenRA.Mods.Common.Traits
 
 		public event Action<CPos, ResourceType> CellChanged;
 
-		ResourceLayerContents IResourceLayer.GetResource(CPos cell) { return Tiles[cell]; }
+		ResourceLayerContents IResourceLayer.GetResource(CPos cell) { return Tiles.Contains(cell) ? Tiles[cell] : default; }
 		bool IResourceLayer.CanAddResource(ResourceType resourceType, CPos cell, int amount) { return CanAddResource(resourceType, cell, amount); }
 		int IResourceLayer.AddResource(ResourceType resourceType, CPos cell, int amount) { return AddResource(resourceType, cell, amount); }
 		int IResourceLayer.RemoveResource(ResourceType resourceType, CPos cell, int amount) { return RemoveResource(resourceType, cell, amount); }
 		void IResourceLayer.ClearResources(CPos cell) { ClearResources(cell); }
 		bool IResourceLayer.IsVisible(CPos cell) { return Map.Contains(cell); }
+		bool IResourceLayer.IsEmpty => false;
 
 		public EditorResourceLayer(Actor self)
 		{

OpenRA.Mods.Common/Traits/World/ResourceLayer.cs

@@ -29,22 +29,7 @@ namespace OpenRA.Mods.Common.Traits
 		}
 	}
 
-	public interface IResourceLayerInfo : ITraitInfoInterface { }
+	[Desc("Attach this to the world actor.")]
-
-	[RequireExplicitImplementation]
-	public interface IResourceLayer
-	{
-		event Action<CPos, ResourceType> CellChanged;
-		ResourceLayerContents GetResource(CPos cell);
-		bool CanAddResource(ResourceType resourceType, CPos cell, int amount = 1);
-		int AddResource(ResourceType resourceType, CPos cell, int amount = 1);
-		int RemoveResource(ResourceType resourceType, CPos cell, int amount = 1);
-		void ClearResources(CPos cell);
-
-		bool IsVisible(CPos cell);
-	}
-
-	[Desc("Attach this to the world actor.", "Order of the layers defines the Z sorting.")]
 	public class ResourceLayerInfo : TraitInfo, IResourceLayerInfo, Requires<ResourceTypeInfo>, Requires<BuildingInfluenceInfo>
 	{
 		public override object Create(ActorInitializer init) { return new ResourceLayer(init.Self); }
@@ -57,8 +42,6 @@ namespace OpenRA.Mods.Common.Traits
 
 		protected readonly CellLayer<ResourceLayerContents> Content;
 
-		public bool IsResourceLayerEmpty => resCells < 1;
-
 		int resCells;
 
 		public event Action<CPos, ResourceType> CellChanged;
@@ -103,7 +86,7 @@ namespace OpenRA.Mods.Common.Traits
 
 			foreach (var cell in w.Map.AllCells)
 			{
-				var type = GetResourceType(cell);
+				var type = Content[cell].Type;
 				if (type != null)
 				{
 					// Set initial density based on the number of neighboring resources
@@ -140,7 +123,7 @@ namespace OpenRA.Mods.Common.Traits
 			return new ResourceLayerContents(t, 0);
 		}
 
-		public bool CanAddResource(ResourceType resourceType, CPos cell, int amount = 1)
+		bool CanAddResource(ResourceType resourceType, CPos cell, int amount = 1)
 		{
 			if (!world.Map.Contains(cell))
 				return false;
@@ -155,7 +138,7 @@ namespace OpenRA.Mods.Common.Traits
 			return content.Density + amount <= resourceType.Info.MaxDensity;
 		}
 
-		public int AddResource(ResourceType resourceType, CPos cell, int amount = 1)
+		int AddResource(ResourceType resourceType, CPos cell, int amount = 1)
 		{
 			if (!Content.Contains(cell))
 				return 0;
@@ -176,7 +159,7 @@ namespace OpenRA.Mods.Common.Traits
 			return density - oldDensity;
 		}
 
-		public int RemoveResource(ResourceType resourceType, CPos cell, int amount = 1)
+		int RemoveResource(ResourceType resourceType, CPos cell, int amount = 1)
 		{
 			if (!Content.Contains(cell))
 				return 0;
@@ -205,7 +188,7 @@ namespace OpenRA.Mods.Common.Traits
 			return oldDensity - density;
 		}
 
-		public void ClearResources(CPos cell)
+		void ClearResources(CPos cell)
 		{
 			if (!Content.Contains(cell))
 				return;
@@ -222,22 +205,12 @@ namespace OpenRA.Mods.Common.Traits
 			CellChanged?.Invoke(cell, null);
 		}
 
-		public bool IsFull(CPos cell)
+		ResourceLayerContents IResourceLayer.GetResource(CPos cell) { return Content.Contains(cell) ? Content[cell] : default; }
-		{
-			var cellContents = Content[cell];
-			return cellContents.Density == cellContents.Type.Info.MaxDensity;
-		}
-
-		public ResourceType GetResourceType(CPos cell) { return Content[cell].Type; }
-
-		public int GetResourceDensity(CPos cell) { return Content[cell].Density; }
-
-		ResourceLayerContents IResourceLayer.GetResource(CPos cell) { return Content[cell]; }
-
 		bool IResourceLayer.CanAddResource(ResourceType resourceType, CPos cell, int amount) { return CanAddResource(resourceType, cell, amount); }
 		int IResourceLayer.AddResource(ResourceType resourceType, CPos cell, int amount) { return AddResource(resourceType, cell, amount); }
 		int IResourceLayer.RemoveResource(ResourceType resourceType, CPos cell, int amount) { return RemoveResource(resourceType, cell, amount); }
 		void IResourceLayer.ClearResources(CPos cell) { ClearResources(cell); }
 		bool IResourceLayer.IsVisible(CPos cell) { return !world.FogObscures(cell); }
+		bool IResourceLayer.IsEmpty => resCells < 1;
 	}
 }

OpenRA.Mods.Common/TraitsInterfaces.cs

@@ -663,6 +663,22 @@ namespace OpenRA.Mods.Common.Traits
 		IEnumerable<IRenderable> RenderPreview(WorldRenderer wr, TerrainTemplateInfo template, WPos origin);
 	}
 
+	public interface IResourceLayerInfo : ITraitInfoInterface { }
+
+	[RequireExplicitImplementation]
+	public interface IResourceLayer
+	{
+		event Action<CPos, ResourceType> CellChanged;
+		ResourceLayerContents GetResource(CPos cell);
+		bool CanAddResource(ResourceType resourceType, CPos cell, int amount = 1);
+		int AddResource(ResourceType resourceType, CPos cell, int amount = 1);
+		int RemoveResource(ResourceType resourceType, CPos cell, int amount = 1);
+		void ClearResources(CPos cell);
+
+		bool IsVisible(CPos cell);
+		bool IsEmpty { get; }
+	}
+
 	[RequireExplicitImplementation]
 	public interface IResourceRenderer
 	{

OpenRA.Mods.Common/Warheads/CreateResourceWarhead.cs

@@ -56,14 +56,14 @@ namespace OpenRA.Mods.Common.Warheads
 			var resourceType = world.WorldActor.TraitsImplementing<ResourceType>()
 				.First(t => t.Info.Type == AddsResourceType);
 
-			var resLayer = world.WorldActor.Trait<ResourceLayer>();
+			var resourceLayer = world.WorldActor.Trait<IResourceLayer>();
 			foreach (var cell in allCells)
 			{
-				if (!resLayer.CanAddResource(resourceType, cell))
+				if (!resourceLayer.CanAddResource(resourceType, cell))
 					continue;
 
-				var splash = world.SharedRandom.Next(1, resourceType.Info.MaxDensity - resLayer.GetResourceDensity(cell));
+				var splash = world.SharedRandom.Next(1, resourceType.Info.MaxDensity - resourceLayer.GetResource(cell).Density);
-				resLayer.AddResource(resourceType, cell, splash);
+				resourceLayer.AddResource(resourceType, cell, splash);
 			}
 		}
 	}

OpenRA.Mods.Common/Warheads/DestroyResourceWarhead.cs

@@ -34,14 +34,14 @@ namespace OpenRA.Mods.Common.Warheads
 				return;
 
 			var targetTile = world.Map.CellContaining(pos);
-			var resLayer = world.WorldActor.Trait<ResourceLayer>();
+			var resourceLayer = world.WorldActor.Trait<IResourceLayer>();
 
 			var minRange = (Size.Length > 1 && Size[1] > 0) ? Size[1] : 0;
 			var allCells = world.Map.FindTilesInAnnulus(targetTile, minRange, Size[0]);
 
 			// Destroy all resources in the selected tiles
 			foreach (var cell in allCells)
-				resLayer.ClearResources(cell);
+				resourceLayer.ClearResources(cell);
 		}
 	}
 }

OpenRA.Mods.D2k/Traits/SpiceBloom.cs

@@ -61,8 +61,8 @@ namespace OpenRA.Mods.D2k.Traits
 	public class SpiceBloom : ITick, INotifyKilled
 	{
 		readonly SpiceBloomInfo info;
-		readonly ResourceType resType;
+		readonly ResourceType resourceType;
-		readonly ResourceLayer resLayer;
+		readonly IResourceLayer resourceLayer;
 		readonly Animation body;
 		readonly Animation spurt;
 		readonly int growTicks;
@@ -75,8 +75,8 @@ namespace OpenRA.Mods.D2k.Traits
 		{
 			this.info = info;
 
-			resLayer = self.World.WorldActor.Trait<ResourceLayer>();
+			resourceLayer = self.World.WorldActor.Trait<IResourceLayer>();
-			resType = self.World.WorldActor.TraitsImplementing<ResourceType>().First(t => t.Info.Type == info.ResourceType);
+			resourceType = self.World.WorldActor.TraitsImplementing<ResourceType>().First(t => t.Info.Type == info.ResourceType);
 
 			var rs = self.Trait<RenderSprites>();
 			body = new Animation(self.World, rs.GetImage(self));
@@ -126,7 +126,11 @@ namespace OpenRA.Mods.D2k.Traits
 
 			for (var i = 0; i < pieces; i++)
 			{
-				var cell = cells.SkipWhile(p => resLayer.GetResourceType(p) == resType && resLayer.IsFull(p)).Cast<CPos?>().RandomOrDefault(self.World.SharedRandom);
+				var cell = cells
+					.SkipWhile(p => resourceLayer.GetResource(p).Type == resourceType && !resourceLayer.CanAddResource(resourceType, p))
+					.Cast<CPos?>()
+					.RandomOrDefault(self.World.SharedRandom);
+
 				if (cell == null)
 					cell = cells.Random(self.World.SharedRandom);