Move more stuff

NewHorizons/Builder/Body/FunnelBuilder.cs

@@ -6,6 +6,7 @@ using Logger = NewHorizons.Utility.Logger;
 using NewHorizons.External.Modules.VariableSize;
 using NewHorizons.Components.Orbital;
 using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 
 namespace NewHorizons.Builder.Body
 {

NewHorizons/Builder/Body/Geometry/CubeSphere.cs

@@ -1,4 +1,4 @@
-using NewHorizons.Utility;
+using NewHorizons.Utility.Geometry;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;
 namespace NewHorizons.Builder.Body.Geometry

NewHorizons/Builder/Orbital/InitialMotionBuilder.cs

@@ -1,6 +1,6 @@
 using NewHorizons.Components.Orbital;
 using NewHorizons.External.Modules;
-using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 using System.Linq;
 using UnityEngine;
 using Logger = NewHorizons.Utility.Logger;

NewHorizons/Builder/Props/BrambleNodeBuilder.cs

@@ -4,6 +4,7 @@ using NewHorizons.External.Configs;
 using NewHorizons.Handlers;
 using NewHorizons.Utility;
 using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 using OWML.Common;
 using System.Collections.Generic;
 using System.Linq;

NewHorizons/Builder/Props/ScatterBuilder.cs

@@ -1,6 +1,7 @@
 using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
 using NewHorizons.Utility;
+using NewHorizons.Utility.Geometry;
 using NewHorizons.Utility.OWMLUtilities;
 using OWML.Common;
 using System;

NewHorizons/Builder/ShipLog/MapModeBuilder.cs

@@ -9,6 +9,7 @@ using UnityEngine;
 using UnityEngine.UI;
 using Logger = NewHorizons.Utility.Logger;
 using NewHorizons.Components.ShipLog;
+using NewHorizons.Utility.OWUtilities;
 
 namespace NewHorizons.Builder.ShipLog
 {

NewHorizons/Components/NHProxy.cs

@@ -1,6 +1,6 @@
 using NewHorizons.Components.SizeControllers;
 using NewHorizons.Handlers;
-using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

NewHorizons/Components/Quantum/QuantumPlanet.cs

@@ -3,7 +3,7 @@ using NewHorizons.Builder.Orbital;
 using NewHorizons.Components.Orbital;
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
-using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

NewHorizons/Handlers/PlanetCreationHandler.cs

@@ -10,6 +10,7 @@ using NewHorizons.Components.Stars;
 using NewHorizons.OtherMods.OWRichPresence;
 using NewHorizons.Utility;
 using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;

NewHorizons/Handlers/PlanetDestructionHandler.cs

@@ -1,6 +1,7 @@
 using NewHorizons.Components.Stars;
 using NewHorizons.Utility;
 using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 using OWML.Utils;
 using System;
 using System.Collections.Generic;

NewHorizons/Handlers/PlanetGraphHandler.cs

@@ -1,5 +1,6 @@
 using NewHorizons.External.Configs;
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 using System;
 using System.Collections;
 using System.Collections.Generic;

NewHorizons/Handlers/ShipLogHandler.cs

@@ -1,4 +1,5 @@
 using NewHorizons.Utility;
+using NewHorizons.Utility.OWUtilities;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

NewHorizons/Handlers/VesselWarpHandler.cs

@@ -8,6 +8,7 @@ using Logger = NewHorizons.Utility.Logger;
 using static NewHorizons.Main;
 using NewHorizons.Components.Orbital;
 using NewHorizons.Utility.OWMLUtilities;
+using NewHorizons.Utility.OWUtilities;
 
 namespace NewHorizons.Handlers
 {

NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs

@@ -2,6 +2,8 @@ using HarmonyLib;
 using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
 using NewHorizons.Utility.DebugUtilities;
+using NewHorizons.Utility.Geometry;
+using NewHorizons.Utility.OWUtilities;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;

NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs

@@ -2,6 +2,7 @@ using NewHorizons.Builder.Props;
 using NewHorizons.External.Configs;
 using NewHorizons.External.Modules;
 using NewHorizons.Handlers;
+using NewHorizons.Utility.OWUtilities;
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;

NewHorizons/Utility/Geometry/CoordinateUtilities.cs

@@ -1,5 +1,5 @@
 using UnityEngine;
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.Geometry
 {
     public static class CoordinateUtilities
     {

NewHorizons/Utility/OWUtilities/AstroObjectLocator.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
-namespace NewHorizons.Utility
+namespace NewHorizons.Utility.OWUtilities
 {
     public static class AstroObjectLocator
     {
@@ -10,7 +10,7 @@ namespace NewHorizons.Utility
         public static void Init()
         {
             _customAstroObjectDictionary = new Dictionary<string, AstroObject>();
-            foreach (AstroObject ao in GameObject.FindObjectsOfType<AstroObject>())
+            foreach (AstroObject ao in Object.FindObjectsOfType<AstroObject>())
             {
                 // Ignore the sun station debris, we handle it as a child of the sun station
                 if (ao.gameObject.name == "SS_Debris_Body") continue;