From f6e5bee33423f3b9727c19a445efc88c404ba8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Sun, 5 Mar 2023 11:41:05 +0100
Subject: [PATCH] Move JumpJet traits to the C&C library.

---
 .../Traits/Conditions/GrantConditionOnJumpjetLayer.cs         | 4 +++-
 .../Traits/World/JumpjetActorLayer.cs                         | 3 ++-
 .../Traits/World/JumpjetLocomotor.cs                          | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)
 rename {OpenRA.Mods.Common => OpenRA.Mods.Cnc}/Traits/Conditions/GrantConditionOnJumpjetLayer.cs (96%)
 rename {OpenRA.Mods.Common => OpenRA.Mods.Cnc}/Traits/World/JumpjetActorLayer.cs (98%)
 rename {OpenRA.Mods.Common => OpenRA.Mods.Cnc}/Traits/World/JumpjetLocomotor.cs (95%)

diff --git a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnJumpjetLayer.cs b/OpenRA.Mods.Cnc/Traits/Conditions/GrantConditionOnJumpjetLayer.cs
similarity index 96%
rename from OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnJumpjetLayer.cs
rename to OpenRA.Mods.Cnc/Traits/Conditions/GrantConditionOnJumpjetLayer.cs
index ad80f4f4f2..8f401d7aee 100644
--- a/OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnJumpjetLayer.cs
+++ b/OpenRA.Mods.Cnc/Traits/Conditions/GrantConditionOnJumpjetLayer.cs
@@ -9,7 +9,9 @@
  */
 #endregion
 
-namespace OpenRA.Mods.Common.Traits
+using OpenRA.Mods.Common.Traits;
+
+namespace OpenRA.Mods.Cnc.Traits
 {
 	public class GrantConditionOnJumpjetLayerInfo : GrantConditionOnLayerInfo
 	{
diff --git a/OpenRA.Mods.Common/Traits/World/JumpjetActorLayer.cs b/OpenRA.Mods.Cnc/Traits/World/JumpjetActorLayer.cs
similarity index 98%
rename from OpenRA.Mods.Common/Traits/World/JumpjetActorLayer.cs
rename to OpenRA.Mods.Cnc/Traits/World/JumpjetActorLayer.cs
index 94eadf11e3..123dd465d7 100644
--- a/OpenRA.Mods.Common/Traits/World/JumpjetActorLayer.cs
+++ b/OpenRA.Mods.Cnc/Traits/World/JumpjetActorLayer.cs
@@ -10,9 +10,10 @@
 #endregion
 
 using OpenRA.Mods.Common.Pathfinder;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Cnc.Traits
 {
 	[TraitLocation(SystemActors.World)]
 	public class JumpjetActorLayerInfo : TraitInfo, ICustomMovementLayerInfo
diff --git a/OpenRA.Mods.Common/Traits/World/JumpjetLocomotor.cs b/OpenRA.Mods.Cnc/Traits/World/JumpjetLocomotor.cs
similarity index 95%
rename from OpenRA.Mods.Common/Traits/World/JumpjetLocomotor.cs
rename to OpenRA.Mods.Cnc/Traits/World/JumpjetLocomotor.cs
index 8df37d910c..63e87e89a3 100644
--- a/OpenRA.Mods.Common/Traits/World/JumpjetLocomotor.cs
+++ b/OpenRA.Mods.Cnc/Traits/World/JumpjetLocomotor.cs
@@ -10,9 +10,10 @@
 #endregion
 
 using System.Collections.Generic;
+using OpenRA.Mods.Common.Traits;
 using OpenRA.Traits;
 
-namespace OpenRA.Mods.Common.Traits
+namespace OpenRA.Mods.Cnc.Traits
 {
 	[TraitLocation(SystemActors.World | SystemActors.EditorWorld)]
 	[Desc("Used by Mobile. Required for jumpjet actors. Attach these to the world actor. You can have multiple variants by adding @suffixes.")]