275 reorganize classes into not such a deep namespace hierarchy (#276)

* Reorganize namespaces * Move Extensions namespace * Move some more namespaces * Move namespaces in tests
ekolis · Jan 13, 2024 · 583f5a3 · 583f5a3
1 parent f357c99
commit 583f5a3
Show file tree

Hide file tree

Showing 506 changed files with 50,604 additions and 50,578 deletions.
diff --git a/FrEee.Assets/Data/EventTypes.txt b/FrEee.Assets/Data/EventTypes.txt
@@ -8,10 +8,10 @@ EVENT TYPES DATA FILE
 
 Name 				:= Ship - Damage
 Is Negative	When	:= amount > 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Vehicles import SpaceVehicle;
-Import				:= from FrEee.Game.Interfaces import IUnit;
-Import				:= from FrEee.Game.Interfaces import IVehicle;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Vehicles import SpaceVehicle;
+Import				:= from FrEee.Interfaces import IUnit;
+Import				:= from FrEee.Interfaces import IVehicle;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[SpaceVehicle]().Except[IVehicle](Galaxy.Current.FindSpaceObjects[IUnit]())
 Parameter			:= VehicleName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -20,8 +20,8 @@ Action				:= target.TakeDamage("Skips All Shields", amount);
 
 Name 				:= Ship - Lose Movement
 Is Negative	When	:= amount > 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Vehicles import Ship;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Vehicles import Ship;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Ship]()
 Parameter			:= VehicleName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -30,8 +30,8 @@ Action				:= target.MovementRemaining -= amount;
 
 Name 				:= Ship - Lose Supply
 Is Negative	When	:= amount > 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Vehicles import Ship;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Vehicles import Ship;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Ship]()
 Parameter			:= VehicleName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -40,8 +40,8 @@ Action				:= target.SupplyRemaining -= amount;
 
 Name 				:= Ship - Cargo Damage
 Is Negative	When	:= amount > 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Interfaces import ICargoContainer;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Interfaces import ICargoContainer;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[ICargoContainer]()
 Parameter			:= VehicleName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -50,10 +50,10 @@ Action				:= target.Cargo.TakeDamage("Skips All Shields", amount);
 
 Name 				:= Ship - Moved
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Vehicles import SpaceVehicle;
-Import				:= from FrEee.Game.Interfaces import IUnit;
-Import				:= from FrEee.Game.Interfaces import IVehicle;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Vehicles import SpaceVehicle;
+Import				:= from FrEee.Interfaces import IUnit;
+Import				:= from FrEee.Interfaces import IVehicle;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[SpaceVehicle]().Except[IVehicle](Galaxy.Current.FindSpaceObjects[IUnit]())
 Parameter			:= VehicleName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -62,9 +62,9 @@ Action				:= target.Sector = Galaxy.Current.PickRandomSector();
 
 Name 				:= Planet - Conditions Change
 Is Negative	When	:= amount < 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
-Import				:= from FrEee.Game.Interfaces import IUnit;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
+Import				:= from FrEee.Interfaces import IUnit;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]()
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -73,9 +73,9 @@ Action				:= # planets don't have conditions yet so do nothing
 
 Name 				:= Planet - Value Change
 Is Negative	When	:= amount < 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
-Import				:= from FrEee.Game.Interfaces import IUnit;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
+Import				:= from FrEee.Interfaces import IUnit;
 Import              := from FrEee.Utility import Resource;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]()
 Parameter			:= PlanetName = target.Name;
@@ -87,8 +87,8 @@ Action				:= target.Value[Resource.Radioactives] += amount;
 
 Name 				:= Planet - Population Change
 Is Negative	When	:= amount < 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]().Where(lambda p: p.Colony != None)
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -97,19 +97,19 @@ Action				:= target.Colony.ChangePopulation(amount);
 
 Name 				:= Planet - Population Rebel
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]().Where(lambda p: p.Colony != None)
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
 Parameter			:= SectorName = target.Sector.Name;
-Action				:= from FrEee.Game.Objects.Space import Galaxy;
+Action				:= from FrEee.Objects.Space import Galaxy;
 Action				:= target.Colony = source if source != None else Galaxy.Current.CreateNewEmpire();
 
 Name 				:= Planet - Facility Damage
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]().Where(lambda p: p.Colony != None)
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -118,8 +118,8 @@ Action				:= target.Colony.Facilities.PickRandom().Dispose() for num in range(0,
 
 Name 				:= Planet - Cargo Damage
 Is Negative	When	:= amount > 0
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]().Where(lambda p: p.Colony != None)
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -137,8 +137,8 @@ Action				:= target.NormalizeStoredResources();
 
 Name 				:= Planet - Plague
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]().Where(lambda p: p.Colony != None)
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -147,8 +147,8 @@ Action				:= # TODO - implement plagues
 
 Name 				:= Planet - Destroyed
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Planet;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Planet;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Planet]()
 Parameter			:= PlanetName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -157,8 +157,8 @@ Action				:= target.ConvertToAsteroidField();
 
 Name 				:= Star - Destroyed
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import Star;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import Star;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[Star]()
 Parameter			:= StarName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;
