From 977c790ef5989c36cadb052459edd78ae6d48c0d Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Mon, 30 May 2022 00:56:12 -0400 Subject: [PATCH] Use SearchUtilities.Find instead GameObject.Find --- .../Builder/Atmosphere/AtmosphereBuilder.cs | 5 ++- .../Builder/Atmosphere/CloudsBuilder.cs | 10 ++--- NewHorizons/Builder/Atmosphere/FogBuilder.cs | 6 +-- .../Builder/Atmosphere/VolumesBuilder.cs | 3 +- NewHorizons/Builder/Body/CometTailBuilder.cs | 5 ++- NewHorizons/Builder/Body/FunnelBuilder.cs | 12 +++--- NewHorizons/Builder/Body/GeometryBuilder.cs | 5 ++- NewHorizons/Builder/Body/LavaBuilder.cs | 9 +++-- NewHorizons/Builder/Body/ProxyBuilder.cs | 6 +-- NewHorizons/Builder/Body/SandBuilder.cs | 10 ++--- .../Builder/Body/SingularityBuilder.cs | 24 +++++------ NewHorizons/Builder/Body/StarBuilder.cs | 26 ++++++------ NewHorizons/Builder/Body/WaterBuilder.cs | 8 ++-- .../Builder/General/AmbientLightBuilder.cs | 5 ++- .../Builder/General/RigidBodyBuilder.cs | 5 ++- .../Builder/General/SpawnPointBuilder.cs | 7 ++-- NewHorizons/Builder/Props/DetailBuilder.cs | 2 +- NewHorizons/Builder/Props/GeyserBuilder.cs | 4 +- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 8 ++-- .../Builder/Props/ProjectionBuilder.cs | 6 +-- NewHorizons/Builder/Props/ScatterBuilder.cs | 4 +- NewHorizons/Builder/Props/SignalBuilder.cs | 4 +- NewHorizons/Builder/Props/TornadoBuilder.cs | 8 ++-- NewHorizons/Builder/Props/VolcanoBuilder.cs | 4 +- NewHorizons/Builder/ShipLog/MapModeBuilder.cs | 8 ++-- .../Components/ShipLogStarChartMode.cs | 4 +- NewHorizons/Components/ShipWarpController.cs | 9 +++-- NewHorizons/Handlers/PlanetCreationHandler.cs | 16 ++++---- .../Handlers/PlanetDestructionHandler.cs | 16 ++++---- NewHorizons/Handlers/ShipLogHandler.cs | 4 +- NewHorizons/Handlers/StarChartHandler.cs | 8 ++-- NewHorizons/Handlers/SystemCreationHandler.cs | 4 +- NewHorizons/Handlers/TitleSceneHandler.cs | 10 ++--- NewHorizons/Main.cs | 8 ++-- NewHorizons/Patches/ShipLogPatches.cs | 10 ++--- NewHorizons/Patches/WarpDrivePatches.cs | 5 ++- NewHorizons/Utility/AstroObjectLocator.cs | 40 +++++++++---------- .../Utility/DebugUtilities/DebugReload.cs | 4 +- NewHorizons/Utility/SearchUtilities.cs | 8 ++-- 39 files changed, 175 insertions(+), 165 deletions(-) diff --git a/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs b/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs index c60ae6a3..5260fbf7 100644 --- a/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/AtmosphereBuilder.cs @@ -1,4 +1,5 @@ -using NewHorizons.External.Modules; +using NewHorizons.External.Modules; +using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.Atmosphere { @@ -16,7 +17,7 @@ namespace NewHorizons.Builder.Atmosphere if (atmosphereModule.useAtmosphereShader) { - GameObject atmo = GameObject.Instantiate(GameObject.Find("TimberHearth_Body/Atmosphere_TH/AtmoSphere"), atmoGO.transform, true); + GameObject atmo = GameObject.Instantiate(SearchUtilities.Find("TimberHearth_Body/Atmosphere_TH/AtmoSphere"), atmoGO.transform, true); atmo.transform.position = planetGO.transform.TransformPoint(Vector3.zero); atmo.transform.localScale = Vector3.one * atmosphereModule.size * 1.2f; foreach (var meshRenderer in atmo.GetComponentsInChildren()) diff --git a/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs b/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs index 8363f36a..82900a6b 100644 --- a/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs @@ -21,7 +21,7 @@ namespace NewHorizons.Builder.Atmosphere public static void Make(GameObject planetGO, Sector sector, AtmosphereModule atmo, IModBehaviour mod) { - if (_lightningPrefab == null) _lightningPrefab = GameObject.Find("GiantsDeep_Body/Sector_GD/Clouds_GD/LightningGenerator_GD"); + if (_lightningPrefab == null) _lightningPrefab = SearchUtilities.Find("GiantsDeep_Body/Sector_GD/Clouds_GD/LightningGenerator_GD"); if (_colorRamp == null) _colorRamp = ImageUtilities.GetTexture(Main.Instance, "AssetBundle/textures/Clouds_Bottom_ramp.png"); GameObject cloudsMainGO = new GameObject("Clouds"); @@ -36,8 +36,8 @@ namespace NewHorizons.Builder.Atmosphere cloudsBottomGO.transform.localScale = Vector3.one * atmo.clouds.innerCloudRadius; TessellatedSphereRenderer bottomTSR = cloudsBottomGO.AddComponent(); - bottomTSR.tessellationMeshGroup = GameObject.Find("CloudsBottomLayer_QM").GetComponent().tessellationMeshGroup; - var bottomTSRMaterials = GameObject.Find("CloudsBottomLayer_QM").GetComponent().sharedMaterials; + bottomTSR.tessellationMeshGroup = SearchUtilities.Find("CloudsBottomLayer_QM").GetComponent().tessellationMeshGroup; + var bottomTSRMaterials = SearchUtilities.Find("CloudsBottomLayer_QM").GetComponent().sharedMaterials; // If they set a colour apply it to all the materials else keep the default QM one if (atmo.clouds.tint != null) @@ -165,12 +165,12 @@ namespace NewHorizons.Builder.Atmosphere cloudsTopGO.transform.localScale = Vector3.one * atmo.clouds.outerCloudRadius; MeshFilter topMF = cloudsTopGO.AddComponent(); - topMF.mesh = GameObject.Find("CloudsTopLayer_GD").GetComponent().mesh; + topMF.mesh = SearchUtilities.Find("CloudsTopLayer_GD").GetComponent().mesh; MeshRenderer topMR = cloudsTopGO.AddComponent(); if (_sphereShader == null) _sphereShader = Main.NHAssetBundle.LoadAsset("Assets/Shaders/SphereTextureWrapper.shader"); - if (_gdCloudMaterials == null) _gdCloudMaterials = GameObject.Find("CloudsTopLayer_GD").GetComponent().sharedMaterials; + if (_gdCloudMaterials == null) _gdCloudMaterials = SearchUtilities.Find("CloudsTopLayer_GD").GetComponent().sharedMaterials; var tempArray = new Material[2]; if (atmo.clouds.useBasicCloudShader) diff --git a/NewHorizons/Builder/Atmosphere/FogBuilder.cs b/NewHorizons/Builder/Atmosphere/FogBuilder.cs index b521ede5..4eae1a82 100644 --- a/NewHorizons/Builder/Atmosphere/FogBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/FogBuilder.cs @@ -17,9 +17,9 @@ namespace NewHorizons.Builder.Atmosphere fogGO.transform.localScale = Vector3.one; // Going to copy from dark bramble - var dbFog = GameObject.Find("DarkBramble_Body/Atmosphere_DB/FogLOD"); - var dbPlanetaryFogController = GameObject.Find("DarkBramble_Body/Atmosphere_DB/FogSphere_DB").GetComponent(); - var brambleLODFog = GameObject.Find("DarkBramble_Body/Sector_DB/Proxy_DB/LOD_DB_VolumeticFog"); + var dbFog = SearchUtilities.Find("DarkBramble_Body/Atmosphere_DB/FogLOD"); + var dbPlanetaryFogController = SearchUtilities.Find("DarkBramble_Body/Atmosphere_DB/FogSphere_DB").GetComponent(); + var brambleLODFog = SearchUtilities.Find("DarkBramble_Body/Sector_DB/Proxy_DB/LOD_DB_VolumeticFog"); MeshFilter MF = fogGO.AddComponent(); MF.mesh = dbFog.GetComponent().mesh; diff --git a/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs b/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs index 12ccc732..cba3845d 100644 --- a/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/VolumesBuilder.cs @@ -1,4 +1,5 @@ using NewHorizons.External.Configs; +using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.Atmosphere { @@ -37,7 +38,7 @@ namespace NewHorizons.Builder.Atmosphere EffectRuleset ER = rulesetGO.AddComponent(); ER._type = EffectRuleset.BubbleType.Underwater; - var gdRuleset = GameObject.Find("GiantsDeep_Body/Sector_GD/Volumes_GD/RulesetVolumes_GD").GetComponent(); + var gdRuleset = SearchUtilities.Find("GiantsDeep_Body/Sector_GD/Volumes_GD/RulesetVolumes_GD").GetComponent(); ER._material = gdRuleset._material; diff --git a/NewHorizons/Builder/Body/CometTailBuilder.cs b/NewHorizons/Builder/Body/CometTailBuilder.cs index be13a836..5980b2d1 100644 --- a/NewHorizons/Builder/Body/CometTailBuilder.cs +++ b/NewHorizons/Builder/Body/CometTailBuilder.cs @@ -1,4 +1,5 @@ -using NewHorizons.External.Configs; +using NewHorizons.External.Configs; +using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.Body { @@ -6,7 +7,7 @@ namespace NewHorizons.Builder.Body { public static void Make(GameObject planetGO, Sector sector, PlanetConfig config) { - var cometTail = GameObject.Instantiate(GameObject.Find("Comet_Body/Sector_CO/Effects_CO/Effects_CO_TailMeshes"), sector?.transform ?? planetGO.transform); + var cometTail = GameObject.Instantiate(SearchUtilities.Find("Comet_Body/Sector_CO/Effects_CO/Effects_CO_TailMeshes"), sector?.transform ?? planetGO.transform); cometTail.transform.position = planetGO.transform.position; cometTail.name = "CometTail"; cometTail.transform.localScale = Vector3.one * config.Base.surfaceSize / 110; diff --git a/NewHorizons/Builder/Body/FunnelBuilder.cs b/NewHorizons/Builder/Body/FunnelBuilder.cs index 9c54486f..eea69694 100644 --- a/NewHorizons/Builder/Body/FunnelBuilder.cs +++ b/NewHorizons/Builder/Body/FunnelBuilder.cs @@ -1,4 +1,4 @@ -using System.Runtime.Serialization; +using System.Runtime.Serialization; using NewHorizons.Components; using NewHorizons.Utility; using UnityEngine; @@ -43,13 +43,13 @@ namespace NewHorizons.Builder.Body scaleRoot.transform.localPosition = Vector3.zero; scaleRoot.transform.localScale = new Vector3(1, 1, 1); - var proxyGO = GameObject.Instantiate(GameObject.Find("SandFunnel_Body/ScaleRoot/Proxy_SandFunnel"), scaleRoot.transform); + var proxyGO = GameObject.Instantiate(SearchUtilities.Find("SandFunnel_Body/ScaleRoot/Proxy_SandFunnel"), scaleRoot.transform); proxyGO.name = "Proxy_Funnel"; - var geoGO = GameObject.Instantiate(GameObject.Find("SandFunnel_Body/ScaleRoot/Geo_SandFunnel"), scaleRoot.transform); + var geoGO = GameObject.Instantiate(SearchUtilities.Find("SandFunnel_Body/ScaleRoot/Geo_SandFunnel"), scaleRoot.transform); geoGO.name = "Geo_Funnel"; - var volumesGO = GameObject.Instantiate(GameObject.Find("SandFunnel_Body/ScaleRoot/Volumes_SandFunnel"), scaleRoot.transform); + var volumesGO = GameObject.Instantiate(SearchUtilities.Find("SandFunnel_Body/ScaleRoot/Volumes_SandFunnel"), scaleRoot.transform); volumesGO.name = "Volumes_Funnel"; var sfv = volumesGO.GetComponentInChildren(); var fluidVolume = sfv.gameObject; @@ -63,7 +63,7 @@ namespace NewHorizons.Builder.Body GameObject.Destroy(geoGO.transform.Find("Effects_HT_SandColumn/SandColumn_Interior").gameObject); - var waterMaterials = GameObject.Find("TimberHearth_Body/Sector_TH/Geometry_TH/Terrain_TH_Water_v3/Village_Upper_Water/Village_Upper_Water_Geo").GetComponent().materials; + var waterMaterials = SearchUtilities.Find("TimberHearth_Body/Sector_TH/Geometry_TH/Terrain_TH_Water_v3/Village_Upper_Water/Village_Upper_Water_Geo").GetComponent().materials; var materials = new Material[waterMaterials.Length]; for (int i = 0; i < waterMaterials.Length; i++) { @@ -111,7 +111,7 @@ namespace NewHorizons.Builder.Body GameObject.Destroy(geoGO.transform.Find("Effects_HT_SandColumn/SandColumn_Interior").gameObject); - var lavaMaterial = new Material(GameObject.Find("VolcanicMoon_Body/MoltenCore_VM/LavaSphere").GetComponent().material); + var lavaMaterial = new Material(SearchUtilities.Find("VolcanicMoon_Body/MoltenCore_VM/LavaSphere").GetComponent().material); lavaMaterial.mainTextureOffset = new Vector2(0.1f, 0.2f); lavaMaterial.mainTextureScale = new Vector2(1f, 3f); diff --git a/NewHorizons/Builder/Body/GeometryBuilder.cs b/NewHorizons/Builder/Body/GeometryBuilder.cs index dc422e71..fb0fc698 100644 --- a/NewHorizons/Builder/Body/GeometryBuilder.cs +++ b/NewHorizons/Builder/Body/GeometryBuilder.cs @@ -1,4 +1,5 @@ -using UnityEngine; +using UnityEngine; +using NewHorizons.Utility; namespace NewHorizons.Builder.Body { public static class GeometryBuilder @@ -9,7 +10,7 @@ namespace NewHorizons.Builder.Body groundGO.transform.parent = sector?.transform ?? planetGO.transform; groundGO.transform.localScale = new Vector3(groundScale, groundScale, groundScale); groundGO.transform.position = planetGO.transform.position; - groundGO.GetComponent().mesh = GameObject.Find("CloudsTopLayer_GD").GetComponent().mesh; + groundGO.GetComponent().mesh = SearchUtilities.Find("CloudsTopLayer_GD").GetComponent().mesh; groundGO.GetComponent().radius = 1f; groundGO.SetActive(true); } diff --git a/NewHorizons/Builder/Body/LavaBuilder.cs b/NewHorizons/Builder/Body/LavaBuilder.cs index ea831506..dc1d4d47 100644 --- a/NewHorizons/Builder/Body/LavaBuilder.cs +++ b/NewHorizons/Builder/Body/LavaBuilder.cs @@ -1,5 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using UnityEngine; +using NewHorizons.Utility; using NewHorizons.External.Modules.VariableSize; namespace NewHorizons.Builder.Body @@ -28,7 +29,7 @@ namespace NewHorizons.Builder.Body moltenCore.transform.position = planetGO.transform.position; moltenCore.transform.localScale = Vector3.one * module.size; - var lavaSphere = GameObject.Instantiate(GameObject.Find("VolcanicMoon_Body/MoltenCore_VM/LavaSphere"), moltenCore.transform); + var lavaSphere = GameObject.Instantiate(SearchUtilities.Find("VolcanicMoon_Body/MoltenCore_VM/LavaSphere"), moltenCore.transform); lavaSphere.transform.localScale = Vector3.one; lavaSphere.transform.name = "LavaSphere"; lavaSphere.GetComponent().material.SetFloat(HeightScale, heightScale); @@ -37,7 +38,7 @@ namespace NewHorizons.Builder.Body var sectorCullGroup = lavaSphere.GetComponent(); sectorCullGroup.SetSector(sector); - var moltenCoreProxy = GameObject.Instantiate(GameObject.Find("VolcanicMoon_Body/MoltenCore_VM/MoltenCore_Proxy"), moltenCore.transform); ; + var moltenCoreProxy = GameObject.Instantiate(SearchUtilities.Find("VolcanicMoon_Body/MoltenCore_VM/MoltenCore_Proxy"), moltenCore.transform); ; moltenCoreProxy.name = "MoltenCore_Proxy"; var proxyLavaSphere = moltenCoreProxy.transform.Find("LavaSphere (1)"); @@ -50,7 +51,7 @@ namespace NewHorizons.Builder.Body sectorProxy._renderers = new List { proxyLavaSphere.GetComponent() }; sectorProxy.SetSector(sector); - var destructionVolume = GameObject.Instantiate(GameObject.Find("VolcanicMoon_Body/MoltenCore_VM/DestructionVolume"), moltenCore.transform); + var destructionVolume = GameObject.Instantiate(SearchUtilities.Find("VolcanicMoon_Body/MoltenCore_VM/DestructionVolume"), moltenCore.transform); destructionVolume.GetComponent().radius = 1; destructionVolume.SetActive(true); diff --git a/NewHorizons/Builder/Body/ProxyBuilder.cs b/NewHorizons/Builder/Body/ProxyBuilder.cs index fb950a47..aea9a019 100644 --- a/NewHorizons/Builder/Body/ProxyBuilder.cs +++ b/NewHorizons/Builder/Body/ProxyBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Builder.Atmosphere; +using NewHorizons.Builder.Atmosphere; using NewHorizons.Builder.Props; using NewHorizons.Components; using NewHorizons.Components.SizeControllers; @@ -176,7 +176,7 @@ namespace NewHorizons.Builder.Body private static void MakeBlackHole(GameObject rootObject, float size) { - if (_blackHolePrefab == null) _blackHolePrefab = GameObject.Find(_blackHolePath); + if (_blackHolePrefab == null) _blackHolePrefab = SearchUtilities.Find(_blackHolePath); var blackHoleShader = _blackHolePrefab.GetComponent().material.shader; if (blackHoleShader == null) blackHoleShader = _blackHolePrefab.GetComponent().sharedMaterial.shader; @@ -201,7 +201,7 @@ namespace NewHorizons.Builder.Body private static void MakeWhiteHole(GameObject rootObject, float size) { - if (_whiteHolePrefab == null) _whiteHolePrefab = GameObject.Find(_whiteHolePath); + if (_whiteHolePrefab == null) _whiteHolePrefab = SearchUtilities.Find(_whiteHolePath); var whiteHoleShader = _whiteHolePrefab.GetComponent().material.shader; if (whiteHoleShader == null) whiteHoleShader = _whiteHolePrefab.GetComponent().sharedMaterial.shader; diff --git a/NewHorizons/Builder/Body/SandBuilder.cs b/NewHorizons/Builder/Body/SandBuilder.cs index 35de7c8b..43b86ac5 100644 --- a/NewHorizons/Builder/Body/SandBuilder.cs +++ b/NewHorizons/Builder/Body/SandBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Utility; +using NewHorizons.Utility; using UnityEngine; using NewHorizons.External.Modules.VariableSize; @@ -11,7 +11,7 @@ namespace NewHorizons.Builder.Body var sandGO = new GameObject("Sand"); sandGO.SetActive(false); - var sandSphere = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/SandSphere"), sandGO.transform); + var sandSphere = GameObject.Instantiate(SearchUtilities.Find("TowerTwin_Body/SandSphere_Draining/SandSphere"), sandGO.transform); if (module.tint != null) { var oldMR = sandSphere.GetComponent(); @@ -28,13 +28,13 @@ namespace NewHorizons.Builder.Body sandMR.sharedMaterials[1].color = module.tint.ToColor(); } - var collider = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/Collider"), sandGO.transform); + var collider = GameObject.Instantiate(SearchUtilities.Find("TowerTwin_Body/SandSphere_Draining/Collider"), sandGO.transform); var sphereCollider = collider.GetComponent(); collider.SetActive(true); - var occlusionSphere = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/OcclusionSphere"), sandGO.transform); + var occlusionSphere = GameObject.Instantiate(SearchUtilities.Find("TowerTwin_Body/SandSphere_Draining/OcclusionSphere"), sandGO.transform); - var proxyShadowCasterGO = GameObject.Instantiate(GameObject.Find("TowerTwin_Body/SandSphere_Draining/ProxyShadowCaster"), sandGO.transform); + var proxyShadowCasterGO = GameObject.Instantiate(SearchUtilities.Find("TowerTwin_Body/SandSphere_Draining/ProxyShadowCaster"), sandGO.transform); var proxyShadowCaster = proxyShadowCasterGO.GetComponent(); proxyShadowCaster.SetSuperGroup(sandGO.GetComponent()); diff --git a/NewHorizons/Builder/Body/SingularityBuilder.cs b/NewHorizons/Builder/Body/SingularityBuilder.cs index 949041f0..b9a031f6 100644 --- a/NewHorizons/Builder/Body/SingularityBuilder.cs +++ b/NewHorizons/Builder/Body/SingularityBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.External.Configs; using NewHorizons.Utility; using System; @@ -88,10 +88,10 @@ namespace NewHorizons.Builder.Body blackHoleRender.transform.localScale = Vector3.one * size; var meshFilter = blackHoleRender.AddComponent(); - meshFilter.mesh = GameObject.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleRenderer").GetComponent().mesh; + meshFilter.mesh = SearchUtilities.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleRenderer").GetComponent().mesh; var meshRenderer = blackHoleRender.AddComponent(); - if (blackHoleShader == null) blackHoleShader = GameObject.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleRenderer").GetComponent().sharedMaterial.shader; + if (blackHoleShader == null) blackHoleShader = SearchUtilities.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleRenderer").GetComponent().sharedMaterial.shader; meshRenderer.material = new Material(blackHoleShader); meshRenderer.material.SetFloat(Radius, size * 0.4f); meshRenderer.material.SetFloat(MaxDistortRadius, size * 0.95f); @@ -100,7 +100,7 @@ namespace NewHorizons.Builder.Body if (makeAudio) { - var blackHoleAmbience = GameObject.Instantiate(GameObject.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleAmbience"), blackHole.transform); + var blackHoleAmbience = GameObject.Instantiate(SearchUtilities.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleAmbience"), blackHole.transform); blackHoleAmbience.name = "BlackHoleAmbience"; blackHoleAmbience.GetComponent().SetSector(sector); @@ -109,7 +109,7 @@ namespace NewHorizons.Builder.Body blackHoleAudioSource.minDistance = size * 0.4f; blackHoleAmbience.transform.localPosition = Vector3.zero; - var blackHoleOneShot = GameObject.Instantiate(GameObject.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleEmissionOneShot"), blackHole.transform); + var blackHoleOneShot = GameObject.Instantiate(SearchUtilities.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleEmissionOneShot"), blackHole.transform); var oneShotAudioSource = blackHoleOneShot.GetComponent(); oneShotAudioSource.maxDistance = size * 3f; oneShotAudioSource.minDistance = size * 0.4f; @@ -137,7 +137,7 @@ namespace NewHorizons.Builder.Body } else { - var blackHoleVolume = GameObject.Instantiate(GameObject.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleVolume"), blackHole.transform); + var blackHoleVolume = GameObject.Instantiate(SearchUtilities.Find("BrittleHollow_Body/BlackHole_BH/BlackHoleVolume"), blackHole.transform); blackHoleVolume.name = "BlackHoleVolume"; blackHoleVolume.GetComponent().radius = size * 0.4f; } @@ -159,10 +159,10 @@ namespace NewHorizons.Builder.Body whiteHoleRenderer.transform.localScale = Vector3.one * size * 2.8f; var meshFilter = whiteHoleRenderer.AddComponent(); - meshFilter.mesh = GameObject.Find("WhiteHole_Body/WhiteHoleVisuals/Singularity").GetComponent().mesh; + meshFilter.mesh = SearchUtilities.Find("WhiteHole_Body/WhiteHoleVisuals/Singularity").GetComponent().mesh; var meshRenderer = whiteHoleRenderer.AddComponent(); - if (whiteHoleShader == null) whiteHoleShader = GameObject.Find("WhiteHole_Body/WhiteHoleVisuals/Singularity").GetComponent().sharedMaterial.shader; + if (whiteHoleShader == null) whiteHoleShader = SearchUtilities.Find("WhiteHole_Body/WhiteHoleVisuals/Singularity").GetComponent().sharedMaterial.shader; meshRenderer.material = new Material(whiteHoleShader); meshRenderer.sharedMaterial.SetFloat(Radius, size * 0.4f); meshRenderer.sharedMaterial.SetFloat(DistortFadeDist, size); @@ -170,14 +170,14 @@ namespace NewHorizons.Builder.Body meshRenderer.sharedMaterial.SetFloat(MassScale, -1); meshRenderer.sharedMaterial.SetColor(Color1, new Color(1.88f, 1.88f, 1.88f, 1f)); - var ambientLight = GameObject.Instantiate(GameObject.Find("WhiteHole_Body/WhiteHoleVisuals/AmbientLight_WH")); + var ambientLight = GameObject.Instantiate(SearchUtilities.Find("WhiteHole_Body/WhiteHoleVisuals/AmbientLight_WH")); ambientLight.transform.parent = whiteHole.transform; ambientLight.transform.localScale = Vector3.one; ambientLight.transform.localPosition = Vector3.zero; ambientLight.name = "AmbientLight"; ambientLight.GetComponent().range = size * 7f; - GameObject whiteHoleVolumeGO = GameObject.Instantiate(GameObject.Find("WhiteHole_Body/WhiteHoleVolume")); + GameObject whiteHoleVolumeGO = GameObject.Instantiate(SearchUtilities.Find("WhiteHole_Body/WhiteHoleVolume")); whiteHoleVolumeGO.transform.parent = whiteHole.transform; whiteHoleVolumeGO.transform.localPosition = Vector3.zero; whiteHoleVolumeGO.transform.localScale = Vector3.one; @@ -205,13 +205,13 @@ namespace NewHorizons.Builder.Body if (makeZeroGVolume) { - var zeroGVolume = GameObject.Instantiate(GameObject.Find("WhiteHole_Body/ZeroGVolume"), whiteHole.transform); + var zeroGVolume = GameObject.Instantiate(SearchUtilities.Find("WhiteHole_Body/ZeroGVolume"), whiteHole.transform); zeroGVolume.name = "ZeroGVolume"; zeroGVolume.transform.localPosition = Vector3.zero; zeroGVolume.GetComponent().radius = size * 10f; zeroGVolume.GetComponent()._attachedBody = OWRB; - var rulesetVolume = GameObject.Instantiate(GameObject.Find("WhiteHole_Body/Sector_WhiteHole/RulesetVolumes_WhiteHole"), planetGO.transform); + var rulesetVolume = GameObject.Instantiate(SearchUtilities.Find("WhiteHole_Body/Sector_WhiteHole/RulesetVolumes_WhiteHole"), planetGO.transform); rulesetVolume.name = "RulesetVolume"; rulesetVolume.transform.localPosition = Vector3.zero; rulesetVolume.transform.localScale = Vector3.one * size / 100f; diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs index ba5d303a..aa0cc253 100644 --- a/NewHorizons/Builder/Body/StarBuilder.cs +++ b/NewHorizons/Builder/Body/StarBuilder.cs @@ -23,7 +23,7 @@ namespace NewHorizons.Builder.Body { var starGO = MakeStarGraphics(planetGO, sector, starModule); - var sunAudio = Object.Instantiate(GameObject.Find("Sun_Body/Sector_SUN/Audio_SUN"), starGO.transform); + var sunAudio = Object.Instantiate(SearchUtilities.Find("Sun_Body/Sector_SUN/Audio_SUN"), starGO.transform); sunAudio.transform.localPosition = Vector3.zero; sunAudio.transform.localScale = Vector3.one; sunAudio.transform.Find("SurfaceAudio_Sun").GetComponent().maxDistance = starModule.size * 2f; @@ -36,7 +36,7 @@ namespace NewHorizons.Builder.Body GameObject sunAtmosphere = null; if (starModule.hasAtmosphere) { - sunAtmosphere = Object.Instantiate(GameObject.Find("Sun_Body/Atmosphere_SUN"), starGO.transform); + sunAtmosphere = Object.Instantiate(SearchUtilities.Find("Sun_Body/Atmosphere_SUN"), starGO.transform); sunAtmosphere.transform.position = planetGO.transform.position; sunAtmosphere.transform.localScale = Vector3.one * OuterRadiusRatio; sunAtmosphere.name = "Atmosphere_Star"; @@ -59,17 +59,17 @@ namespace NewHorizons.Builder.Body fog.lodFadeDistance = fog.fogRadius * (StarBuilder.OuterRadiusRatio - 1f); } - var ambientLightGO = Object.Instantiate(GameObject.Find("Sun_Body/AmbientLight_SUN"), starGO.transform); + var ambientLightGO = Object.Instantiate(SearchUtilities.Find("Sun_Body/AmbientLight_SUN"), starGO.transform); ambientLightGO.transform.localPosition = Vector3.zero; ambientLightGO.name = "AmbientLight_Star"; - var heatVolume = Object.Instantiate(GameObject.Find("Sun_Body/Sector_SUN/Volumes_SUN/HeatVolume"), starGO.transform); + var heatVolume = Object.Instantiate(SearchUtilities.Find("Sun_Body/Sector_SUN/Volumes_SUN/HeatVolume"), starGO.transform); heatVolume.transform.localPosition = Vector3.zero; heatVolume.transform.localScale = Vector3.one; heatVolume.GetComponent().radius = 1f; heatVolume.name = "HeatVolume"; - var deathVolume = Object.Instantiate(GameObject.Find("Sun_Body/Sector_SUN/Volumes_SUN/ScaledVolumesRoot/DestructionFluidVolume"), starGO.transform); + var deathVolume = Object.Instantiate(SearchUtilities.Find("Sun_Body/Sector_SUN/Volumes_SUN/ScaledVolumesRoot/DestructionFluidVolume"), starGO.transform); deathVolume.transform.localPosition = Vector3.zero; deathVolume.transform.localScale = Vector3.one; deathVolume.GetComponent().radius = 1f; @@ -85,7 +85,7 @@ namespace NewHorizons.Builder.Body sunLight.transform.localScale = Vector3.one; var light = sunLight.AddComponent(); - light.CopyPropertiesFrom(GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); + light.CopyPropertiesFrom(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); light.intensity *= starModule.solarLuminosity; light.range *= Mathf.Sqrt(starModule.solarLuminosity); @@ -96,12 +96,12 @@ namespace NewHorizons.Builder.Body ambientLight.color = lightColour; var faceActiveCamera = sunLight.AddComponent(); - faceActiveCamera.CopyPropertiesFrom(GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); + faceActiveCamera.CopyPropertiesFrom(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); var csmTextureCacher = sunLight.AddComponent(); - csmTextureCacher.CopyPropertiesFrom(GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); + csmTextureCacher.CopyPropertiesFrom(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); csmTextureCacher._light = light; var proxyShadowLight = sunLight.AddComponent(); - proxyShadowLight.CopyPropertiesFrom(GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); + proxyShadowLight.CopyPropertiesFrom(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent()); proxyShadowLight._light = light; StarController starController = null; @@ -172,12 +172,12 @@ namespace NewHorizons.Builder.Body var starGO = new GameObject("Star"); starGO.transform.parent = sector?.transform ?? rootObject.transform; - var sunSurface = Object.Instantiate(GameObject.Find("Sun_Body/Sector_SUN/Geometry_SUN/Surface"), starGO.transform); + var sunSurface = Object.Instantiate(SearchUtilities.Find("Sun_Body/Sector_SUN/Geometry_SUN/Surface"), starGO.transform); sunSurface.transform.position = rootObject.transform.position; sunSurface.transform.localScale = Vector3.one; sunSurface.name = "Surface"; - var solarFlareEmitter = Object.Instantiate(GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SolarFlareEmitter"), starGO.transform); + var solarFlareEmitter = Object.Instantiate(SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SolarFlareEmitter"), starGO.transform); solarFlareEmitter.transform.localPosition = Vector3.zero; solarFlareEmitter.transform.localScale = Vector3.one; solarFlareEmitter.name = "SolarFlareEmitter"; @@ -204,7 +204,7 @@ namespace NewHorizons.Builder.Body var colour = starModule.tint.ToColor(); - var sun = GameObject.Find("Sun_Body"); + var sun = SearchUtilities.Find("Sun_Body"); var mainSequenceMaterial = sun.GetComponent()._startSurfaceMaterial; var giantMaterial = sun.GetComponent()._endSurfaceMaterial; @@ -230,7 +230,7 @@ namespace NewHorizons.Builder.Body private static SupernovaEffectController MakeSupernova(GameObject starGO, StarModule starModule) { - var supernovaGO = GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/Supernova").InstantiateInactive(); + var supernovaGO = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/Supernova").InstantiateInactive(); supernovaGO.transform.SetParent(starGO.transform); supernovaGO.transform.localPosition = Vector3.zero; diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs index 5780e638..fdb85ec8 100644 --- a/NewHorizons/Builder/Body/WaterBuilder.cs +++ b/NewHorizons/Builder/Body/WaterBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.Components.SizeControllers; using NewHorizons.Utility; using UnityEngine; @@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Body waterGO.transform.parent = sector?.transform ?? planetGO.transform; waterGO.transform.localScale = new Vector3(waterSize, waterSize, waterSize); - var GDTSR = GameObject.Find("Ocean_GD").GetComponent(); + var GDTSR = SearchUtilities.Find("Ocean_GD").GetComponent(); TessellatedSphereRenderer TSR = waterGO.AddComponent(); TSR.tessellationMeshGroup = ScriptableObject.CreateInstance(); @@ -30,7 +30,7 @@ namespace NewHorizons.Builder.Body TSR.tessellationMeshGroup.variants[i] = mesh; } - var GDSharedMaterials = GameObject.Find("Ocean_GD").GetComponent()._lowAltitudeMaterials; + var GDSharedMaterials = SearchUtilities.Find("Ocean_GD").GetComponent()._lowAltitudeMaterials; var tempArray = new Material[GDSharedMaterials.Length]; for (int i = 0; i < GDSharedMaterials.Length; i++) { @@ -87,7 +87,7 @@ namespace NewHorizons.Builder.Body fluidVolume._radius = waterSize; fluidVolume._layer = LayerMask.NameToLayer("BasicEffectVolume"); - var fogGO = GameObject.Instantiate(GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Effects_GDInterior/OceanFog"), waterGO.transform); + var fogGO = GameObject.Instantiate(SearchUtilities.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Effects_GDInterior/OceanFog"), waterGO.transform); fogGO.name = "OceanFog"; fogGO.transform.localPosition = Vector3.zero; fogGO.transform.localScale = Vector3.one; diff --git a/NewHorizons/Builder/General/AmbientLightBuilder.cs b/NewHorizons/Builder/General/AmbientLightBuilder.cs index 6ad20aaf..c51f90c0 100644 --- a/NewHorizons/Builder/General/AmbientLightBuilder.cs +++ b/NewHorizons/Builder/General/AmbientLightBuilder.cs @@ -1,11 +1,12 @@ -using UnityEngine; +using UnityEngine; +using NewHorizons.Utility; namespace NewHorizons.Builder.General { public static class AmbientLightBuilder { public static void Make(GameObject planetGO, Sector sector, float scale, float intensity) { - GameObject lightGO = GameObject.Instantiate(GameObject.Find("BrittleHollow_Body/AmbientLight_BH_Surface"), sector?.transform ?? planetGO.transform); + GameObject lightGO = GameObject.Instantiate(SearchUtilities.Find("BrittleHollow_Body/AmbientLight_BH_Surface"), sector?.transform ?? planetGO.transform); lightGO.transform.position = planetGO.transform.position; lightGO.name = "Light"; diff --git a/NewHorizons/Builder/General/RigidBodyBuilder.cs b/NewHorizons/Builder/General/RigidBodyBuilder.cs index f6672314..a827cc2e 100644 --- a/NewHorizons/Builder/General/RigidBodyBuilder.cs +++ b/NewHorizons/Builder/General/RigidBodyBuilder.cs @@ -1,4 +1,5 @@ -using NewHorizons.External.Configs; +using NewHorizons.External.Configs; +using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.General { @@ -27,7 +28,7 @@ namespace NewHorizons.Builder.General owRigidBody._maintainOriginalCenterOfMass = true; owRigidBody._rigidbody = rigidBody; owRigidBody._kinematicRigidbody = kinematicRigidBody; - owRigidBody._origParent = GameObject.Find("SolarSystemRoot").transform; + owRigidBody._origParent = SearchUtilities.Find("SolarSystemRoot").transform; owRigidBody.EnableKinematicSimulation(); owRigidBody.MakeKinematic(); diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs index f74767bd..8c26fd9c 100644 --- a/NewHorizons/Builder/General/SpawnPointBuilder.cs +++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs @@ -1,4 +1,5 @@ -using NewHorizons.External.Modules; +using NewHorizons.External.Modules; +using NewHorizons.Utility; using UnityEngine; using Logger = NewHorizons.Utility.Logger; namespace NewHorizons.Builder.General @@ -43,7 +44,7 @@ namespace NewHorizons.Builder.General spawnPoint._isShipSpawn = true; spawnPoint._triggerVolumes = new OWTriggerVolume[0]; - var ship = GameObject.Find("Ship_Body"); + var ship = SearchUtilities.Find("Ship_Body"); ship.transform.position = spawnPoint.transform.position; if(module.shipSpawnRotation != null) @@ -92,7 +93,7 @@ namespace NewHorizons.Builder.General Locator.GetPlayerTransform().GetComponent().SuitUp(false, true, true); // Make the ship act as if the player took the suit - var spv = GameObject.Find("Ship_Body/Module_Supplies/Systems_Supplies/ExpeditionGear")?.GetComponent(); + var spv = SearchUtilities.Find("Ship_Body/Module_Supplies/Systems_Supplies/ExpeditionGear")?.GetComponent(); if (spv == null) return; diff --git a/NewHorizons/Builder/Props/DetailBuilder.cs b/NewHorizons/Builder/Props/DetailBuilder.cs index 98c3927d..61287cb4 100644 --- a/NewHorizons/Builder/Props/DetailBuilder.cs +++ b/NewHorizons/Builder/Props/DetailBuilder.cs @@ -150,7 +150,7 @@ namespace NewHorizons.Builder.Props { torchItem.enabled = true; torchItem.mindProjectorTrigger.enabled = true; - torchItem.mindSlideProjector._mindProjectorImageEffect = GameObject.Find("Player_Body/PlayerCamera").GetComponent(); + torchItem.mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent(); } } else diff --git a/NewHorizons/Builder/Props/GeyserBuilder.cs b/NewHorizons/Builder/Props/GeyserBuilder.cs index bd177925..6cb77acb 100644 --- a/NewHorizons/Builder/Props/GeyserBuilder.cs +++ b/NewHorizons/Builder/Props/GeyserBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules; +using NewHorizons.External.Modules; using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.Props @@ -7,7 +7,7 @@ namespace NewHorizons.Builder.Props { public static void Make(GameObject planetGO, Sector sector, PropModule.GeyserInfo info) { - var original = GameObject.Find("TimberHearth_Body/Sector_TH/Interactables_TH/Geysers/Geyser_Village"); + var original = SearchUtilities.Find("TimberHearth_Body/Sector_TH/Interactables_TH/Geysers/Geyser_Village"); GameObject geyserGO = original.InstantiateInactive(); geyserGO.transform.parent = sector?.transform ?? planetGO.transform; geyserGO.name = "Geyser"; diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index b2cc2c44..d304a9b8 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -51,18 +51,18 @@ namespace NewHorizons.Builder.Props _ghostArcPrefabs.Add(arc); } - _scrollPrefab = GameObject.Find("BrittleHollow_Body/Sector_BH/Sector_NorthHemisphere/Sector_NorthPole/Sector_HangingCity/Sector_HangingCity_District2/Interactables_HangingCity_District2/Prefab_NOM_Scroll").InstantiateInactive(); + _scrollPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_NorthHemisphere/Sector_NorthPole/Sector_HangingCity/Sector_HangingCity_District2/Interactables_HangingCity_District2/Prefab_NOM_Scroll").InstantiateInactive(); _scrollPrefab.name = "Prefab_NOM_Scroll"; - _computerPrefab = GameObject.Find("VolcanicMoon_Body/Sector_VM/Interactables_VM/Prefab_NOM_Computer").InstantiateInactive(); + _computerPrefab = SearchUtilities.Find("VolcanicMoon_Body/Sector_VM/Interactables_VM/Prefab_NOM_Computer").InstantiateInactive(); _computerPrefab.name = "Prefab_NOM_Computer"; _computerPrefab.transform.rotation = Quaternion.identity; - _cairnPrefab = GameObject.Find("BrittleHollow_Body/Sector_BH/Sector_Crossroads/Interactables_Crossroads/Trailmarkers/Prefab_NOM_BH_Cairn_Arc (1)").InstantiateInactive(); + _cairnPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_Crossroads/Interactables_Crossroads/Trailmarkers/Prefab_NOM_BH_Cairn_Arc (1)").InstantiateInactive(); _cairnPrefab.name = "Prefab_NOM_Cairn"; _cairnPrefab.transform.rotation = Quaternion.identity; - _recorderPrefab = GameObject.Find("Comet_Body/Prefab_NOM_Shuttle/Sector_NomaiShuttleInterior/Interactibles_NomaiShuttleInterior/Prefab_NOM_Recorder").InstantiateInactive(); + _recorderPrefab = SearchUtilities.Find("Comet_Body/Prefab_NOM_Shuttle/Sector_NomaiShuttleInterior/Interactibles_NomaiShuttleInterior/Prefab_NOM_Recorder").InstantiateInactive(); _recorderPrefab.name = "Prefab_NOM_Recorder"; _recorderPrefab.transform.rotation = Quaternion.identity; } diff --git a/NewHorizons/Builder/Props/ProjectionBuilder.cs b/NewHorizons/Builder/Props/ProjectionBuilder.cs index da0ab34f..d6bc9b7a 100644 --- a/NewHorizons/Builder/Props/ProjectionBuilder.cs +++ b/NewHorizons/Builder/Props/ProjectionBuilder.cs @@ -41,7 +41,7 @@ namespace NewHorizons.Builder.Props { if (_slideReelPrefab == null) { - _slideReelPrefab = GameObject.Find("RingWorld_Body/Sector_RingInterior/Sector_Zone1/Sector_SlideBurningRoom_Zone1/Interactables_SlideBurningRoom_Zone1/Prefab_IP_SecretAlcove/RotationPivot/SlideReelSocket/Prefab_IP_Reel_1_LibraryPath")?.gameObject?.InstantiateInactive(); + _slideReelPrefab = SearchUtilities.Find("RingWorld_Body/Sector_RingInterior/Sector_Zone1/Sector_SlideBurningRoom_Zone1/Interactables_SlideBurningRoom_Zone1/Prefab_IP_SecretAlcove/RotationPivot/SlideReelSocket/Prefab_IP_Reel_1_LibraryPath")?.gameObject?.InstantiateInactive(); if (_slideReelPrefab == null) { Logger.LogWarning($"Tried to make a slide reel but couldn't. Do you have the DLC installed?"); @@ -139,7 +139,7 @@ namespace NewHorizons.Builder.Props { if (_autoPrefab == null) { - _autoPrefab = GameObject.Find("RingWorld_Body/Sector_RingInterior/Sector_Zone4/Sector_BlightedShore/Sector_JammingControlRoom_Zone4/Interactables_JammingControlRoom_Zone4/AutoProjector_SignalJammer/Prefab_IP_AutoProjector_SignalJammer")?.gameObject?.InstantiateInactive(); + _autoPrefab = SearchUtilities.Find("RingWorld_Body/Sector_RingInterior/Sector_Zone4/Sector_BlightedShore/Sector_JammingControlRoom_Zone4/Interactables_JammingControlRoom_Zone4/AutoProjector_SignalJammer/Prefab_IP_AutoProjector_SignalJammer")?.gameObject?.InstantiateInactive(); if (_autoPrefab == null) { Logger.LogWarning($"Tried to make a auto projector but couldn't. Do you have the DLC installed?"); @@ -261,7 +261,7 @@ namespace NewHorizons.Builder.Props // var mindSlideProjector = standingTorch.GetComponent(); - mindSlideProjector._mindProjectorImageEffect = GameObject.Find("Player_Body/PlayerCamera").GetComponent(); + mindSlideProjector._mindProjectorImageEffect = SearchUtilities.Find("Player_Body/PlayerCamera").GetComponent(); // setup for visually supporting async texture loading mindSlideProjector.enabled = false; diff --git a/NewHorizons/Builder/Props/ScatterBuilder.cs b/NewHorizons/Builder/Props/ScatterBuilder.cs index f3293eaa..89307795 100644 --- a/NewHorizons/Builder/Props/ScatterBuilder.cs +++ b/NewHorizons/Builder/Props/ScatterBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Configs; +using NewHorizons.External.Configs; using NewHorizons.External.Modules; using NewHorizons.Utility; using OWML.Common; @@ -44,7 +44,7 @@ namespace NewHorizons.Builder.Props GameObject prefab; if (propInfo.assetBundle != null) prefab = AssetBundleUtilities.LoadPrefab(propInfo.assetBundle, propInfo.path, mod); - else prefab = GameObject.Find(propInfo.path); + else prefab = SearchUtilities.Find(propInfo.path); for (int i = 0; i < propInfo.count; i++) { var randomInd = (int)Random.Range(0, points.Count - 1); diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 7f38857e..097ea6cb 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.External.Modules; using NewHorizons.Utility; using OWML.Common; @@ -192,7 +192,7 @@ namespace NewHorizons.Builder.Props source.rolloffMode = AudioRolloffMode.Custom; if (_customCurve == null) - _customCurve = GameObject.Find("Moon_Body/Sector_THM/Characters_THM/Villager_HEA_Esker/Signal_Whistling").GetComponent().GetCustomCurve(AudioSourceCurveType.CustomRolloff); + _customCurve = SearchUtilities.Find("Moon_Body/Sector_THM/Characters_THM/Villager_HEA_Esker/Signal_Whistling").GetComponent().GetCustomCurve(AudioSourceCurveType.CustomRolloff); source.SetCustomCurve(AudioSourceCurveType.CustomRolloff, _customCurve); // If it can be heard regularly then we play it immediately diff --git a/NewHorizons/Builder/Props/TornadoBuilder.cs b/NewHorizons/Builder/Props/TornadoBuilder.cs index 730790b5..34c21494 100644 --- a/NewHorizons/Builder/Props/TornadoBuilder.cs +++ b/NewHorizons/Builder/Props/TornadoBuilder.cs @@ -26,17 +26,17 @@ namespace NewHorizons.Builder.Props { if (_upPrefab == null) { - _upPrefab = GameObject.Find("BrittleHollow_Body/Sector_BH/Sector_SouthHemisphere/Sector_SouthPole/Sector_Observatory/Interactables_Observatory/MockUpTornado").InstantiateInactive(); + _upPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_SouthHemisphere/Sector_SouthPole/Sector_Observatory/Interactables_Observatory/MockUpTornado").InstantiateInactive(); _upPrefab.name = "Tornado_Up_Prefab"; } if (_downPrefab == null) { - _downPrefab = GameObject.Find("BrittleHollow_Body/Sector_BH/Sector_SouthHemisphere/Sector_SouthPole/Sector_Observatory/Interactables_Observatory/MockDownTornado").InstantiateInactive(); + _downPrefab = SearchUtilities.Find("BrittleHollow_Body/Sector_BH/Sector_SouthHemisphere/Sector_SouthPole/Sector_Observatory/Interactables_Observatory/MockDownTornado").InstantiateInactive(); _downPrefab.name = "Tornado_Down_Prefab"; } if (_hurricanePrefab == null) { - _hurricanePrefab = GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Tornadoes_GDInterior/Hurricane/").InstantiateInactive(); + _hurricanePrefab = SearchUtilities.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Tornadoes_GDInterior/Hurricane/").InstantiateInactive(); // For some reason they put the hurricane at the origin and offset all its children (450) // Increasing by 40 will keep the bottom above the ground foreach (Transform child in _hurricanePrefab.transform) @@ -50,7 +50,7 @@ namespace NewHorizons.Builder.Props } if (_soundPrefab == null) { - _soundPrefab = GameObject.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Tornadoes_GDInterior/SouthernTornadoes/DownTornado_Pivot/DownTornado/AudioRail").InstantiateInactive(); + _soundPrefab = SearchUtilities.Find("GiantsDeep_Body/Sector_GD/Sector_GDInterior/Tornadoes_GDInterior/SouthernTornadoes/DownTornado_Pivot/DownTornado/AudioRail").InstantiateInactive(); _soundPrefab.name = "AudioRail_Prefab"; } if (_mainTexture == null) diff --git a/NewHorizons/Builder/Props/VolcanoBuilder.cs b/NewHorizons/Builder/Props/VolcanoBuilder.cs index a9e04b51..48f5fa99 100644 --- a/NewHorizons/Builder/Props/VolcanoBuilder.cs +++ b/NewHorizons/Builder/Props/VolcanoBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.External.Modules; +using NewHorizons.External.Modules; using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Builder.Props @@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Props public static void Make(GameObject planetGO, Sector sector, PropModule.VolcanoInfo info) { - var prefab = GameObject.Find("VolcanicMoon_Body/Sector_VM/Effects_VM/VolcanoPivot (2)/MeteorLauncher"); + var prefab = SearchUtilities.Find("VolcanicMoon_Body/Sector_VM/Effects_VM/VolcanoPivot (2)/MeteorLauncher"); var launcherGO = prefab.InstantiateInactive(); launcherGO.transform.parent = sector.transform; diff --git a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs index 8b007aa3..dcca9126 100644 --- a/NewHorizons/Builder/ShipLog/MapModeBuilder.cs +++ b/NewHorizons/Builder/ShipLog/MapModeBuilder.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.External.Modules; using NewHorizons.Handlers; using NewHorizons.Utility; @@ -16,7 +16,7 @@ namespace NewHorizons.Builder.ShipLog #region General public static ShipLogAstroObject[][] ConstructMapMode(string systemName, GameObject transformParent, ShipLogAstroObject[][] currentNav, int layer) { - Material greyScaleMaterial = GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/TimberHearth/Sprite").GetComponent().material; + Material greyScaleMaterial = SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/TimberHearth/Sprite").GetComponent().material; List bodies = Main.BodyDict[systemName].Where( b => !(b.Config.ShipLog?.mapMode?.remove ?? false) && !b.Config.isQuantumState ).ToList(); @@ -251,12 +251,12 @@ namespace NewHorizons.Builder.ShipLog navMatrix[navIndex[0]][navIndex[1]] = null; if (astroObject.GetID() == "CAVE_TWIN" || astroObject.GetID() == "TOWER_TWIN") { - GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel").SetActive(false); + SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel").SetActive(false); } } else if (name == "SandFunnel") { - GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel").SetActive(false); + SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel").SetActive(false); } gameObject.SetActive(false); } diff --git a/NewHorizons/Components/ShipLogStarChartMode.cs b/NewHorizons/Components/ShipLogStarChartMode.cs index 251ce350..78cd5200 100644 --- a/NewHorizons/Components/ShipLogStarChartMode.cs +++ b/NewHorizons/Components/ShipLogStarChartMode.cs @@ -1,4 +1,4 @@ -using NewHorizons.Handlers; +using NewHorizons.Handlers; using NewHorizons.Utility; using System; using System.Collections.Generic; @@ -136,7 +136,7 @@ namespace NewHorizons.Components { if (_cardTemplate == null) { - var panRoot = GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/DetectiveMode/ScaleRoot/PanRoot"); + var panRoot = SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/DetectiveMode/ScaleRoot/PanRoot"); _cardTemplate = GameObject.Instantiate(panRoot.GetComponentInChildren().gameObject); _cardTemplate.SetActive(false); } diff --git a/NewHorizons/Components/ShipWarpController.cs b/NewHorizons/Components/ShipWarpController.cs index 470dc432..9f4a8cc3 100644 --- a/NewHorizons/Components/ShipWarpController.cs +++ b/NewHorizons/Components/ShipWarpController.cs @@ -1,4 +1,5 @@ -using NewHorizons.Builder.General; +using NewHorizons.Builder.General; +using NewHorizons.Utility; using UnityEngine; using Logger = NewHorizons.Utility.Logger; namespace NewHorizons.Components @@ -26,8 +27,8 @@ namespace NewHorizons.Components public void Init() { - _blackHolePrefab = GameObject.Find(_blackHolePath); - _whiteHolePrefab = GameObject.Find(_whiteHolePath); + _blackHolePrefab = SearchUtilities.Find(_blackHolePath); + _whiteHolePrefab = SearchUtilities.Find(_whiteHolePath); } public void Start() @@ -183,7 +184,7 @@ namespace NewHorizons.Components // For some reason warping into the ship makes you suffocate while in the ship if (_wearingSuit) resources.OnSuitUp(); var o2Volume = Locator.GetShipBody().GetComponent(); - var atmoVolume = GameObject.Find("Ship_Body/Volumes/ShipAtmosphereVolume").GetComponent(); + var atmoVolume = SearchUtilities.Find("Ship_Body/Volumes/ShipAtmosphereVolume").GetComponent(); resources._cameraFluidDetector.AddVolume(atmoVolume); resources._cameraFluidDetector.OnVolumeAdded(atmoVolume); diff --git a/NewHorizons/Handlers/PlanetCreationHandler.cs b/NewHorizons/Handlers/PlanetCreationHandler.cs index b79e5116..1470b5f6 100644 --- a/NewHorizons/Handlers/PlanetCreationHandler.cs +++ b/NewHorizons/Handlers/PlanetCreationHandler.cs @@ -33,13 +33,13 @@ namespace NewHorizons.Handlers // Set up stars // Need to manage this when there are multiple stars - var sun = GameObject.Find("Sun_Body"); + var sun = SearchUtilities.Find("Sun_Body"); var starController = sun.AddComponent(); - starController.Light = GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); - starController.AmbientLight = GameObject.Find("Sun_Body/AmbientLight_SUN").GetComponent(); - starController.FaceActiveCamera = GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); - starController.CSMTextureCacher = GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); - starController.ProxyShadowLight = GameObject.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); + starController.Light = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); + starController.AmbientLight = SearchUtilities.Find("Sun_Body/AmbientLight_SUN").GetComponent(); + starController.FaceActiveCamera = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); + starController.CSMTextureCacher = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); + starController.ProxyShadowLight = SearchUtilities.Find("Sun_Body/Sector_SUN/Effects_SUN/SunLight").GetComponent(); starController.Intensity = 0.9859f; starController.SunColor = new Color(1f, 0.8845f, 0.6677f, 1f); @@ -137,7 +137,7 @@ namespace NewHorizons.Handlers catch (Exception) { if (body?.Config?.name == null) Logger.LogError($"How is there no name for {body}"); - else existingPlanet = GameObject.Find(body.Config.name.Replace(" ", "") + "_Body"); + else existingPlanet = SearchUtilities.Find(body.Config.name.Replace(" ", "") + "_Body", false); } if (existingPlanet != null) @@ -252,7 +252,7 @@ namespace NewHorizons.Handlers { foreach (var child in body.Config.removeChildren) { - Main.Instance.ModHelper.Events.Unity.FireInNUpdates(() => GameObject.Find(go.name + "/" + child)?.SetActive(false), 2); + Main.Instance.ModHelper.Events.Unity.FireInNUpdates(() => SearchUtilities.Find(go.name + "/" + child)?.SetActive(false), 2); } } diff --git a/NewHorizons/Handlers/PlanetDestructionHandler.cs b/NewHorizons/Handlers/PlanetDestructionHandler.cs index 6dead21b..82c0454a 100644 --- a/NewHorizons/Handlers/PlanetDestructionHandler.cs +++ b/NewHorizons/Handlers/PlanetDestructionHandler.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.Utility; using OWML.Utils; using System; @@ -33,7 +33,7 @@ namespace NewHorizons.Handlers public static void RemoveSolarSystem() { // Stop the sun from killing the player - var sunVolumes = GameObject.Find("Sun_Body/Sector_SUN/Volumes_SUN"); + var sunVolumes = SearchUtilities.Find("Sun_Body/Sector_SUN/Volumes_SUN"); sunVolumes.SetActive(false); foreach (var name in _solarSystemBodies) @@ -82,11 +82,11 @@ namespace NewHorizons.Handlers break; case AstroObject.Name.CaveTwin: case AstroObject.Name.TowerTwin: - DisableBody(GameObject.Find("FocalBody"), delete); - DisableBody(GameObject.Find("SandFunnel_Body"), delete); + DisableBody(SearchUtilities.Find("FocalBody"), delete); + DisableBody(SearchUtilities.Find("SandFunnel_Body"), delete); break; case AstroObject.Name.MapSatellite: - DisableBody(GameObject.Find("MapSatellite_Body"), delete); + DisableBody(SearchUtilities.Find("MapSatellite_Body"), delete); break; case AstroObject.Name.GiantsDeep: // Might prevent leftover jellyfish from existing @@ -100,7 +100,7 @@ namespace NewHorizons.Handlers break; case AstroObject.Name.TimberHearth: // Always just fucking kill this one to stop THE WARP BUG!!! - DisableBody(GameObject.Find("StreamingGroup_TH"), true); + DisableBody(SearchUtilities.Find("StreamingGroup_TH"), true); foreach (var obj in GameObject.FindObjectsOfType()) { @@ -229,8 +229,8 @@ namespace NewHorizons.Handlers { if (name.Equals("TowerTwin")) name = "AshTwin"; if (name.Equals("CaveTwin")) name = "EmberTwin"; - var distantProxy = GameObject.Find(name + "_DistantProxy"); - var distantProxyClone = GameObject.Find(name + "_DistantProxy(Clone)"); + var distantProxy = SearchUtilities.Find(name + "_DistantProxy", false); + var distantProxyClone = SearchUtilities.Find(name + "_DistantProxy(Clone)", false); if (distantProxy != null) GameObject.Destroy(distantProxy.gameObject); if (distantProxyClone != null) GameObject.Destroy(distantProxyClone.gameObject); diff --git a/NewHorizons/Handlers/ShipLogHandler.cs b/NewHorizons/Handlers/ShipLogHandler.cs index 2ef80633..0d5faaf5 100644 --- a/NewHorizons/Handlers/ShipLogHandler.cs +++ b/NewHorizons/Handlers/ShipLogHandler.cs @@ -1,4 +1,4 @@ -using NewHorizons.Utility; +using NewHorizons.Utility; using System.Collections.Generic; using System.Linq; using UnityEngine; @@ -26,7 +26,7 @@ namespace NewHorizons.Handlers _entryIDsToNHBody = new Dictionary(); _nhBodyToAstroIDs = new Dictionary(); - List gameObjects = SearchUtilities.GetAllChildren(GameObject.Find(PAN_ROOT_PATH)); + List gameObjects = SearchUtilities.GetAllChildren(SearchUtilities.Find(PAN_ROOT_PATH)); _vanillaBodies = gameObjects.ConvertAll(g => g.name).ToArray(); _vanillaBodyIDs = gameObjects.ConvertAll(g => g.GetComponent()?.GetID()).ToArray(); } diff --git a/NewHorizons/Handlers/StarChartHandler.cs b/NewHorizons/Handlers/StarChartHandler.cs index e22406d3..4b1844e6 100644 --- a/NewHorizons/Handlers/StarChartHandler.cs +++ b/NewHorizons/Handlers/StarChartHandler.cs @@ -1,4 +1,4 @@ -using NewHorizons.Components; +using NewHorizons.Components; using NewHorizons.Utility; using System.Collections.Generic; using UnityEngine; @@ -18,7 +18,7 @@ namespace NewHorizons.Handlers { _systems = systems; - var shipLogRoot = GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas"); + var shipLogRoot = SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas"); var starChartLog = new GameObject("StarChartMode"); starChartLog.SetActive(false); @@ -29,7 +29,7 @@ namespace NewHorizons.Handlers ShipLogStarChartMode = starChartLog.AddComponent(); - var reticleImage = GameObject.Instantiate(GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/DetectiveMode/ReticleImage (1)/"), starChartLog.transform); + var reticleImage = GameObject.Instantiate(SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/DetectiveMode/ReticleImage (1)/"), starChartLog.transform); var scaleRoot = new GameObject("ScaleRoot"); scaleRoot.transform.parent = starChartLog.transform; @@ -45,7 +45,7 @@ namespace NewHorizons.Handlers var centerPromptList = shipLogRoot.transform.Find("ScreenPromptListScaleRoot/ScreenPromptList_Center")?.GetComponent(); var upperRightPromptList = shipLogRoot.transform.Find("ScreenPromptListScaleRoot/ScreenPromptList_UpperRight")?.GetComponent(); - var oneShotSource = GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/OneShotAudio_ShipLog")?.GetComponent(); + var oneShotSource = SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/OneShotAudio_ShipLog")?.GetComponent(); _starSystemToFactID = new Dictionary(); _factIDToStarSystem = new Dictionary(); diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs index fa020c5d..473cb372 100644 --- a/NewHorizons/Handlers/SystemCreationHandler.cs +++ b/NewHorizons/Handlers/SystemCreationHandler.cs @@ -1,4 +1,4 @@ -using NewHorizons.Builder.StarSystem; +using NewHorizons.Builder.StarSystem; using NewHorizons.Components; using NewHorizons.Utility; using UnityEngine; @@ -9,7 +9,7 @@ namespace NewHorizons.Handlers { public static void LoadSystem(NewHorizonsSystem system) { - var skybox = GameObject.Find("Skybox/Starfield"); + var skybox = SearchUtilities.Find("Skybox/Starfield"); if (system.Config.skybox?.destroyStarField ?? false) { diff --git a/NewHorizons/Handlers/TitleSceneHandler.cs b/NewHorizons/Handlers/TitleSceneHandler.cs index 6baf33ea..ebbb4043 100644 --- a/NewHorizons/Handlers/TitleSceneHandler.cs +++ b/NewHorizons/Handlers/TitleSceneHandler.cs @@ -13,7 +13,7 @@ namespace NewHorizons.Handlers { public static void InitSubtitles() { - GameObject subtitleContainer = GameObject.Find("TitleMenu/TitleCanvas/TitleLayoutGroup/Logo_EchoesOfTheEye"); + GameObject subtitleContainer = SearchUtilities.Find("TitleMenu/TitleCanvas/TitleLayoutGroup/Logo_EchoesOfTheEye"); if (subtitleContainer == null) { @@ -60,11 +60,11 @@ namespace NewHorizons.Handlers body3.transform.localRotation = Quaternion.Euler(10f, 0f, 0f); } - GameObject.Find("Scene/Background/PlanetPivot/Prefab_HEA_Campfire").SetActive(false); - GameObject.Find("Scene/Background/PlanetPivot/PlanetRoot").SetActive(false); + SearchUtilities.Find("Scene/Background/PlanetPivot/Prefab_HEA_Campfire").SetActive(false); + SearchUtilities.Find("Scene/Background/PlanetPivot/PlanetRoot").SetActive(false); var lightGO = new GameObject("Light"); - lightGO.transform.parent = GameObject.Find("Scene/Background").transform; + lightGO.transform.parent = SearchUtilities.Find("Scene/Background").transform; lightGO.transform.localPosition = new Vector3(-47.9203f, 145.7596f, 43.1802f); var light = lightGO.AddComponent(); light.color = new Color(1f, 1f, 1f, 1f); @@ -98,7 +98,7 @@ namespace NewHorizons.Handlers HeightMapBuilder.Make(titleScreenGO, null, heightMap, body.Mod); - GameObject pivot = GameObject.Instantiate(GameObject.Find("Scene/Background/PlanetPivot"), GameObject.Find("Scene/Background").transform); + GameObject pivot = GameObject.Instantiate(SearchUtilities.Find("Scene/Background/PlanetPivot"), SearchUtilities.Find("Scene/Background").transform); pivot.GetComponent()._degreesPerSecond = 10f; foreach (Transform child in pivot.transform) { diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 0a965afc..d4bcc7fc 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -189,7 +189,7 @@ namespace NewHorizons } launchController.enabled = false; } - var nomaiProbe = GameObject.Find("NomaiProbe_Body"); + var nomaiProbe = SearchUtilities.Find("NomaiProbe_Body"); if (nomaiProbe != null) nomaiProbe.gameObject.SetActive(false); } @@ -220,7 +220,7 @@ namespace NewHorizons if (_ship != null) { - _ship = GameObject.Find("Ship_Body").InstantiateInactive(); + _ship = SearchUtilities.Find("Ship_Body").InstantiateInactive(); DontDestroyOnLoad(_ship); } @@ -237,7 +237,7 @@ namespace NewHorizons // Warp drive StarChartHandler.Init(SystemDict.Values.ToArray()); HasWarpDrive = StarChartHandler.CanWarp(); - _shipWarpController = GameObject.Find("Ship_Body").AddComponent(); + _shipWarpController = SearchUtilities.Find("Ship_Body").AddComponent(); _shipWarpController.Init(); if (HasWarpDrive == true) EnableWarpDrive(); @@ -250,7 +250,7 @@ namespace NewHorizons if (map != null) map._maxPanDistance = FurthestOrbit * 1.5f; // Fix the map satellite - GameObject.Find("HearthianMapSatellite_Body").AddComponent(); + SearchUtilities.Find("HearthianMapSatellite_Body", false).AddComponent(); } else { diff --git a/NewHorizons/Patches/ShipLogPatches.cs b/NewHorizons/Patches/ShipLogPatches.cs index acc1c021..672660c8 100644 --- a/NewHorizons/Patches/ShipLogPatches.cs +++ b/NewHorizons/Patches/ShipLogPatches.cs @@ -1,4 +1,4 @@ -using HarmonyLib; +using HarmonyLib; using NewHorizons.Builder.ShipLog; using NewHorizons.Components; using NewHorizons.Handlers; @@ -135,8 +135,8 @@ namespace NewHorizons.Patches [HarmonyPatch(typeof(ShipLogMapMode), nameof(ShipLogMapMode.Initialize))] public static void ShipLogMapMode_Initialize(ShipLogMapMode __instance) { - GameObject panRoot = GameObject.Find(ShipLogHandler.PAN_ROOT_PATH); - GameObject sunObject = GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/Sun"); + GameObject panRoot = SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH); + GameObject sunObject = SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/Sun"); ShipLogAstroObject[][] navMatrix = MapModeBuilder.ConstructMapMode(Main.Instance.CurrentStarSystem, panRoot, __instance._astroObjects, sunObject.layer); if (navMatrix == null || navMatrix.Length <= 1) { @@ -151,9 +151,9 @@ namespace NewHorizons.Patches List delete = SearchUtilities.GetAllChildren(panRoot).Where(g => g.name.Contains("_ShipLog") == false).ToList(); foreach (GameObject gameObject in delete) { - Object.Destroy(GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + gameObject.name)); + Object.Destroy(SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + gameObject.name)); } - if (GameObject.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel") == null) + if (SearchUtilities.Find(ShipLogHandler.PAN_ROOT_PATH + "/" + "SandFunnel") == null) { __instance._sandFunnel = __instance.gameObject.AddComponent(); } diff --git a/NewHorizons/Patches/WarpDrivePatches.cs b/NewHorizons/Patches/WarpDrivePatches.cs index ff5aec3a..3995e002 100644 --- a/NewHorizons/Patches/WarpDrivePatches.cs +++ b/NewHorizons/Patches/WarpDrivePatches.cs @@ -1,5 +1,6 @@ -using HarmonyLib; +using HarmonyLib; using NewHorizons.Handlers; +using NewHorizons.Utility; using UnityEngine; namespace NewHorizons.Patches { @@ -14,7 +15,7 @@ namespace NewHorizons.Patches var newPrompt = TranslationHandler.GetTranslation("INTERSTELLAR_MODE", TranslationHandler.TextType.UI); __instance._detectiveModePrompt.SetText(newPrompt); - var text = GameObject.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/ScreenPromptListScaleRoot/ScreenPromptList_UpperRight/ScreenPrompt/Text").GetComponent(); + var text = SearchUtilities.Find("Ship_Body/Module_Cabin/Systems_Cabin/ShipLogPivot/ShipLog/ShipLogPivot/ShipLogCanvas/ScreenPromptListScaleRoot/ScreenPromptList_UpperRight/ScreenPrompt/Text").GetComponent(); text.text = newPrompt; } diff --git a/NewHorizons/Utility/AstroObjectLocator.cs b/NewHorizons/Utility/AstroObjectLocator.cs index 428e0f4b..40cb3ddc 100644 --- a/NewHorizons/Utility/AstroObjectLocator.cs +++ b/NewHorizons/Utility/AstroObjectLocator.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using UnityEngine; namespace NewHorizons.Utility @@ -97,35 +97,35 @@ namespace NewHorizons.Utility switch (primary._name) { case AstroObject.Name.TowerTwin: - otherChildren.Add(GameObject.Find("TimeLoopRing_Body")); + otherChildren.Add(SearchUtilities.Find("TimeLoopRing_Body")); break; case AstroObject.Name.ProbeCannon: - otherChildren.Add(GameObject.Find("NomaiProbe_Body")); - otherChildren.Add(GameObject.Find("CannonMuzzle_Body")); - otherChildren.Add(GameObject.Find("FakeCannonMuzzle_Body (1)")); - otherChildren.Add(GameObject.Find("CannonBarrel_Body")); - otherChildren.Add(GameObject.Find("FakeCannonBarrel_Body (1)")); - otherChildren.Add(GameObject.Find("Debris_Body (1)")); + otherChildren.Add(SearchUtilities.Find("NomaiProbe_Body")); + otherChildren.Add(SearchUtilities.Find("CannonMuzzle_Body")); + otherChildren.Add(SearchUtilities.Find("FakeCannonMuzzle_Body (1)")); + otherChildren.Add(SearchUtilities.Find("CannonBarrel_Body")); + otherChildren.Add(SearchUtilities.Find("FakeCannonBarrel_Body (1)")); + otherChildren.Add(SearchUtilities.Find("Debris_Body (1)")); break; case AstroObject.Name.GiantsDeep: - otherChildren.Add(GameObject.Find("BrambleIsland_Body")); - otherChildren.Add(GameObject.Find("GabbroIsland_Body")); - otherChildren.Add(GameObject.Find("QuantumIsland_Body")); - otherChildren.Add(GameObject.Find("StatueIsland_Body")); - otherChildren.Add(GameObject.Find("ConstructionYardIsland_Body")); - otherChildren.Add(GameObject.Find("GabbroShip_Body")); + otherChildren.Add(SearchUtilities.Find("BrambleIsland_Body")); + otherChildren.Add(SearchUtilities.Find("GabbroIsland_Body")); + otherChildren.Add(SearchUtilities.Find("QuantumIsland_Body")); + otherChildren.Add(SearchUtilities.Find("StatueIsland_Body")); + otherChildren.Add(SearchUtilities.Find("ConstructionYardIsland_Body")); + otherChildren.Add(SearchUtilities.Find("GabbroShip_Body")); break; case AstroObject.Name.WhiteHole: - otherChildren.Add(GameObject.Find("WhiteholeStation_Body")); - otherChildren.Add(GameObject.Find("WhiteholeStationSuperstructure_Body")); + otherChildren.Add(SearchUtilities.Find("WhiteholeStation_Body")); + otherChildren.Add(SearchUtilities.Find("WhiteholeStationSuperstructure_Body")); break; case AstroObject.Name.TimberHearth: - otherChildren.Add(GameObject.Find("MiningRig_Body")); - otherChildren.Add(GameObject.Find("Ship_Body")); + otherChildren.Add(SearchUtilities.Find("MiningRig_Body")); + otherChildren.Add(SearchUtilities.Find("Ship_Body")); break; case AstroObject.Name.DreamWorld: - otherChildren.Add(GameObject.Find("BackRaft_Body")); - otherChildren.Add(GameObject.Find("SealRaft_Body")); + otherChildren.Add(SearchUtilities.Find("BackRaft_Body")); + otherChildren.Add(SearchUtilities.Find("SealRaft_Body")); break; // For some dumb reason the sun station doesn't use AstroObject.Name.SunStation case AstroObject.Name.CustomString: diff --git a/NewHorizons/Utility/DebugUtilities/DebugReload.cs b/NewHorizons/Utility/DebugUtilities/DebugReload.cs index 8e763eab..ac48c7ad 100644 --- a/NewHorizons/Utility/DebugUtilities/DebugReload.cs +++ b/NewHorizons/Utility/DebugUtilities/DebugReload.cs @@ -1,4 +1,4 @@ -using NewHorizons.Handlers; +using NewHorizons.Handlers; using OWML.Common; using OWML.Common.Menus; using System; @@ -45,7 +45,7 @@ namespace NewHorizons.Utility.DebugUtilities Logger.LogWarning("Error While Reloading"); } - GameObject.Find("/PauseMenu/PauseMenuManagers").GetComponent().OnSkipToNextTimeLoop(); + SearchUtilities.Find("/PauseMenu/PauseMenuManagers").GetComponent().OnSkipToNextTimeLoop(); Main.Instance.ChangeCurrentStarSystem(Main.Instance.CurrentStarSystem); diff --git a/NewHorizons/Utility/SearchUtilities.cs b/NewHorizons/Utility/SearchUtilities.cs index 46a5ca16..af140b5d 100644 --- a/NewHorizons/Utility/SearchUtilities.cs +++ b/NewHorizons/Utility/SearchUtilities.cs @@ -129,7 +129,7 @@ namespace NewHorizons.Utility return null; } - public static GameObject Find(string path) + public static GameObject Find(string path, bool warn = true) { if (CachedGameObjects.ContainsKey(path)) { @@ -150,7 +150,7 @@ namespace NewHorizons.Utility var t = root?.transform; if (t == null) { - Logger.LogWarning($"Couldn't find root object in path ({names[0]})"); + if (warn) Logger.LogWarning($"Couldn't find root object in path ({names[0]})"); } else { @@ -172,7 +172,7 @@ namespace NewHorizons.Utility if (child == null) { - Logger.LogWarning($"Couldn't find object in path ({names[i]})"); + if (warn) Logger.LogWarning($"Couldn't find object in path ({names[i]})"); t = null; break; } @@ -187,7 +187,7 @@ namespace NewHorizons.Utility if (go == null) { var name = names.Last(); - Logger.LogWarning($"Couldn't find object {path}, will look for potential matches for name {name}"); + if (warn) Logger.LogWarning($"Couldn't find object {path}, will look for potential matches for name {name}"); go = FindObjectOfTypeAndName(name); }