Replace ITraitInfo interface with TraitInfo class.

Author: pchote

OpenRA.Game/GameRules/ActorInfo.cs

@@ -32,7 +32,7 @@ public class ActorInfo
 		/// </summary>
 		public readonly string Name;
 		readonly TypeDictionary traits = new TypeDictionary();
-		List<ITraitInfo> constructOrderCache = null;
+		List<TraitInfo> constructOrderCache = null;
 
 		public ActorInfo(ObjectCreator creator, string name, MiniYaml node)
 		{
@@ -64,23 +64,23 @@ public ActorInfo(ObjectCreator creator, string name, MiniYaml node)
 			}
 		}
 
-		public ActorInfo(string name, params ITraitInfo[] traitInfos)
+		public ActorInfo(string name, params TraitInfo[] traitInfos)
 		{
 			Name = name;
 			foreach (var t in traitInfos)
 				traits.Add(t);
 			traits.TrimExcess();
 		}
 
-		static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
+		static TraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYaml my)
 		{
 			if (!string.IsNullOrEmpty(my.Value))
 				throw new YamlException("Junk value `{0}` on trait node {1}"
 				.F(my.Value, traitName));
 
 			// HACK: The linter does not want to crash when a trait doesn't exist but only print an error instead
 			// ObjectCreator will only return null to signal us to abort here if the linter is running
-			var info = creator.CreateObject<ITraitInfo>(traitName + "Info");
+			var info = creator.CreateObject<TraitInfo>(traitName + "Info");
 			if (info == null)
 				return null;
 
@@ -97,12 +97,12 @@ static ITraitInfo LoadTraitInfo(ObjectCreator creator, string traitName, MiniYam
 			return info;
 		}
 
-		public IEnumerable<ITraitInfo> TraitsInConstructOrder()
+		public IEnumerable<TraitInfo> TraitsInConstructOrder()
 		{
 			if (constructOrderCache != null)
 				return constructOrderCache;
 
-			var source = traits.WithInterface<ITraitInfo>().Select(i => new
+			var source = traits.WithInterface<TraitInfo>().Select(i => new
 			{
 				Trait = i,
 				Type = i.GetType(),
@@ -148,7 +148,7 @@ public IEnumerable<ITraitInfo> TraitsInConstructOrder()
 			return constructOrderCache;
 		}
 
-		public static IEnumerable<Type> PrerequisitesOf(ITraitInfo info)
+		public static IEnumerable<Type> PrerequisitesOf(TraitInfo info)
 		{
 			return info
 				.GetType()

OpenRA.Game/Traits/DebugPauseState.cs

@@ -12,9 +12,9 @@
 namespace OpenRA.Traits
 {
 	[Desc("Checks for pause related desyncs. Attach this to the world actor.")]
-	public class DebugPauseStateInfo : ITraitInfo
+	public class DebugPauseStateInfo : TraitInfo
 	{
-		public object Create(ActorInitializer init) { return new DebugPauseState(init.World); }
+		public override object Create(ActorInitializer init) { return new DebugPauseState(init.World); }
 	}
 
 	public class DebugPauseState : ISync

OpenRA.Game/Traits/Player/FixedColorPalette.cs

@@ -15,7 +15,7 @@
 namespace OpenRA.Traits
 {
 	[Desc("Add this to the World actor definition.")]
-	public class FixedColorPaletteInfo : ITraitInfo
+	public class FixedColorPaletteInfo : TraitInfo
 	{
 		[PaletteReference]
 		[Desc("The name of the palette to base off.")]
@@ -37,7 +37,7 @@ public class FixedColorPaletteInfo : ITraitInfo
 		[Desc("Allow palette modifiers to change the palette.")]
 		public readonly bool AllowModifiers = true;
 
-		public object Create(ActorInitializer init) { return new FixedColorPalette(this); }
+		public override object Create(ActorInitializer init) { return new FixedColorPalette(this); }
 	}
 
 	public class FixedColorPalette : ILoadsPalettes

OpenRA.Game/Traits/Player/FrozenActorLayer.cs

@@ -23,12 +23,12 @@ public interface ICreatesFrozenActors
 	}
 
 	[Desc("Required for FrozenUnderFog to work. Attach this to the player actor.")]
-	public class FrozenActorLayerInfo : Requires<ShroudInfo>, ITraitInfo
+	public class FrozenActorLayerInfo : TraitInfo, Requires<ShroudInfo>
 	{
 		[Desc("Size of partition bins (cells)")]
 		public readonly int BinSize = 10;
 
-		public object Create(ActorInitializer init) { return new FrozenActorLayer(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new FrozenActorLayer(init.Self, this); }
 	}
 
 	public class FrozenActor

OpenRA.Game/Traits/Player/IndexedPlayerPalette.cs

@@ -17,7 +17,7 @@
 namespace OpenRA.Traits
 {
 	[Desc("Define a player palette by swapping palette indices.")]
-	public class IndexedPlayerPaletteInfo : ITraitInfo, IRulesetLoaded
+	public class IndexedPlayerPaletteInfo : TraitInfo, IRulesetLoaded
 	{
 		[PaletteReference]
 		[Desc("The name of the palette to base off.")]
@@ -35,7 +35,7 @@ public class IndexedPlayerPaletteInfo : ITraitInfo, IRulesetLoaded
 
 		public readonly Dictionary<string, int[]> PlayerIndex;
 
-		public object Create(ActorInitializer init) { return new IndexedPlayerPalette(this); }
+		public override object Create(ActorInitializer init) { return new IndexedPlayerPalette(this); }
 
 		public void RulesetLoaded(Ruleset rules, ActorInfo ai)
 		{

OpenRA.Game/Traits/Player/PlayerColorPalette.cs

@@ -15,7 +15,7 @@
 namespace OpenRA.Traits
 {
 	[Desc("Add this to the Player actor definition.")]
-	public class PlayerColorPaletteInfo : ITraitInfo
+	public class PlayerColorPaletteInfo : TraitInfo
 	{
 		[PaletteReference]
 		[Desc("The name of the palette to base off.")]
@@ -34,7 +34,7 @@ public class PlayerColorPaletteInfo : ITraitInfo
 		[Desc("Allow palette modifiers to change the palette.")]
 		public readonly bool AllowModifiers = true;
 
-		public object Create(ActorInitializer init) { return new PlayerColorPalette(this); }
+		public override object Create(ActorInitializer init) { return new PlayerColorPalette(this); }
 	}
 
 	public class PlayerColorPalette : ILoadsPlayerPalettes

OpenRA.Game/Traits/Player/PlayerHighlightPalette.cs

@@ -16,7 +16,7 @@
 namespace OpenRA.Traits
 {
 	[Desc("Add this to the Player actor definition.")]
-	public class PlayerHighlightPaletteInfo : ITraitInfo
+	public class PlayerHighlightPaletteInfo : TraitInfo
 	{
 		[PaletteDefinition(true)]
 		[Desc("The prefix for the resulting player palettes")]
@@ -25,7 +25,7 @@ public class PlayerHighlightPaletteInfo : ITraitInfo
 		[Desc("Index set to be fully transparent/invisible.")]
 		public readonly int TransparentIndex = 0;
 
-		public object Create(ActorInitializer init) { return new PlayerHighlightPalette(this); }
+		public override object Create(ActorInitializer init) { return new PlayerHighlightPalette(this); }
 	}
 
 	public class PlayerHighlightPalette : ILoadsPlayerPalettes

OpenRA.Game/Traits/Player/Shroud.cs

@@ -15,7 +15,7 @@
 namespace OpenRA.Traits
 {
 	[Desc("Required for shroud and fog visibility checks. Add this to the player actor.")]
-	public class ShroudInfo : ITraitInfo, ILobbyOptions
+	public class ShroudInfo : TraitInfo, ILobbyOptions
 	{
 		[Translate]
 		[Desc("Descriptive label for the fog checkbox in the lobby.")]
@@ -65,7 +65,7 @@ IEnumerable<LobbyOption> ILobbyOptions.LobbyOptions(Ruleset rules)
 				FogCheckboxVisible, FogCheckboxDisplayOrder, FogCheckboxEnabled, FogCheckboxLocked);
 		}
 
-		public object Create(ActorInitializer init) { return new Shroud(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new Shroud(init.Self, this); }
 	}
 
 	public class Shroud : ISync, INotifyCreated, ITick

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -49,7 +49,7 @@ public enum BlockedByActor
 	/// </summary>
 	public sealed class DamageType { DamageType() { } }
 
-	public interface IHealthInfo : ITraitInfo
+	public interface IHealthInfo : ITraitInfoInterface
 	{
 		int MaxHP { get; }
 	}
@@ -324,9 +324,17 @@ public interface IFacing
 	public interface IFacingInfo : ITraitInfoInterface { int GetInitialFacing(); }
 
 	public interface ITraitInfoInterface { }
-	public interface ITraitInfo : ITraitInfoInterface { object Create(ActorInitializer init); }
 
-	public class TraitInfo<T> : ITraitInfo where T : new() { public virtual object Create(ActorInitializer init) { return new T(); } }
+	public abstract class TraitInfo : ITraitInfoInterface
+	{
+		public abstract object Create(ActorInitializer init);
+	}
+
+	public class TraitInfo<T> : TraitInfo where T : new()
+	{
+		public override object Create(ActorInitializer init) { return new T(); }
+	}
+
 	public interface ILobbyCustomRulesIgnore { }
 
 	[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1302:InterfaceNamesMustBeginWithI", Justification = "Not a real interface, but more like a tag.")]
@@ -541,7 +549,7 @@ public interface IUnlocksRenderPlayer { bool RenderPlayerUnlocked { get; } }
 	public interface ICreationActivity { Activity GetCreationActivity(); }
 
 	[RequireExplicitImplementation]
-	public interface IObservesVariablesInfo : ITraitInfo { }
+	public interface IObservesVariablesInfo : ITraitInfoInterface { }
 
 	public delegate void VariableObserverNotifier(Actor self, IReadOnlyDictionary<string, int> variables);
 	public struct VariableObserver

OpenRA.Game/Traits/World/ScreenMap.cs

@@ -30,12 +30,12 @@ public struct ActorBoundsPair
 		public override string ToString() { return "{0}->{1}".F(Actor.Info.Name, Bounds.GetType().Name); }
 	}
 
-	public class ScreenMapInfo : ITraitInfo
+	public class ScreenMapInfo : TraitInfo
 	{
 		[Desc("Size of partition bins (world pixels)")]
 		public readonly int BinSize = 250;
 
-		public object Create(ActorInitializer init) { return new ScreenMap(init.World, this); }
+		public override object Create(ActorInitializer init) { return new ScreenMap(init.World, this); }
 	}
 
 	public class ScreenMap : IWorldLoaded

OpenRA.Game/Traits/World/ScreenShaker.cs

@@ -16,12 +16,12 @@
 
 namespace OpenRA.Traits
 {
-	public class ScreenShakerInfo : ITraitInfo
+	public class ScreenShakerInfo : TraitInfo
 	{
 		public readonly float2 MinMultiplier = new float2(-3, -3);
 		public readonly float2 MaxMultiplier = new float2(3, 3);
 
-		public object Create(ActorInitializer init) { return new ScreenShaker(this); }
+		public override object Create(ActorInitializer init) { return new ScreenShaker(this); }
 	}
 
 	public class ScreenShaker : ITick, IWorldLoaded

OpenRA.Mods.Cnc/Traits/ConyardChronoReturn.cs

@@ -23,7 +23,7 @@ namespace OpenRA.Mods.Cnc.Traits
 	[Desc("Implements the special case handling for the Chronoshiftable return on a construction yard.",
 		"If ReturnOriginalActorOnCondition evaluates true and the actor is not being sold then OriginalActor will be returned to the origin.",
 		"Otherwise, a vortex animation is played and damage is dealt each tick, ignoring modifiers.")]
-	public class ConyardChronoReturnInfo : IObservesVariablesInfo, Requires<HealthInfo>, Requires<WithSpriteBodyInfo>
+	public class ConyardChronoReturnInfo : TraitInfo, Requires<HealthInfo>, Requires<WithSpriteBodyInfo>, IObservesVariablesInfo
 	{
 		[SequenceReference]
 		[Desc("Sequence name with the baked-in vortex animation")]
@@ -58,7 +58,7 @@ public class ConyardChronoReturnInfo : IObservesVariablesInfo, Requires<HealthIn
 		[Desc("The color the bar of the 'return-to-origin' logic has.")]
 		public readonly Color TimeBarColor = Color.White;
 
-		public object Create(ActorInitializer init) { return new ConyardChronoReturn(init, this); }
+		public override object Create(ActorInitializer init) { return new ConyardChronoReturn(init, this); }
 	}
 
 	public class ConyardChronoReturn : ITick, ISync, IObservesVariables, ISelectionBar, INotifySold,

OpenRA.Mods.Cnc/Traits/Disguise.cs

@@ -70,7 +70,7 @@ public enum RevealDisguiseType
 	}
 
 	[Desc("Provides access to the disguise command, which makes the actor appear to be another player's actor.")]
-	class DisguiseInfo : ITraitInfo
+	class DisguiseInfo : TraitInfo
 	{
 		[VoiceReference]
 		public readonly string Voice = "Action";
@@ -96,7 +96,7 @@ class DisguiseInfo : ITraitInfo
 		[GrantedConditionReference]
 		public IEnumerable<string> LinterConditions { get { return DisguisedAsConditions.Values; } }
 
-		public object Create(ActorInitializer init) { return new Disguise(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new Disguise(init.Self, this); }
 	}
 
 	class Disguise : IEffectiveOwner, IIssueOrder, IResolveOrder, IOrderVoice, IRadarColorModifier, INotifyAttack,

OpenRA.Mods.Cnc/Traits/FrozenUnderFogUpdatedByGps.cs

@@ -19,9 +19,9 @@ namespace OpenRA.Mods.Cnc.Traits
 	using FrozenActorAction = Action<FrozenUnderFogUpdatedByGps, FrozenActorLayer, GpsWatcher, FrozenActor>;
 
 	[Desc("Updates frozen actors of actors that change owners, are sold or die whilst having an active GPS power.")]
-	public class FrozenUnderFogUpdatedByGpsInfo : ITraitInfo, Requires<FrozenUnderFogInfo>
+	public class FrozenUnderFogUpdatedByGpsInfo : TraitInfo, Requires<FrozenUnderFogInfo>
 	{
-		public object Create(ActorInitializer init) { return new FrozenUnderFogUpdatedByGps(init); }
+		public override object Create(ActorInitializer init) { return new FrozenUnderFogUpdatedByGps(init); }
 	}
 
 	public class FrozenUnderFogUpdatedByGps : INotifyOwnerChanged, INotifyActorDisposing, IOnGpsRefreshed

OpenRA.Mods.Cnc/Traits/GpsDot.cs

@@ -15,7 +15,7 @@
 namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Show an indicator revealing the actor underneath the fog when a GPSWatcher is activated.")]
-	class GpsDotInfo : ITraitInfo
+	class GpsDotInfo : TraitInfo
 	{
 		[Desc("Sprite collection for symbols.")]
 		public readonly string Image = "gpsdot";
@@ -27,7 +27,7 @@ class GpsDotInfo : ITraitInfo
 		[PaletteReference(true)]
 		public readonly string IndicatorPalettePrefix = "player";
 
-		public object Create(ActorInitializer init) { return new GpsDot(this); }
+		public override object Create(ActorInitializer init) { return new GpsDot(this); }
 	}
 
 	class GpsDot : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld

OpenRA.Mods.Cnc/Traits/GpsWatcher.cs

@@ -17,9 +17,9 @@
 namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Required for `GpsPower`. Attach this to the player actor.")]
-	class GpsWatcherInfo : ITraitInfo
+	class GpsWatcherInfo : TraitInfo
 	{
-		public object Create(ActorInitializer init) { return new GpsWatcher(init.Self.Owner); }
+		public override object Create(ActorInitializer init) { return new GpsWatcher(init.Self.Owner); }
 	}
 
 	interface IOnGpsRefreshed { void OnGpsRefresh(Actor self, Player player); }

OpenRA.Mods.Cnc/Traits/HarvesterHuskModifier.cs

@@ -14,13 +14,13 @@
 
 namespace OpenRA.Mods.Cnc.Traits
 {
-	public class HarvesterHuskModifierInfo : ITraitInfo, Requires<HarvesterInfo>
+	public class HarvesterHuskModifierInfo : TraitInfo, Requires<HarvesterInfo>
 	{
 		[ActorReference]
 		public readonly string FullHuskActor = null;
 		public readonly int FullnessThreshold = 50;
 
-		public object Create(ActorInitializer init) { return new HarvesterHuskModifier(this); }
+		public override object Create(ActorInitializer init) { return new HarvesterHuskModifier(this); }
 	}
 
 	public class HarvesterHuskModifier : IHuskModifier

OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForCash.cs

@@ -18,7 +18,7 @@
 namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Funds are transferred from the owner to the infiltrator.")]
-	class InfiltrateForCashInfo : ITraitInfo
+	class InfiltrateForCashInfo : TraitInfo
 	{
 		[Desc("The `TargetTypes` from `Targetable` that are allowed to enter.")]
 		public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>);
@@ -44,7 +44,7 @@ class InfiltrateForCashInfo : ITraitInfo
 		[Desc("Whether to show the cash tick indicators rising from the actor.")]
 		public readonly bool ShowTicks = true;
 
-		public object Create(ActorInitializer init) { return new InfiltrateForCash(this); }
+		public override object Create(ActorInitializer init) { return new InfiltrateForCash(this); }
 	}
 
 	class InfiltrateForCash : INotifyInfiltrated

OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForExploration.cs

@@ -17,7 +17,7 @@
 namespace OpenRA.Mods.Cnc.Traits
 {
 	[Desc("Steal and reset the owner's exploration.")]
-	class InfiltrateForExplorationInfo : ITraitInfo
+	class InfiltrateForExplorationInfo : TraitInfo
 	{
 		[Desc("The `TargetTypes` from `Targetable` that are allowed to enter.")]
 		public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>);
@@ -30,7 +30,7 @@ class InfiltrateForExplorationInfo : ITraitInfo
 		[Desc("Sound the perpetrator will hear after successful infiltration.")]
 		public readonly string InfiltrationNotification = null;
 
-		public object Create(ActorInitializer init) { return new InfiltrateForExploration(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new InfiltrateForExploration(init.Self, this); }
 	}
 
 	class InfiltrateForExploration : INotifyInfiltrated

OpenRA.Mods.Cnc/Traits/Infiltration/InfiltrateForPowerOutage.cs

@@ -15,7 +15,7 @@
 
 namespace OpenRA.Mods.Cnc.Traits
 {
-	class InfiltrateForPowerOutageInfo : ITraitInfo
+	class InfiltrateForPowerOutageInfo : TraitInfo
 	{
 		[Desc("The `TargetTypes` from `Targetable` that are allowed to enter.")]
 		public readonly BitSet<TargetableType> Types = default(BitSet<TargetableType>);
@@ -31,7 +31,7 @@ class InfiltrateForPowerOutageInfo : ITraitInfo
 		[Desc("Sound the perpetrator will hear after successful infiltration.")]
 		public readonly string InfiltrationNotification = null;
 
-		public object Create(ActorInitializer init) { return new InfiltrateForPowerOutage(init.Self, this); }
+		public override object Create(ActorInitializer init) { return new InfiltrateForPowerOutage(init.Self, this); }
 	}
 
 	class InfiltrateForPowerOutage : INotifyOwnerChanged, INotifyInfiltrated