From e224c64ccc32b723d38ff3a4c1ce41baabc95662 Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue, 13 Apr 2010 18:46:49 +1200
Subject: [PATCH] no more stateless garbage

---
 OpenRA.Game/Traits/AI/AutoHeal.cs                        | 2 +-
 OpenRA.Game/Traits/AI/AutoTarget.cs                      | 4 +---
 OpenRA.Game/Traits/AI/EmitInfantryOnSell.cs              | 2 +-
 OpenRA.Game/Traits/AI/ReturnOnIdle.cs                    | 2 +-
 OpenRA.Game/Traits/Buildable.cs                          | 2 +-
 OpenRA.Game/Traits/Chrome/PowerDownButton.cs             | 4 ++--
 OpenRA.Game/Traits/CustomSellValue.cs                    | 2 +-
 OpenRA.Game/Traits/Explodes.cs                           | 2 +-
 OpenRA.Game/Traits/Fake.cs                               | 2 +-
 OpenRA.Game/Traits/LineBuild.cs                          | 2 +-
 OpenRA.Game/Traits/Modifiers/BelowUnits.cs               | 2 +-
 OpenRA.Game/Traits/Modifiers/InvisibleToOthers.cs        | 2 +-
 OpenRA.Game/Traits/Modifiers/WithShadow.cs               | 2 +-
 OpenRA.Game/Traits/Passenger.cs                          | 2 +-
 OpenRA.Game/Traits/Player/EvaAlerts.cs                   | 2 +-
 OpenRA.Game/Traits/Player/PlaceBuilding.cs               | 2 +-
 OpenRA.Game/Traits/ProvidesRadar.cs                      | 2 +-
 OpenRA.Game/Traits/Render/RenderUnitTurreted.cs          | 2 +-
 OpenRA.Game/Traits/RepairsUnits.cs                       | 2 +-
 OpenRA.Game/Traits/Selectable.cs                         | 2 +-
 OpenRA.Game/Traits/StoresOre.cs                          | 2 +-
 OpenRA.Game/Traits/TraitsInterfaces.cs                   | 7 +------
 OpenRA.Game/Traits/Wall.cs                               | 2 +-
 OpenRA.Game/Traits/World/BibLayer.cs                     | 2 +-
 OpenRA.Game/Traits/World/BridgeLoadHook.cs               | 2 +-
 OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs        | 2 +-
 OpenRA.Game/Traits/World/GlobalDefaults.cs               | 2 +-
 OpenRA.Game/Traits/World/LightPaletteRotator.cs          | 2 +-
 OpenRA.Game/Traits/World/SpawnDefaultUnits.cs            | 2 +-
 OpenRA.Game/Traits/World/SpawnMapActors.cs               | 2 +-
 OpenRA.Game/Traits/World/Theater.cs                      | 2 +-
 OpenRA.Game/Traits/World/WaterPaletteRotation.cs         | 2 +-
 OpenRA.Mods.Cnc/IonCannonPower.cs                        | 2 +-
 OpenRA.Mods.RA/EngineerCapture.cs                        | 2 +-
 OpenRA.Mods.RA/GpsPower.cs                               | 2 +-
 OpenRA.Mods.RA/InfiltrateForSonarPulse.cs                | 2 +-
 OpenRA.Mods.RA/IronCurtainPower.cs                       | 2 +-
 OpenRA.Mods.RA/Mine.cs                                   | 2 +-
 OpenRA.Mods.RA/Minelayer.cs                              | 2 +-
 OpenRA.Mods.RA/RepairableNear.cs                         | 2 +-
 OpenRA.Mods.RA/Spy.cs                                    | 2 +-
 OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs | 2 +-
 OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs         | 2 +-
 OpenRA.Mods.RA/SupportPowers/NukePower.cs                | 2 +-
 OpenRA.Mods.RA/Thief.cs                                  | 2 +-
 45 files changed, 46 insertions(+), 53 deletions(-)