@@ -167,8 +167,8 @@ Action				:= target.Detonate();
 
 Name 				:= Warp Point - Closed
 Is Negative	When	:= true
-Import				:= from FrEee.Game.Objects.Space import Galaxy;
-Import				:= from FrEee.Game.Objects.Space import WarpPoint;
+Import				:= from FrEee.Objects.Space import Galaxy;
+Import				:= from FrEee.Objects.Space import WarpPoint;
 Target Selector 	:= Galaxy.Current.FindSpaceObjects[WarpPoint]()
 Parameter			:= WarpPointName = target.Name;
 Parameter			:= SystemName = target.StarSystem.Name;

diff --git a/FrEee.Assets/GameSetups/Quickstart.gsu b/FrEee.Assets/GameSetups/Quickstart.gsu
@@ -1,4 +1,4 @@
-FrEee.Game.Setup.GameSetup, FrEee.Core:
+FrEee.Setup.GameSetup, FrEee.Core:
 p32:
 	AllowedTrades:
 		:All;
@@ -7,7 +7,7 @@ p32:
 	EmpirePoints:
 		:2000;
 	EmpireTemplates:
-		System.Collections.Generic.List`1[[FrEee.Game.Setup.EmpireTemplate, FrEee.Core]], System.Private.CoreLib:
+		System.Collections.Generic.List`1[[FrEee.Setup.EmpireTemplate, FrEee.Core]], System.Private.CoreLib:
 		c1:		
 			:p10:
 				AIName:
@@ -175,14 +175,14 @@ p32:
 	StartingResources:
 		:20000;
 	VictoryConditions:
-		System.Collections.Generic.List`1[[FrEee.Game.Interfaces.IVictoryCondition, FrEee.Core]], System.Private.CoreLib:
+		System.Collections.Generic.List`1[[FrEee.Interfaces.IVictoryCondition, FrEee.Core]], System.Private.CoreLib:
 		c1:		
-			FrEee.Game.Objects.VictoryConditions.TotalEliminationVictoryCondition, FrEee.Core:
+			FrEee.Objects.VictoryConditions.TotalEliminationVictoryCondition, FrEee.Core:
 			p0:
 			;
 		;
 	WarpPointPlacementStrategy:
-		FrEee.Game.Setup.WarpPointPlacementStrategies.EdgeAlignedWarpPointPlacementStrategy, FrEee.Core:
+		FrEee.Setup.WarpPointPlacementStrategies.EdgeAlignedWarpPointPlacementStrategy, FrEee.Core:
 		p2:
 			Description:
 				:"Places warp points along the edge of the system, aligned with the star systems they lead to.";

diff --git a/FrEee.Assets/Scripts/AI/AI_Default/AI.py b/FrEee.Assets/Scripts/AI/AI_Default/AI.py
@@ -8,8 +8,8 @@
 clr.ImportExtensions(System.Linq);
 import FrEee;
 import FrEee.Utility;
-from FrEee.Game.Objects.Commands import *;
-clr.ImportExtensions(FrEee.Utility.Extensions);
+from FrEee.Objects.Commands import *;
+clr.ImportExtensions(FrEee.Extensions);
 from System import Console;
 
 # alias the domain and context variables to avoid confusion

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/AI.csx b/FrEee.Assets/Scripts/AI/Vanguard/AI.csx
@@ -9,11 +9,11 @@
 #load "Plan.csx"
 
 #r "../../../bin/Debug/FrEee.Core.dll"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
 using System;
 using System.Linq;
-using FrEee.Utility.Extensions;
+using FrEee.Extensions;
 
 
 //Note, at present, classes within scripts cannot be stored in the AI Notes as classes. 

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/BasicResearchModule.csx b/FrEee.Assets/Scripts/AI/Vanguard/BasicResearchModule.csx
@@ -1,7 +1,7 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
-using FrEee.Game.Objects.Commands;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
+using FrEee.Objects.Commands;
 using System.Linq;
 /// <summary>
 /// Class that will issue basic research commands. 

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfColonization.csx b/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfColonization.csx
@@ -1,14 +1,14 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
 #load "Plan.csx"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
-using FrEee.Utility;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
+using FrEee.Utility; using FrEee.Serialization;
 using System;
 using System.Linq;
 using System.Collections.Generic;
-using FrEee.Game.Objects.Vehicles;
-using FrEee.Game.Objects.Orders;
-using FrEee.Utility.Extensions;
+using FrEee.Objects.Vehicles;
+using FrEee.Objects.Orders;
+using FrEee.Extensions;
 
 /// <summary>
 /// Class devoted to the colonization of worlds. 

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfConstruction.csx b/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfConstruction.csx
@@ -1,16 +1,16 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
 #load "Plan.csx"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
-using FrEee.Utility; 
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
+using FrEee.Utility; using FrEee.Serialization; 
 using System;
 using System.Linq;
