From 8a30017c8a2ba553fd40d7c99e8e9a0e16902f42 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 18 Mar 2023 18:24:22 -0400 Subject: [PATCH] Move more stuff --- NewHorizons/Builder/Body/FunnelBuilder.cs | 1 + NewHorizons/Builder/Body/Geometry/CubeSphere.cs | 2 +- NewHorizons/Builder/Orbital/InitialMotionBuilder.cs | 2 +- NewHorizons/Builder/Props/BrambleNodeBuilder.cs | 1 + NewHorizons/Builder/Props/ScatterBuilder.cs | 1 + NewHorizons/Builder/ShipLog/MapModeBuilder.cs | 1 + NewHorizons/Components/NHProxy.cs | 2 +- NewHorizons/Components/Quantum/QuantumPlanet.cs | 2 +- NewHorizons/Handlers/PlanetCreationHandler.cs | 1 + NewHorizons/Handlers/PlanetDestructionHandler.cs | 1 + NewHorizons/Handlers/PlanetGraphHandler.cs | 1 + NewHorizons/Handlers/ShipLogHandler.cs | 1 + NewHorizons/Handlers/VesselWarpHandler.cs | 1 + NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs | 2 ++ NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs | 1 + NewHorizons/Utility/{ => Geometry}/CoordinateUtilities.cs | 2 +- NewHorizons/Utility/{ => OWUtilities}/AstroObjectLocator.cs | 4 ++-- 17 files changed, 19 insertions(+), 7 deletions(-) rename NewHorizons/Utility/{ => Geometry}/CoordinateUtilities.cs (97%) rename NewHorizons/Utility/{ => OWUtilities}/AstroObjectLocator.cs (98%) diff --git a/NewHorizons/Builder/Body/FunnelBuilder.cs b/NewHorizons/Builder/Body/FunnelBuilder.cs index a7ce3724..67a13ad0 100644 --- a/NewHorizons/Builder/Body/FunnelBuilder.cs +++ b/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 { diff --git a/NewHorizons/Builder/Body/Geometry/CubeSphere.cs b/NewHorizons/Builder/Body/Geometry/CubeSphere.cs index 0e417314..d8257fd1 100644 --- a/NewHorizons/Builder/Body/Geometry/CubeSphere.cs +++ b/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 diff --git a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs b/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs index 969347f3..a6fce3fc 100644 --- a/NewHorizons/Builder/Orbital/InitialMotionBuilder.cs +++ b/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; diff --git a/NewHorizons/Builder/Props/BrambleNodeBuilder.cs b/NewHorizons/Builder/Props/BrambleNodeBuilder.cs index a4bdeebb..09e5e429 100644 --- a/NewHorizons/Builder/Props/BrambleNodeBuilder.cs +++ b/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; diff --git a/NewHorizons/Builder/Props/ScatterBuilder.cs b/NewHorizons/Builder/Props/ScatterBuilder.cs index 827453df..b963b012 100644 --- a/NewHorizons/Builder/Props/ScatterBuilder.cs +++ b/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; diff --git a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs index 0eaf91aa..8d01bf62 100644 --- a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs +++ b/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 { diff --git a/NewHorizons/Components/NHProxy.cs b/NewHorizons/Components/NHProxy.cs index 92a81e0e..6df1383a 100644 --- a/NewHorizons/Components/NHProxy.cs +++ b/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; diff --git a/NewHorizons/Components/Quantum/QuantumPlanet.cs b/NewHorizons/Components/Quantum/QuantumPlanet.cs index 9b551cd7..89eebdbb 100644 --- a/NewHorizons/Components/Quantum/QuantumPlanet.cs +++ b/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; diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs index c4ec1980..b32dda4e 100644 --- a/NewHorizons/Handlers/PlanetCreationHandler.cs +++ b/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; diff --git a/NewHorizons/Handlers/PlanetDestructionHandler.cs b/NewHorizons/Handlers/PlanetDestructionHandler.cs index 3bc3b6c2..3cd34466 100644 --- a/NewHorizons/Handlers/PlanetDestructionHandler.cs +++ b/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; diff --git a/NewHorizons/Handlers/PlanetGraphHandler.cs b/NewHorizons/Handlers/PlanetGraphHandler.cs index b31535d2..126f5801 100644 --- a/NewHorizons/Handlers/PlanetGraphHandler.cs +++ b/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; diff --git a/NewHorizons/Handlers/ShipLogHandler.cs b/NewHorizons/Handlers/ShipLogHandler.cs index 64962490..8618e0cf 100644 --- a/NewHorizons/Handlers/ShipLogHandler.cs +++ b/NewHorizons/Handlers/ShipLogHandler.cs @@ -1,4 +1,5 @@ using NewHorizons.Utility; +using NewHorizons.Utility.OWUtilities; using System.Collections.Generic; using System.Linq; using UnityEngine; diff --git a/NewHorizons/Handlers/VesselWarpHandler.cs b/NewHorizons/Handlers/VesselWarpHandler.cs index a056d95c..bb7d7fb6 100644 --- a/NewHorizons/Handlers/VesselWarpHandler.cs +++ b/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 { diff --git a/NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs b/NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs index e6f5d8fe..a518c844 100644 --- a/NewHorizons/Utility/DebugMenu/DebugMenuPropPlacer.cs +++ b/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; diff --git a/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs b/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs index 04554fd1..e9632c3b 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugPropPlacer.cs +++ b/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; diff --git a/NewHorizons/Utility/CoordinateUtilities.cs b/NewHorizons/Utility/Geometry/CoordinateUtilities.cs similarity index 97% rename from NewHorizons/Utility/CoordinateUtilities.cs rename to NewHorizons/Utility/Geometry/CoordinateUtilities.cs index 62d98eb9..10f8728d 100644 --- a/NewHorizons/Utility/CoordinateUtilities.cs +++ b/NewHorizons/Utility/Geometry/CoordinateUtilities.cs @@ -1,5 +1,5 @@ using UnityEngine; -namespace NewHorizons.Utility +namespace NewHorizons.Utility.Geometry { public static class CoordinateUtilities { diff --git a/NewHorizons/Utility/AstroObjectLocator.cs b/NewHorizons/Utility/OWUtilities/AstroObjectLocator.cs similarity index 98% rename from NewHorizons/Utility/AstroObjectLocator.cs rename to NewHorizons/Utility/OWUtilities/AstroObjectLocator.cs index 90552bb3..cd169053 100644 --- a/NewHorizons/Utility/AstroObjectLocator.cs +++ b/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(); - foreach (AstroObject ao in GameObject.FindObjectsOfType()) + foreach (AstroObject ao in Object.FindObjectsOfType()) { // Ignore the sun station debris, we handle it as a child of the sun station if (ao.gameObject.name == "SS_Debris_Body") continue;