diff --git a/OpenRA.Game/Traits/AI/AutoHeal.cs b/OpenRA.Game/Traits/AI/AutoHeal.cs
index 1fd7243da3..9f0b4e5500 100644
--- a/OpenRA.Game/Traits/AI/AutoHeal.cs
+++ b/OpenRA.Game/Traits/AI/AutoHeal.cs
@@ -23,7 +23,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
-	class AutoHealInfo : StatelessTraitInfo<AutoHeal> { }
+	class AutoHealInfo : TraitInfo<AutoHeal> { }
 
 	class AutoHeal : ITick
 	{
diff --git a/OpenRA.Game/Traits/AI/AutoTarget.cs b/OpenRA.Game/Traits/AI/AutoTarget.cs
index f9f924209d..0053164396 100644
--- a/OpenRA.Game/Traits/AI/AutoTarget.cs
+++ b/OpenRA.Game/Traits/AI/AutoTarget.cs
@@ -23,12 +23,10 @@ using System.Drawing;
 
 namespace OpenRA.Traits
 {
-	class AutoTargetInfo : ITraitInfo
+	class AutoTargetInfo : TraitInfo<AutoTarget>
 	{
 		public readonly float ScanTimeAverage = 2f;
 		public readonly float ScanTimeSpread = .5f;
-
-		public object Create(Actor self) { return new AutoTarget(); }
 	}
 
 	class AutoTarget : ITick, INotifyDamage
diff --git a/OpenRA.Game/Traits/AI/EmitInfantryOnSell.cs b/OpenRA.Game/Traits/AI/EmitInfantryOnSell.cs
index 7bbaa802bb..58d6db21fa 100644
--- a/OpenRA.Game/Traits/AI/EmitInfantryOnSell.cs
+++ b/OpenRA.Game/Traits/AI/EmitInfantryOnSell.cs
@@ -6,7 +6,7 @@ using OpenRA.GameRules;
 
 namespace OpenRA.Traits.AI
 {
-	class EmitInfantryOnSellInfo : StatelessTraitInfo<EmitInfantryOnSell>
+	class EmitInfantryOnSellInfo : TraitInfo<EmitInfantryOnSell>
 	{
 		public readonly float ValueFraction = .4f;
 		public readonly float MinHpFraction = .3f;
diff --git a/OpenRA.Game/Traits/AI/ReturnOnIdle.cs b/OpenRA.Game/Traits/AI/ReturnOnIdle.cs
index 0f590cd76b..efd8f16075 100644
--- a/OpenRA.Game/Traits/AI/ReturnOnIdle.cs
+++ b/OpenRA.Game/Traits/AI/ReturnOnIdle.cs
@@ -24,7 +24,7 @@ using System.Drawing;
 
 namespace OpenRA.Traits.AI
 {
-	class ReturnOnIdleInfo : StatelessTraitInfo<ReturnOnIdle> { }
+	class ReturnOnIdleInfo : TraitInfo<ReturnOnIdle> { }
 
 	// fly home or fly-off-map behavior for idle planes
 
diff --git a/OpenRA.Game/Traits/Buildable.cs b/OpenRA.Game/Traits/Buildable.cs
index bf81c7c846..e710f97960 100755
--- a/OpenRA.Game/Traits/Buildable.cs
+++ b/OpenRA.Game/Traits/Buildable.cs
@@ -20,7 +20,7 @@
 
 namespace OpenRA.Traits
 {
-	class BuildableInfo : StatelessTraitInfo<Buildable>
+	class BuildableInfo : TraitInfo<Buildable>
 	{
 		public readonly int TechLevel = -1;
 		public readonly string[] Prerequisites = { };
diff --git a/OpenRA.Game/Traits/Chrome/PowerDownButton.cs b/OpenRA.Game/Traits/Chrome/PowerDownButton.cs
index 4c16bb6f15..f478af29d7 100644
--- a/OpenRA.Game/Traits/Chrome/PowerDownButton.cs
+++ b/OpenRA.Game/Traits/Chrome/PowerDownButton.cs
@@ -4,7 +4,7 @@ using OpenRA.Orders;
 
 namespace OpenRA.Traits
 {
-	class PowerDownButtonInfo : StatelessTraitInfo<PowerDownButton> { }
+	class PowerDownButtonInfo : TraitInfo<PowerDownButton> { }
 
 	class PowerDownButton : IChromeButton
 	{
@@ -14,7 +14,7 @@ namespace OpenRA.Traits
 		public void OnClick() { Game.controller.ToggleInputMode<PowerDownOrderGenerator>(); }
 	}
 
-	class SellButtonInfo : StatelessTraitInfo<SellButton> { }
+	class SellButtonInfo : TraitInfo<SellButton> { }
 
 	class SellButton : IChromeButton
 	{
diff --git a/OpenRA.Game/Traits/CustomSellValue.cs b/OpenRA.Game/Traits/CustomSellValue.cs
index 935f90be78..3d095412db 100644
--- a/OpenRA.Game/Traits/CustomSellValue.cs
+++ b/OpenRA.Game/Traits/CustomSellValue.cs
@@ -23,7 +23,7 @@ namespace OpenRA.Traits
 	// allow a nonstandard sell/repair value to avoid
 	// buy-sell exploits like c&c's PROC.
 
-	class CustomSellValueInfo : StatelessTraitInfo<CustomSellValue>
+	class CustomSellValueInfo : TraitInfo<CustomSellValue>
 	{
 		public readonly int Value = 0;
 	}
diff --git a/OpenRA.Game/Traits/Explodes.cs b/OpenRA.Game/Traits/Explodes.cs
index 847f917261..c23ef34189 100644
--- a/OpenRA.Game/Traits/Explodes.cs
+++ b/OpenRA.Game/Traits/Explodes.cs
@@ -22,7 +22,7 @@ using OpenRA.Effects;
 
 namespace OpenRA.Traits
 {
-	class ExplodesInfo : StatelessTraitInfo<Explodes> { }
+	class ExplodesInfo : TraitInfo<Explodes> { }
 
 	class Explodes : INotifyDamage
 	{
diff --git a/OpenRA.Game/Traits/Fake.cs b/OpenRA.Game/Traits/Fake.cs
index 050d356fd5..987408731e 100644
--- a/OpenRA.Game/Traits/Fake.cs
+++ b/OpenRA.Game/Traits/Fake.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 
 namespace OpenRA.Traits
 {
-	class FakeInfo : StatelessTraitInfo<Fake> { }
+	class FakeInfo : TraitInfo<Fake> { }
 
 	class Fake : ITags
 	{
diff --git a/OpenRA.Game/Traits/LineBuild.cs b/OpenRA.Game/Traits/LineBuild.cs
index 2708010f07..c7c1d7fb5b 100644
--- a/OpenRA.Game/Traits/LineBuild.cs
+++ b/OpenRA.Game/Traits/LineBuild.cs
@@ -27,7 +27,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
-	public class LineBuildInfo : StatelessTraitInfo<LineBuild>
+	public class LineBuildInfo : TraitInfo<LineBuild>
 	{
 		public readonly int Range = 5;
 	}
diff --git a/OpenRA.Game/Traits/Modifiers/BelowUnits.cs b/OpenRA.Game/Traits/Modifiers/BelowUnits.cs
index efa7abd4f5..4dfd3b05ef 100644
--- a/OpenRA.Game/Traits/Modifiers/BelowUnits.cs
+++ b/OpenRA.Game/Traits/Modifiers/BelowUnits.cs
@@ -23,7 +23,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class BelowUnitsInfo : StatelessTraitInfo<BelowUnits> { }
+	class BelowUnitsInfo : TraitInfo<BelowUnits> { }
 
 	class BelowUnits : IRenderModifier
 	{
diff --git a/OpenRA.Game/Traits/Modifiers/InvisibleToOthers.cs b/OpenRA.Game/Traits/Modifiers/InvisibleToOthers.cs
index b2a44fde90..f4d18711f2 100644
--- a/OpenRA.Game/Traits/Modifiers/InvisibleToOthers.cs
+++ b/OpenRA.Game/Traits/Modifiers/InvisibleToOthers.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 
 namespace OpenRA.Traits
 {
-	class InvisibleToOthersInfo : StatelessTraitInfo<InvisibleToOthers> { }
+	class InvisibleToOthersInfo : TraitInfo<InvisibleToOthers> { }
 
 	class InvisibleToOthers : IRenderModifier
 	{
diff --git a/OpenRA.Game/Traits/Modifiers/WithShadow.cs b/OpenRA.Game/Traits/Modifiers/WithShadow.cs
index 0540b26bfc..1f6de89b74 100644
--- a/OpenRA.Game/Traits/Modifiers/WithShadow.cs
+++ b/OpenRA.Game/Traits/Modifiers/WithShadow.cs
@@ -23,7 +23,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class WithShadowInfo : StatelessTraitInfo<WithShadow> {}
+	class WithShadowInfo : TraitInfo<WithShadow> {}
 
 	class WithShadow : IRenderModifier
 	{
diff --git a/OpenRA.Game/Traits/Passenger.cs b/OpenRA.Game/Traits/Passenger.cs
index d00c53a106..66a55d4e87 100644
--- a/OpenRA.Game/Traits/Passenger.cs
+++ b/OpenRA.Game/Traits/Passenger.cs
@@ -23,7 +23,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Traits
 {
-	class PassengerInfo : StatelessTraitInfo<Passenger>
+	class PassengerInfo : TraitInfo<Passenger>
 	{
 		public readonly PipType ColorOfCargoPip = PipType.Green;
 	}
diff --git a/OpenRA.Game/Traits/Player/EvaAlerts.cs b/OpenRA.Game/Traits/Player/EvaAlerts.cs
index bddbd5a880..10640f76f2 100644
--- a/OpenRA.Game/Traits/Player/EvaAlerts.cs
+++ b/OpenRA.Game/Traits/Player/EvaAlerts.cs
@@ -21,7 +21,7 @@
 
 namespace OpenRA.Traits
 {
-	class EvaAlertsInfo : StatelessTraitInfo<EvaAlerts>
+	class EvaAlertsInfo : TraitInfo<EvaAlerts>
 	{
 		// Sound effects
 		public readonly string TabClick = "ramenu1.aud";
diff --git a/OpenRA.Game/Traits/Player/PlaceBuilding.cs b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
index 365523a843..85b8c81544 100644
--- a/OpenRA.Game/Traits/Player/PlaceBuilding.cs
+++ b/OpenRA.Game/Traits/Player/PlaceBuilding.cs
@@ -23,7 +23,7 @@ using OpenRA.Effects;
 
 namespace OpenRA.Traits
 {
-	class PlaceBuildingInfo : StatelessTraitInfo<PlaceBuilding> {}
+	class PlaceBuildingInfo : TraitInfo<PlaceBuilding> {}
 
 	class PlaceBuilding : IResolveOrder
 	{
diff --git a/OpenRA.Game/Traits/ProvidesRadar.cs b/OpenRA.Game/Traits/ProvidesRadar.cs
index e17656e54c..43ed87b9ff 100644
--- a/OpenRA.Game/Traits/ProvidesRadar.cs
+++ b/OpenRA.Game/Traits/ProvidesRadar.cs
@@ -46,7 +46,7 @@ namespace OpenRA.Traits
 		}
 	}
 
-	class JamsRadarInfo : StatelessTraitInfo<JamsRadar>
+	class JamsRadarInfo : TraitInfo<JamsRadar>
 	{
 		public readonly int Range = 0;
 	}
diff --git a/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs b/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
index 275c77692a..22f7d06075 100644
--- a/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
+++ b/OpenRA.Game/Traits/Render/RenderUnitTurreted.cs
@@ -65,6 +65,6 @@ namespace OpenRA.Traits
 		}
 	}
 
-	class RenderRangeCircleInfo : StatelessTraitInfo<RenderRangeCircle> { }
+	class RenderRangeCircleInfo : TraitInfo<RenderRangeCircle> { }
 	class RenderRangeCircle { }
 }
diff --git a/OpenRA.Game/Traits/RepairsUnits.cs b/OpenRA.Game/Traits/RepairsUnits.cs
index 92a43e4567..a5f0ceece2 100644
--- a/OpenRA.Game/Traits/RepairsUnits.cs
+++ b/OpenRA.Game/Traits/RepairsUnits.cs
@@ -4,7 +4,7 @@ using System;
 namespace OpenRA.Traits
 {
 
-	public class RepairsUnitsInfo : StatelessTraitInfo<RepairsUnits>
+	public class RepairsUnitsInfo : TraitInfo<RepairsUnits>
 	{
 		public readonly float URepairPercent = 0.2f;
 		public readonly int URepairStep = 10;	
diff --git a/OpenRA.Game/Traits/Selectable.cs b/OpenRA.Game/Traits/Selectable.cs
index ea69959b64..4a91253b9c 100755
--- a/OpenRA.Game/Traits/Selectable.cs
+++ b/OpenRA.Game/Traits/Selectable.cs
@@ -20,7 +20,7 @@
 
 namespace OpenRA.Traits
 {
-	public class SelectableInfo : StatelessTraitInfo<Selectable>
+	public class SelectableInfo : TraitInfo<Selectable>
 	{
 		public readonly int Priority = 10;
 		public readonly int[] Bounds = null;
diff --git a/OpenRA.Game/Traits/StoresOre.cs b/OpenRA.Game/Traits/StoresOre.cs
index aa9452445a..fe52c6e379 100644
--- a/OpenRA.Game/Traits/StoresOre.cs
+++ b/OpenRA.Game/Traits/StoresOre.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 
 namespace OpenRA.Traits
 {
-	class StoresOreInfo : StatelessTraitInfo<StoresOre>
+	class StoresOreInfo : TraitInfo<StoresOre>
 	{
 		public readonly int Pips = 0;
 		public readonly int Capacity = 0;
diff --git a/OpenRA.Game/Traits/TraitsInterfaces.cs b/OpenRA.Game/Traits/TraitsInterfaces.cs
index 212e039030..b86406d04a 100644
--- a/OpenRA.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRA.Game/Traits/TraitsInterfaces.cs
@@ -102,12 +102,7 @@ namespace OpenRA.Traits
 
 	public interface ITraitInfo { object Create(Actor self); }
 
-	public class StatelessTraitInfo<T> : ITraitInfo
-		where T : new()
-	{
-		static Lazy<T> Instance = Lazy.New(() => new T());
-		public object Create(Actor self) { return Instance.Value; }
-	}
+	public class TraitInfo<T> : ITraitInfo where T : new() { public object Create(Actor self) { return new T(); } }
 
 	public interface ITraitPrerequisite<T> { }
 
diff --git a/OpenRA.Game/Traits/Wall.cs b/OpenRA.Game/Traits/Wall.cs
index 43081e57f9..835869a80c 100644
--- a/OpenRA.Game/Traits/Wall.cs
+++ b/OpenRA.Game/Traits/Wall.cs
@@ -20,6 +20,6 @@
 
 namespace OpenRA.Traits
 {
-	public class WallInfo : StatelessTraitInfo<Wall> {}
+	public class WallInfo : TraitInfo<Wall> {}
 	public class Wall {}
 }
diff --git a/OpenRA.Game/Traits/World/BibLayer.cs b/OpenRA.Game/Traits/World/BibLayer.cs
index 6de9f94ffa..ca190f8e19 100644
--- a/OpenRA.Game/Traits/World/BibLayer.cs
+++ b/OpenRA.Game/Traits/World/BibLayer.cs
@@ -102,6 +102,6 @@ namespace OpenRA.Traits
 		}
 	}
 	
-	class BibInfo : StatelessTraitInfo<Bib> { }
+	class BibInfo : TraitInfo<Bib> { }
 	public class Bib { }
 }
diff --git a/OpenRA.Game/Traits/World/BridgeLoadHook.cs b/OpenRA.Game/Traits/World/BridgeLoadHook.cs
index 2b25969a07..79fdda80e7 100644
--- a/OpenRA.Game/Traits/World/BridgeLoadHook.cs
+++ b/OpenRA.Game/Traits/World/BridgeLoadHook.cs
@@ -23,7 +23,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class BridgeLoadHookInfo : StatelessTraitInfo<BridgeLoadHook> { }
+	class BridgeLoadHookInfo : TraitInfo<BridgeLoadHook> { }
 
 	class BridgeLoadHook : ILoadWorldHook
 	{
diff --git a/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs b/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs
index 152e8b9e95..ce92739005 100644
--- a/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs
+++ b/OpenRA.Game/Traits/World/ChoosePaletteOnSelect.cs
@@ -22,7 +22,7 @@ using System.Linq;
 
 namespace OpenRA.Traits
 {
-	class ChoosePaletteOnSelectInfo : StatelessTraitInfo<ChoosePaletteOnSelect> { }
+	class ChoosePaletteOnSelectInfo : TraitInfo<ChoosePaletteOnSelect> { }
 
 	class ChoosePaletteOnSelect : INotifySelection
 	{
diff --git a/OpenRA.Game/Traits/World/GlobalDefaults.cs b/OpenRA.Game/Traits/World/GlobalDefaults.cs
index eae79d8baa..1d8100e2eb 100644
--- a/OpenRA.Game/Traits/World/GlobalDefaults.cs
+++ b/OpenRA.Game/Traits/World/GlobalDefaults.cs
@@ -3,7 +3,7 @@ using System;
 
 namespace OpenRA.Traits
 {
-	public class GlobalDefaultsInfo : StatelessTraitInfo<GlobalDefaults>
+	public class GlobalDefaultsInfo : TraitInfo<GlobalDefaults>
 	{
 		/* Special Weapons */
 		public readonly float GapRegenInterval = 0.1f;
diff --git a/OpenRA.Game/Traits/World/LightPaletteRotator.cs b/OpenRA.Game/Traits/World/LightPaletteRotator.cs
index eafcf92cd7..de956920c7 100644
--- a/OpenRA.Game/Traits/World/LightPaletteRotator.cs
+++ b/OpenRA.Game/Traits/World/LightPaletteRotator.cs
@@ -22,7 +22,7 @@ using System.Drawing;
 
 namespace OpenRA.Traits
 {
-	class LightPaletteRotatorInfo : StatelessTraitInfo<LightPaletteRotator> { }
+	class LightPaletteRotatorInfo : TraitInfo<LightPaletteRotator> { }
 	class LightPaletteRotator : ITick, IPaletteModifier
 	{
 		float t = 0;
diff --git a/OpenRA.Game/Traits/World/SpawnDefaultUnits.cs b/OpenRA.Game/Traits/World/SpawnDefaultUnits.cs
index 96f70c3963..ec4546c49a 100644
--- a/OpenRA.Game/Traits/World/SpawnDefaultUnits.cs
+++ b/OpenRA.Game/Traits/World/SpawnDefaultUnits.cs
@@ -25,7 +25,7 @@ using OpenRA.FileFormats;
 
 namespace OpenRA.Traits
 {
-	class SpawnDefaultUnitsInfo : StatelessTraitInfo<SpawnDefaultUnits>
+	class SpawnDefaultUnitsInfo : TraitInfo<SpawnDefaultUnits>
 	{
 		public readonly int InitialExploreRange = 5;
 	}
diff --git a/OpenRA.Game/Traits/World/SpawnMapActors.cs b/OpenRA.Game/Traits/World/SpawnMapActors.cs
index 103d0fd980..c7cdd0e724 100644
--- a/OpenRA.Game/Traits/World/SpawnMapActors.cs
+++ b/OpenRA.Game/Traits/World/SpawnMapActors.cs
@@ -5,7 +5,7 @@ using System.Text;
 
 namespace OpenRA.Traits
 {
-	class SpawnMapActorsInfo : StatelessTraitInfo<SpawnMapActors> { }
+	class SpawnMapActorsInfo : TraitInfo<SpawnMapActors> { }
 
 	class SpawnMapActors : IGameStarted
 	{
diff --git a/OpenRA.Game/Traits/World/Theater.cs b/OpenRA.Game/Traits/World/Theater.cs
index 3b0054752d..6984b1f0cb 100644
--- a/OpenRA.Game/Traits/World/Theater.cs
+++ b/OpenRA.Game/Traits/World/Theater.cs
@@ -20,7 +20,7 @@
 
 namespace OpenRA.Traits
 {
-	class TheaterInfo : StatelessTraitInfo<Theater> 
+	class TheaterInfo : TraitInfo<Theater> 
 	{
 		public readonly string Name = null;
 		public readonly string Theater = null;
diff --git a/OpenRA.Game/Traits/World/WaterPaletteRotation.cs b/OpenRA.Game/Traits/World/WaterPaletteRotation.cs
index d15c015aec..fc29c84596 100644
--- a/OpenRA.Game/Traits/World/WaterPaletteRotation.cs
+++ b/OpenRA.Game/Traits/World/WaterPaletteRotation.cs
@@ -22,7 +22,7 @@ using System.Drawing;
 
 namespace OpenRA.Traits
 {
-	class WaterPaletteRotationInfo : StatelessTraitInfo<WaterPaletteRotation> { }
+	class WaterPaletteRotationInfo : TraitInfo<WaterPaletteRotation> { }
 
 	class WaterPaletteRotation : ITick, IPaletteModifier
 	{
diff --git a/OpenRA.Mods.Cnc/IonCannonPower.cs b/OpenRA.Mods.Cnc/IonCannonPower.cs
index f646af2d2c..ded378db30 100644
--- a/OpenRA.Mods.Cnc/IonCannonPower.cs
+++ b/OpenRA.Mods.Cnc/IonCannonPower.cs
@@ -57,6 +57,6 @@ namespace OpenRA.Mods.Cnc
 		}
 	}
 
-	class IonControlInfo : StatelessTraitInfo<IonControl> { }
+	class IonControlInfo : TraitInfo<IonControl> { }
 	class IonControl { }
 }
diff --git a/OpenRA.Mods.RA/EngineerCapture.cs b/OpenRA.Mods.RA/EngineerCapture.cs
index 656e4486bb..bfdb551d45 100644
--- a/OpenRA.Mods.RA/EngineerCapture.cs
+++ b/OpenRA.Mods.RA/EngineerCapture.cs
@@ -24,7 +24,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
-	class EngineerCaptureInfo : StatelessTraitInfo<EngineerCapture> { }
+	class EngineerCaptureInfo : TraitInfo<EngineerCapture> { }
 
 	class EngineerCapture : IIssueOrder, IResolveOrder
 	{
diff --git a/OpenRA.Mods.RA/GpsPower.cs b/OpenRA.Mods.RA/GpsPower.cs
index c6aa8f7610..59f656f44a 100644
--- a/OpenRA.Mods.RA/GpsPower.cs
+++ b/OpenRA.Mods.RA/GpsPower.cs
@@ -58,6 +58,6 @@ namespace OpenRA.Mods.RA
 	}
 
 	// tag trait to identify the building
-	class GpsLaunchSiteInfo : StatelessTraitInfo<GpsLaunchSite> { }
+	class GpsLaunchSiteInfo : TraitInfo<GpsLaunchSite> { }
 	class GpsLaunchSite { }
 }
diff --git a/OpenRA.Mods.RA/InfiltrateForSonarPulse.cs b/OpenRA.Mods.RA/InfiltrateForSonarPulse.cs
index a9dd26c2db..b2c403b543 100644
--- a/OpenRA.Mods.RA/InfiltrateForSonarPulse.cs
+++ b/OpenRA.Mods.RA/InfiltrateForSonarPulse.cs
@@ -22,7 +22,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class InfiltrateForSonarPulseInfo : StatelessTraitInfo<InfiltrateForSonarPulse> { }
+	class InfiltrateForSonarPulseInfo : TraitInfo<InfiltrateForSonarPulse> { }
 	
 	class InfiltrateForSonarPulse : IAcceptSpy
 	{
diff --git a/OpenRA.Mods.RA/IronCurtainPower.cs b/OpenRA.Mods.RA/IronCurtainPower.cs
index fd739c6204..e6b1a1beb7 100644
--- a/OpenRA.Mods.RA/IronCurtainPower.cs
+++ b/OpenRA.Mods.RA/IronCurtainPower.cs
@@ -114,6 +114,6 @@ namespace OpenRA.Mods.RA
 	}
 
 	// tag trait for the building
-	class IronCurtainInfo : StatelessTraitInfo<IronCurtain> { }
+	class IronCurtainInfo : TraitInfo<IronCurtain> { }
 	class IronCurtain { }
 }
diff --git a/OpenRA.Mods.RA/Mine.cs b/OpenRA.Mods.RA/Mine.cs
index b7ffbe40ce..9db8c33d05 100644
--- a/OpenRA.Mods.RA/Mine.cs
+++ b/OpenRA.Mods.RA/Mine.cs
@@ -69,6 +69,6 @@ namespace OpenRA.Mods.RA
 	}
 
 	/* tag trait for stuff that shouldnt trigger mines */
-	class MineImmuneInfo : StatelessTraitInfo<MineImmune> { }
+	class MineImmuneInfo : TraitInfo<MineImmune> { }
 	class MineImmune { }
 }
diff --git a/OpenRA.Mods.RA/Minelayer.cs b/OpenRA.Mods.RA/Minelayer.cs
index 1dc1ec0f1c..b488fd38f3 100644
--- a/OpenRA.Mods.RA/Minelayer.cs
+++ b/OpenRA.Mods.RA/Minelayer.cs
@@ -24,7 +24,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
 {
-	class MinelayerInfo : StatelessTraitInfo<Minelayer>
+	class MinelayerInfo : TraitInfo<Minelayer>
 	{
 		public readonly string Mine = "minv";
 	}
diff --git a/OpenRA.Mods.RA/RepairableNear.cs b/OpenRA.Mods.RA/RepairableNear.cs
index 81384e8cd3..37ae04734c 100644
--- a/OpenRA.Mods.RA/RepairableNear.cs
+++ b/OpenRA.Mods.RA/RepairableNear.cs
@@ -23,7 +23,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
-	class RepairableNearInfo : StatelessTraitInfo<RepairableNear> { }
+	class RepairableNearInfo : TraitInfo<RepairableNear> { }
 
 	class RepairableNear : IIssueOrder, IResolveOrder
 	{
diff --git a/OpenRA.Mods.RA/Spy.cs b/OpenRA.Mods.RA/Spy.cs
index b7992e5aef..52f45f84eb 100644
--- a/OpenRA.Mods.RA/Spy.cs
+++ b/OpenRA.Mods.RA/Spy.cs
@@ -24,7 +24,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
-	class SpyInfo : StatelessTraitInfo<Spy> { }
+	class SpyInfo : TraitInfo<Spy> { }
 
 	class Spy : IIssueOrder, IResolveOrder
 	{
diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
index b76642a0ef..2ed2e76237 100755
--- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPaletteEffect.cs
@@ -23,7 +23,7 @@ using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA.SupportPowers
 {
-	class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }
+	class ChronoshiftPaletteEffectInfo : TraitInfo<ChronoshiftPaletteEffect> { }
 
 	public class ChronoshiftPaletteEffect : IPaletteModifier, ITick
 	{
diff --git a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
index 06de2795bc..9c14a132dc 100755
--- a/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/ChronoshiftPower.cs
@@ -183,6 +183,6 @@ namespace OpenRA.Mods.RA.SupportPowers
 	}
 	
 	// tag trait to identify the building
-	class ChronosphereInfo : StatelessTraitInfo<Chronosphere> { }
+	class ChronosphereInfo : TraitInfo<Chronosphere> { }
 	public class Chronosphere { }
 }
diff --git a/OpenRA.Mods.RA/SupportPowers/NukePower.cs b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
index 905d1591a2..ca0ea1a64c 100755
--- a/OpenRA.Mods.RA/SupportPowers/NukePower.cs
+++ b/OpenRA.Mods.RA/SupportPowers/NukePower.cs
@@ -67,6 +67,6 @@ namespace OpenRA.Mods.RA.SupportPowers
 	}
 
 	// tag trait for the building
-	class NukeSiloInfo : StatelessTraitInfo<NukeSilo> { }
+	class NukeSiloInfo : TraitInfo<NukeSilo> { }
 	class NukeSilo { }
 }
diff --git a/OpenRA.Mods.RA/Thief.cs b/OpenRA.Mods.RA/Thief.cs
index 18dcc4aa7f..2fd76a2e14 100644
--- a/OpenRA.Mods.RA/Thief.cs
+++ b/OpenRA.Mods.RA/Thief.cs
@@ -24,7 +24,7 @@ using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA
 {
-	class ThiefInfo : StatelessTraitInfo<Thief> { }
+	class ThiefInfo : TraitInfo<Thief> { }
 
 	class Thief : IIssueOrder, IResolveOrder
 	{