Remove AS's copy of ResourcePurifier, update GCoRP.

OpenRA.Mods.AS/Traits/Conditions/GrantConditionOnResourcePurify.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System.Linq;
 using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
@@ -24,30 +25,34 @@ public class GrantConditionOnResourcePurifyInfo : PausableConditionalTraitInfo
 		[FieldLoader.Require]
 		public readonly int Duration;
 
-		public override object Create(ActorInitializer init) { return new GrantConditionOnResourcePurify(init.Self, this); }
+		[Desc("ResourceTypes to grant this condition. When empty, all resources trigger.")]
+		public readonly string[] ResourceTypes = System.Array.Empty<string>();
+
+		public override object Create(ActorInitializer init) { return new GrantConditionOnResourcePurify(this); }
 	}
 
-	public class GrantConditionOnResourcePurify : PausableConditionalTrait<GrantConditionOnResourcePurifyInfo>, ITick, IResourcePurifier
+	public class GrantConditionOnResourcePurify : PausableConditionalTrait<GrantConditionOnResourcePurifyInfo>, ITick, INotifyResourceAccepted
 	{
-		readonly Actor self;
 		readonly GrantConditionOnResourcePurifyInfo info;
 
 		int token = Actor.InvalidConditionToken;
 
 		int ticks;
 
-		public GrantConditionOnResourcePurify(Actor self, GrantConditionOnResourcePurifyInfo info)
+		public GrantConditionOnResourcePurify(GrantConditionOnResourcePurifyInfo info)
 			: base(info)
 		{
-			this.self = self;
 			this.info = info;
 		}
 
-		void IResourcePurifier.RefineAmount(int amount)
+		void INotifyResourceAccepted.OnResourceAccepted(Actor self, Actor refinery, string resourceType, int count, int value)
 		{
 			if (IsTraitDisabled)
 				return;
 
+			if (info.ResourceTypes.Length != 0 && !Info.ResourceTypes.Contains(resourceType))
+				return;
+
 			ticks = info.Duration;
 
 			if (token == Actor.InvalidConditionToken)

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

@@ -90,10 +90,6 @@ int IAcceptResources.AcceptResources(Actor self, string resourceType, int count)
 			foreach (var rrd in refineryResourceDelivereds)
 				rrd.ResourceGiven(self, value);
 
-			var purifiers = self.World.ActorsWithTrait<IResourcePurifier>().Where(x => x.Actor.Owner == self.Owner).Select(x => x.Trait);
-			foreach (var p in purifiers)
-				p.RefineAmount(value);
-
 			if (info.ShowTicks)
 				currentDisplayValue += value;
 

OpenRA.Mods.Common/TraitsInterfacesExternal.cs

@@ -18,12 +18,6 @@ namespace OpenRA.Mods.Common.Traits
 	[RequireExplicitImplementation]
 	public interface IBuildPaletteOrderModifierInfo : ITraitInfoInterface { int GetBuildPaletteOrderModifier(TechTree techTree, string queue); }
 
-	[RequireExplicitImplementation]
-	public interface IResourcePurifier
-	{
-		void RefineAmount(int amount);
-	}
-
 	[RequireExplicitImplementation]
 	public interface IResourceLogicLayer
 	{