-using FrEee.Game.Objects.Orders;
-using FrEee.Game.Objects.Vehicles;
-using FrEee.Game.Interfaces;
-using FrEee.Utility.Extensions;
-using FrEee.Game.Objects.Commands;
-using FrEee.Game.Objects.LogMessages; 
+using FrEee.Objects.Orders;
+using FrEee.Objects.Vehicles;
+using FrEee.Interfaces;
+using FrEee.Extensions;
+using FrEee.Objects.Commands;
+using FrEee.Objects.LogMessages; 
 
 
 /// <summary>
@@ -30,7 +30,7 @@ public class MinistryOfConstruction
     public void HandleNewlyConstructedShips(Empire empire, Galaxy galaxy)
     {
 
-        var completedShips = empire.Log.Where(x => x.LogMessageType == FrEee.Game.Objects.LogMessages.LogMessageType.ConstructionComplete
+        var completedShips = empire.Log.Where(x => x.LogMessageType == FrEee.Objects.LogMessages.LogMessageType.ConstructionComplete
             && x.TurnNumber == Galaxy.Current.TurnNumber); 
         foreach(var shiplog in completedShips)
         {

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfInfrastructure.csx b/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfInfrastructure.csx
@@ -1,17 +1,17 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
 #load "Plan.csx"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
-using FrEee.Utility;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
+using FrEee.Utility; using FrEee.Serialization;
 using System;
 using System.Collections.Generic; 
 using System.Linq;
-using FrEee.Game.Objects.Orders;
-using FrEee.Game.Objects.Vehicles;
-using FrEee.Game.Interfaces;
-using FrEee.Utility.Extensions;
-using FrEee.Game.Objects.Commands;
-using FrEee.Game.Objects.Technology;
+using FrEee.Objects.Orders;
+using FrEee.Objects.Vehicles;
+using FrEee.Interfaces;
+using FrEee.Extensions;
+using FrEee.Objects.Commands;
+using FrEee.Objects.Technology;
 
 
 /// <summary>

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfShipDesign.csx b/FrEee.Assets/Scripts/AI/Vanguard/MinistryOfShipDesign.csx
@@ -1,10 +1,10 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
 using FrEee.Modding.Templates;
-using FrEee.Game.Interfaces;
-using FrEee.Utility.Extensions;
-using FrEee.Game.Objects.Vehicles; 
+using FrEee.Interfaces;
+using FrEee.Extensions;
+using FrEee.Objects.Vehicles; 
 using System.Linq; 
 
 /// <summary>
@@ -65,7 +65,7 @@ public class MinistryOfShipDesign
 
         var engine = GetLatestEngine(); 
 
-        var hulls = Empire.UnlockedItems.OfType<IHull>().Where(x => x.VehicleType == FrEee.Game.Enumerations.VehicleTypes.Ship && !x.IsObsolete);
+        var hulls = Empire.UnlockedItems.OfType<IHull>().Where(x => x.VehicleType == FrEee.Enumerations.VehicleTypes.Ship && !x.IsObsolete);
 
         var chosenhull = (from hull in hulls
                          where hull.Size > (lifeSupport.Size * hull.MinLifeSupport)

diff --git a/FrEee.Assets/Scripts/AI/Vanguard/Plan.csx b/FrEee.Assets/Scripts/AI/Vanguard/Plan.csx
@@ -1,12 +1,12 @@
 #r "../../../bin/Debug/FrEee.Core.dll"
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Space;
-using FrEee.Utility;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Space;
+using FrEee.Utility; using FrEee.Serialization;
 using System;
 using System.Collections.Generic;
-using FrEee.Utility.Extensions;
-using FrEee.Game.Objects.Orders;
-using FrEee.Game.Objects.Vehicles;
+using FrEee.Extensions;
+using FrEee.Objects.Orders;
+using FrEee.Objects.Vehicles;
 using System.Linq; 
 
 public static class PlanManager

diff --git a/FrEee.Tests/Modding/FormulaTest.cs b/FrEee.Tests/Modding/FormulaTest.cs
@@ -1,8 +1,8 @@
-using FrEee.Game.Objects.Civilization;
-using FrEee.Game.Objects.Combat;
-using FrEee.Game.Objects.Space;
-using FrEee.Game.Objects.Technology;
-using FrEee.Game.Objects.Vehicles;
+using FrEee.Objects.Civilization;
+using FrEee.Objects.Combat;
+using FrEee.Objects.Space;
+using FrEee.Objects.Technology;
+using FrEee.Objects.Vehicles;
 using FrEee.Modding;
 using FrEee.Modding.Templates;
 using NUnit.Framework;

diff --git a/FrEee.Tests/Modding/Loaders/ComponentLoaderTest.cs b/FrEee.Tests/Modding/Loaders/ComponentLoaderTest.cs
@@ -1,5 +1,5 @@
 using FrEee.Modding;
-using FrEee.Utility.Extensions;
+using FrEee.Extensions;
 using NUnit.Framework;
 
 namespace FrEee.Tests.Modding.Loaders