From 9d2d8a4bc38bed68494063f9ea03759e9196b896 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 21 Mar 2023 17:25:36 -0700 Subject: [PATCH 1/6] fix namespaces --- NewHorizons/Builder/Props/PropBuildManager.cs | 1 + NewHorizons/Builder/Props/RemoteBuilder.cs | 1 + .../Builder/Props/TranslatorText/NomaiTextArcArranger.cs | 2 +- .../Builder/Props/TranslatorText/NomaiTextArcBuilder.cs | 3 +-- .../Builder/Props/TranslatorText/TranslatorTextBuilder.cs | 2 +- .../Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs | 2 +- NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs | 2 +- NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs | 2 +- .../Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs | 2 +- .../Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs | 2 +- NewHorizons/Builder/Volumes/VolumesBuildManager.cs | 2 ++ NewHorizons/Components/EyeAstroObject.cs | 4 +--- NewHorizons/Main.cs | 1 + NewHorizons/UsedInUnityProjectAttribute.cs | 2 ++ 14 files changed, 16 insertions(+), 12 deletions(-) diff --git a/NewHorizons/Builder/Props/PropBuildManager.cs b/NewHorizons/Builder/Props/PropBuildManager.cs index 4758e43a..3b96432f 100644 --- a/NewHorizons/Builder/Props/PropBuildManager.cs +++ b/NewHorizons/Builder/Props/PropBuildManager.cs @@ -1,4 +1,5 @@ using NewHorizons.Builder.Body; +using NewHorizons.Builder.Props.TranslatorText; using NewHorizons.Builder.ShipLog; using NewHorizons.External.Configs; using NewHorizons.Utility; diff --git a/NewHorizons/Builder/Props/RemoteBuilder.cs b/NewHorizons/Builder/Props/RemoteBuilder.cs index b62e1f75..b9e5be41 100644 --- a/NewHorizons/Builder/Props/RemoteBuilder.cs +++ b/NewHorizons/Builder/Props/RemoteBuilder.cs @@ -1,3 +1,4 @@ +using NewHorizons.Builder.Props.TranslatorText; using NewHorizons.External.Modules; using NewHorizons.Handlers; using NewHorizons.Utility; diff --git a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs index b94f3e6d..17e44ce1 100644 --- a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs +++ b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcArranger.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEngine; using Logger = NewHorizons.Utility.Logger; -namespace NewHorizons.Builder.Props +namespace NewHorizons.Builder.Props.TranslatorText { public class NomaiTextArcArranger : MonoBehaviour { diff --git a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcBuilder.cs index cb7343fa..e8f5e8ec 100644 --- a/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcBuilder.cs +++ b/NewHorizons/Builder/Props/TranslatorText/NomaiTextArcBuilder.cs @@ -1,9 +1,8 @@ -using System.Collections; using System.Collections.Generic; using System.Linq; using UnityEngine; -namespace NewHorizons.Builder.Props +namespace NewHorizons.Builder.Props.TranslatorText { public static class NomaiTextArcBuilder { // TODO: stranger arcs diff --git a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs index 8b36a0a8..4cf69104 100644 --- a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs +++ b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs @@ -14,7 +14,7 @@ using UnityEngine; using Logger = NewHorizons.Utility.Logger; using Random = UnityEngine.Random; -namespace NewHorizons.Builder.Props +namespace NewHorizons.Builder.Props.TranslatorText { public static class TranslatorTextBuilder { diff --git a/NewHorizons/Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs b/NewHorizons/Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs index 9ef330de..b914ba3b 100644 --- a/NewHorizons/Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs +++ b/NewHorizons/Builder/Volumes/Rulesets/PlayerImpactRulesetBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External.Modules; using UnityEngine; -namespace NewHorizons.Builder.Volumes +namespace NewHorizons.Builder.Volumes.Rulesets { public static class PlayerImpactRulesetBuilder { diff --git a/NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs b/NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs index b8293d94..ae9a70ec 100644 --- a/NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs +++ b/NewHorizons/Builder/Volumes/Rulesets/ProbeRulesetBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External.Modules; using UnityEngine; -namespace NewHorizons.Builder.Volumes +namespace NewHorizons.Builder.Volumes.Rulesets { public static class ProbeRulesetBuilder { diff --git a/NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs b/NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs index 8541f516..a2ce52d6 100644 --- a/NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs +++ b/NewHorizons/Builder/Volumes/Rulesets/ThrustRulesetBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External.Modules; using UnityEngine; -namespace NewHorizons.Builder.Volumes +namespace NewHorizons.Builder.Volumes.Rulesets { public static class ThrustRulesetBuilder { diff --git a/NewHorizons/Builder/Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs b/NewHorizons/Builder/Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs index 139e09f9..b96dadfd 100644 --- a/NewHorizons/Builder/Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/VisorEffects/VisorFrostEffectVolumeBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External.Modules; using UnityEngine; -namespace NewHorizons.Builder.Volumes +namespace NewHorizons.Builder.Volumes.VisorEffects { public static class VisorFrostEffectVolumeBuilder { diff --git a/NewHorizons/Builder/Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs b/NewHorizons/Builder/Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs index bf268c8e..a0de16da 100644 --- a/NewHorizons/Builder/Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/VisorEffects/VisorRainEffectVolumeBuilder.cs @@ -1,7 +1,7 @@ using NewHorizons.External.Modules; using UnityEngine; -namespace NewHorizons.Builder.Volumes +namespace NewHorizons.Builder.Volumes.VisorEffects { public static class VisorRainEffectVolumeBuilder { diff --git a/NewHorizons/Builder/Volumes/VolumesBuildManager.cs b/NewHorizons/Builder/Volumes/VolumesBuildManager.cs index cd1f474a..9c4357b2 100644 --- a/NewHorizons/Builder/Volumes/VolumesBuildManager.cs +++ b/NewHorizons/Builder/Volumes/VolumesBuildManager.cs @@ -1,6 +1,8 @@ using NewHorizons.Builder.Body; using NewHorizons.Builder.ShipLog; using NewHorizons.Builder.Volumes; +using NewHorizons.Builder.Volumes.Rulesets; +using NewHorizons.Builder.Volumes.VisorEffects; using NewHorizons.Components.Volumes; using NewHorizons.External.Configs; using OWML.Common; diff --git a/NewHorizons/Components/EyeAstroObject.cs b/NewHorizons/Components/EyeAstroObject.cs index 6b78ddb4..799617bc 100644 --- a/NewHorizons/Components/EyeAstroObject.cs +++ b/NewHorizons/Components/EyeAstroObject.cs @@ -1,6 +1,4 @@ -using NewHorizons.Utility; - -namespace NewHorizons.Components.Orbital +namespace NewHorizons.Components { public class EyeAstroObject : AstroObject { diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs index 390072a7..15d99c28 100644 --- a/NewHorizons/Main.cs +++ b/NewHorizons/Main.cs @@ -3,6 +3,7 @@ using NewHorizons.Builder.Atmosphere; using NewHorizons.Builder.Body; using NewHorizons.Builder.General; using NewHorizons.Builder.Props; +using NewHorizons.Builder.Props.TranslatorText; using NewHorizons.Components; using NewHorizons.Components.Fixers; using NewHorizons.Components.SizeControllers; diff --git a/NewHorizons/UsedInUnityProjectAttribute.cs b/NewHorizons/UsedInUnityProjectAttribute.cs index 057b3388..26a19e7d 100644 --- a/NewHorizons/UsedInUnityProjectAttribute.cs +++ b/NewHorizons/UsedInUnityProjectAttribute.cs @@ -1,5 +1,7 @@ using System; +namespace NewHorizons; + /// /// denotes that the given type is used in the unity project /// and therefore caution should be used when moving/renaming/deleting From 0cfe62dda5e058726d4ded5732a1a1e5fa49c31f Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 21 Mar 2023 17:27:07 -0700 Subject: [PATCH 2/6] rename LayerUtilities to Layer --- NewHorizons/Builder/Atmosphere/AirBuilder.cs | 2 +- NewHorizons/Builder/Atmosphere/CloudsBuilder.cs | 6 +++--- NewHorizons/Builder/Body/RingBuilder.cs | 2 +- NewHorizons/Builder/Body/SingularityBuilder.cs | 2 +- NewHorizons/Builder/Body/StarBuilder.cs | 8 ++++---- NewHorizons/Builder/Body/WaterBuilder.cs | 4 ++-- NewHorizons/Builder/General/DetectorBuilder.cs | 4 ++-- NewHorizons/Builder/General/GravityBuilder.cs | 2 +- NewHorizons/Builder/General/RFVolumeBuilder.cs | 2 +- NewHorizons/Builder/General/SpawnPointBuilder.cs | 6 +++--- NewHorizons/Builder/Props/DialogueBuilder.cs | 4 ++-- NewHorizons/Builder/Props/RemoteBuilder.cs | 2 +- NewHorizons/Builder/Props/SignalBuilder.cs | 2 +- NewHorizons/Builder/ShipLog/RevealBuilder.cs | 2 +- NewHorizons/Builder/StarSystem/SkyboxBuilder.cs | 4 ++-- NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs | 2 +- NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs | 4 ++-- NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs | 2 +- NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs | 2 +- NewHorizons/Builder/Volumes/VolumeBuilder.cs | 2 +- .../Components/Achievement/AchievementObserveTrigger.cs | 2 +- NewHorizons/Components/AddPhysics.cs | 2 +- .../Utility/OWUtilities/{LayerUtilities.cs => Layer.cs} | 2 +- 23 files changed, 35 insertions(+), 35 deletions(-) rename NewHorizons/Utility/OWUtilities/{LayerUtilities.cs => Layer.cs} (98%) diff --git a/NewHorizons/Builder/Atmosphere/AirBuilder.cs b/NewHorizons/Builder/Atmosphere/AirBuilder.cs index f71d4937..b7a3bd3e 100644 --- a/NewHorizons/Builder/Atmosphere/AirBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/AirBuilder.cs @@ -9,7 +9,7 @@ namespace NewHorizons.Builder.Atmosphere { var airGO = new GameObject("Air"); airGO.SetActive(false); - airGO.layer = LayerUtilities.BasicEffectVolume; + airGO.layer = Layer.BasicEffectVolume; airGO.transform.parent = sector?.transform ?? planetGO.transform; var sc = airGO.AddComponent(); diff --git a/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs b/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs index 087b0ff7..d7dde4c8 100644 --- a/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs +++ b/NewHorizons/Builder/Atmosphere/CloudsBuilder.cs @@ -119,7 +119,7 @@ namespace NewHorizons.Builder.Atmosphere GameObject cloudsFluidGO = new GameObject("CloudsFluid"); cloudsFluidGO.SetActive(false); - cloudsFluidGO.layer = LayerUtilities.BasicEffectVolume; + cloudsFluidGO.layer = Layer.BasicEffectVolume; cloudsFluidGO.transform.parent = cloudsMainGO.transform; SphereCollider fluidSC = cloudsFluidGO.AddComponent(); @@ -252,7 +252,7 @@ namespace NewHorizons.Builder.Atmosphere if (atmo.clouds.unlit) { - cloudsTopGO.layer = LayerUtilities.IgnoreSun; + cloudsTopGO.layer = Layer.IgnoreSun; } if (atmo.clouds.rotationSpeed != 0f) @@ -304,7 +304,7 @@ namespace NewHorizons.Builder.Atmosphere { GameObject tcrqcGO = new GameObject("TransparentCloudRenderQueueController"); tcrqcGO.transform.SetParent(cloudsTransparentGO.transform, false); - tcrqcGO.layer = LayerUtilities.BasicEffectVolume; + tcrqcGO.layer = Layer.BasicEffectVolume; var shape = tcrqcGO.AddComponent(); shape.radius = 1; diff --git a/NewHorizons/Builder/Body/RingBuilder.cs b/NewHorizons/Builder/Body/RingBuilder.cs index c2adc5b2..581498ea 100644 --- a/NewHorizons/Builder/Body/RingBuilder.cs +++ b/NewHorizons/Builder/Body/RingBuilder.cs @@ -31,7 +31,7 @@ namespace NewHorizons.Builder.Body ringVolume.transform.localPosition = Vector3.zero; ringVolume.transform.localScale = Vector3.one; ringVolume.transform.localRotation = Quaternion.identity; - ringVolume.layer = LayerUtilities.BasicEffectVolume; + ringVolume.layer = Layer.BasicEffectVolume; var ringShape = ringVolume.AddComponent(); ringShape.innerRadius = ring.innerRadius; diff --git a/NewHorizons/Builder/Body/SingularityBuilder.cs b/NewHorizons/Builder/Body/SingularityBuilder.cs index 59cf5d57..8f84e77f 100644 --- a/NewHorizons/Builder/Body/SingularityBuilder.cs +++ b/NewHorizons/Builder/Body/SingularityBuilder.cs @@ -183,7 +183,7 @@ namespace NewHorizons.Builder.Body if (hasDestructionVolume || targetStarSystem != null) { var destructionVolumeGO = new GameObject("DestructionVolume"); - destructionVolumeGO.layer = LayerUtilities.BasicEffectVolume; + destructionVolumeGO.layer = Layer.BasicEffectVolume; destructionVolumeGO.transform.parent = singularity.transform; destructionVolumeGO.transform.localScale = Vector3.one; destructionVolumeGO.transform.localPosition = Vector3.zero; diff --git a/NewHorizons/Builder/Body/StarBuilder.cs b/NewHorizons/Builder/Body/StarBuilder.cs index f9ee9ceb..70e09ad9 100644 --- a/NewHorizons/Builder/Body/StarBuilder.cs +++ b/NewHorizons/Builder/Body/StarBuilder.cs @@ -123,7 +123,7 @@ namespace NewHorizons.Builder.Body heatVolume.transform.SetParent(starGO.transform, false); heatVolume.transform.localPosition = Vector3.zero; heatVolume.transform.localScale = Vector3.one; - heatVolume.layer = LayerUtilities.BasicEffectVolume; + heatVolume.layer = Layer.BasicEffectVolume; heatVolume.AddComponent().radius = 1.1f; heatVolume.AddComponent(); heatVolume.AddComponent()._damagePerSecond = 20f; @@ -133,7 +133,7 @@ namespace NewHorizons.Builder.Body deathVolume.transform.SetParent(starGO.transform, false); deathVolume.transform.localPosition = Vector3.zero; deathVolume.transform.localScale = Vector3.one; - deathVolume.layer = LayerUtilities.BasicEffectVolume; + deathVolume.layer = Layer.BasicEffectVolume; var sphereCollider = deathVolume.AddComponent(); sphereCollider.radius = 1f; sphereCollider.isTrigger = true; @@ -149,7 +149,7 @@ namespace NewHorizons.Builder.Body planetDestructionVolume.transform.SetParent(starGO.transform, false); planetDestructionVolume.transform.localPosition = Vector3.zero; planetDestructionVolume.transform.localScale = Vector3.one; - planetDestructionVolume.layer = LayerUtilities.BasicEffectVolume; + planetDestructionVolume.layer = Layer.BasicEffectVolume; var planetSphereCollider = planetDestructionVolume.AddComponent(); planetSphereCollider.radius = 0.8f; planetSphereCollider.isTrigger = true; @@ -446,7 +446,7 @@ namespace NewHorizons.Builder.Body supernovaWallAudio.transform.SetParent(supernovaGO.transform, false); supernovaWallAudio.transform.localPosition = Vector3.zero; supernovaWallAudio.transform.localScale = Vector3.one; - supernovaWallAudio.layer = LayerUtilities.BasicEffectVolume; + supernovaWallAudio.layer = Layer.BasicEffectVolume; var audioSource = supernovaWallAudio.AddComponent(); audioSource.loop = true; audioSource.maxDistance = 2000; diff --git a/NewHorizons/Builder/Body/WaterBuilder.cs b/NewHorizons/Builder/Body/WaterBuilder.cs index e08669bc..452aa524 100644 --- a/NewHorizons/Builder/Body/WaterBuilder.cs +++ b/NewHorizons/Builder/Body/WaterBuilder.cs @@ -54,7 +54,7 @@ namespace NewHorizons.Builder.Body // Don't ignore sun when not under clouds waterGO.layer = 0; - Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = LayerUtilities.IgnoreSun; }); + Delay.FireOnNextUpdate(() => { if (planetGO.FindChild("Sector/SunOverride") != null) waterGO.layer = Layer.IgnoreSun; }); TessellatedSphereRenderer TSR = waterGO.AddComponent(); TSR.tessellationMeshGroup = ScriptableObject.CreateInstance(); @@ -101,7 +101,7 @@ namespace NewHorizons.Builder.Body var buoyancyObject = new GameObject("WaterVolume"); buoyancyObject.transform.parent = waterGO.transform; buoyancyObject.transform.localScale = Vector3.one; - buoyancyObject.layer = LayerUtilities.BasicEffectVolume; + buoyancyObject.layer = Layer.BasicEffectVolume; var sphereCollider = buoyancyObject.AddComponent(); sphereCollider.radius = 1; diff --git a/NewHorizons/Builder/General/DetectorBuilder.cs b/NewHorizons/Builder/General/DetectorBuilder.cs index d557c9cf..3610da32 100644 --- a/NewHorizons/Builder/General/DetectorBuilder.cs +++ b/NewHorizons/Builder/General/DetectorBuilder.cs @@ -82,7 +82,7 @@ namespace NewHorizons.Builder.General detectorGO.SetActive(false); detectorGO.transform.parent = planetGO.transform; detectorGO.transform.localPosition = Vector3.zero; - detectorGO.layer = LayerUtilities.BasicDetector; + detectorGO.layer = Layer.BasicDetector; ConstantForceDetector forceDetector = detectorGO.AddComponent(); forceDetector._inheritElement0 = true; @@ -91,7 +91,7 @@ namespace NewHorizons.Builder.General // For falling into sun if (!config.Base.invulnerableToSun && config.Star == null && config.FocalPoint == null) { - detectorGO.layer = LayerUtilities.AdvancedDetector; + detectorGO.layer = Layer.AdvancedDetector; var fluidDetector = detectorGO.AddComponent(); var sphereCollider = detectorGO.AddComponent(); diff --git a/NewHorizons/Builder/General/GravityBuilder.cs b/NewHorizons/Builder/General/GravityBuilder.cs index e90f02d7..21b729a8 100644 --- a/NewHorizons/Builder/General/GravityBuilder.cs +++ b/NewHorizons/Builder/General/GravityBuilder.cs @@ -24,7 +24,7 @@ namespace NewHorizons.Builder.General var gravityGO = new GameObject("GravityWell"); gravityGO.transform.parent = planetGO.transform; gravityGO.transform.localPosition = Vector3.zero; - gravityGO.layer = LayerUtilities.BasicEffectVolume; + gravityGO.layer = Layer.BasicEffectVolume; gravityGO.SetActive(false); var SC = gravityGO.AddComponent(); diff --git a/NewHorizons/Builder/General/RFVolumeBuilder.cs b/NewHorizons/Builder/General/RFVolumeBuilder.cs index e5dbc643..bb3d032b 100644 --- a/NewHorizons/Builder/General/RFVolumeBuilder.cs +++ b/NewHorizons/Builder/General/RFVolumeBuilder.cs @@ -13,7 +13,7 @@ namespace NewHorizons.Builder.General var rfGO = new GameObject("RFVolume"); rfGO.transform.parent = planetGO.transform; rfGO.transform.localPosition = Vector3.zero; - rfGO.layer = LayerUtilities.ReferenceFrameVolume; + rfGO.layer = Layer.ReferenceFrameVolume; rfGO.SetActive(false); var SC = rfGO.AddComponent(); diff --git a/NewHorizons/Builder/General/SpawnPointBuilder.cs b/NewHorizons/Builder/General/SpawnPointBuilder.cs index 82ac960e..e93b39e0 100644 --- a/NewHorizons/Builder/General/SpawnPointBuilder.cs +++ b/NewHorizons/Builder/General/SpawnPointBuilder.cs @@ -20,7 +20,7 @@ namespace NewHorizons.Builder.General if (!Main.Instance.IsWarpingFromVessel && !Main.Instance.IsWarpingFromShip && module.playerSpawn != null) { GameObject spawnGO = GeneralPropBuilder.MakeNew("PlayerSpawnPoint", planetGO, null, module.playerSpawn); - spawnGO.layer = LayerUtilities.PlayerSafetyCollider; + spawnGO.layer = Layer.PlayerSafetyCollider; playerSpawn = spawnGO.AddComponent(); playerSpawn._triggerVolumes = new OWTriggerVolume[0]; @@ -30,7 +30,7 @@ namespace NewHorizons.Builder.General if (module.shipSpawn != null) { GameObject spawnGO = GeneralPropBuilder.MakeNew("ShipSpawnPoint", planetGO, null, module.shipSpawn); - spawnGO.layer = LayerUtilities.PlayerSafetyCollider; + spawnGO.layer = Layer.PlayerSafetyCollider; var spawnPoint = spawnGO.AddComponent(); spawnPoint._isShipSpawn = true; @@ -55,7 +55,7 @@ namespace NewHorizons.Builder.General Logger.LogVerbose("Overriding player spawn to be inside ship"); GameObject playerSpawnGO = new GameObject("PlayerSpawnPoint"); playerSpawnGO.transform.parent = ship.transform; - playerSpawnGO.layer = LayerUtilities.PlayerSafetyCollider; + playerSpawnGO.layer = Layer.PlayerSafetyCollider; playerSpawnGO.transform.localPosition = new Vector3(0, 0, 0); diff --git a/NewHorizons/Builder/Props/DialogueBuilder.cs b/NewHorizons/Builder/Props/DialogueBuilder.cs index 7028acda..c76a02ac 100644 --- a/NewHorizons/Builder/Props/DialogueBuilder.cs +++ b/NewHorizons/Builder/Props/DialogueBuilder.cs @@ -74,7 +74,7 @@ namespace NewHorizons.Builder.Props { var conversationZone = GeneralPropBuilder.MakeNew("ConversationZone", planetGO, sector, info, defaultParentPath: info.pathToAnimController); - conversationZone.layer = LayerUtilities.Interactible; + conversationZone.layer = Layer.Interactible; var sphere = conversationZone.AddComponent(); sphere.radius = info.radius; @@ -215,7 +215,7 @@ namespace NewHorizons.Builder.Props var playerTrackingZone = new GameObject("PlayerTrackingZone"); playerTrackingZone.SetActive(false); - playerTrackingZone.layer = LayerUtilities.BasicEffectVolume; + playerTrackingZone.layer = Layer.BasicEffectVolume; playerTrackingZone.SetActive(false); var sphereCollider = playerTrackingZone.AddComponent(); diff --git a/NewHorizons/Builder/Props/RemoteBuilder.cs b/NewHorizons/Builder/Props/RemoteBuilder.cs index b9e5be41..4cd1e19d 100644 --- a/NewHorizons/Builder/Props/RemoteBuilder.cs +++ b/NewHorizons/Builder/Props/RemoteBuilder.cs @@ -88,7 +88,7 @@ namespace NewHorizons.Builder.Props if (_shareStonePrefab == null) { GameObject stone = new GameObject("ShareStoneFallback"); - stone.layer = LayerUtilities.Interactible; + stone.layer = Layer.Interactible; stone.SetActive(false); SphereCollider sc = stone.AddComponent(); sc.center = Vector3.zero; diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 8a7edc3c..1ffe5254 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -112,7 +112,7 @@ namespace NewHorizons.Builder.Props public static GameObject Make(GameObject planetGO, Sector sector, SignalModule.SignalInfo info, IModBehaviour mod) { var signalGO = GeneralPropBuilder.MakeNew($"Signal_{info.name}", planetGO, sector, info); - signalGO.layer = LayerUtilities.AdvancedEffectVolume; + signalGO.layer = Layer.AdvancedEffectVolume; var source = signalGO.AddComponent(); var owAudioSource = signalGO.AddComponent(); diff --git a/NewHorizons/Builder/ShipLog/RevealBuilder.cs b/NewHorizons/Builder/ShipLog/RevealBuilder.cs index e7758183..1e2d5a8b 100644 --- a/NewHorizons/Builder/ShipLog/RevealBuilder.cs +++ b/NewHorizons/Builder/ShipLog/RevealBuilder.cs @@ -93,7 +93,7 @@ namespace NewHorizons.Builder.ShipLog private static void MakeObservable(GameObject go, Sector sector, VolumesModule.RevealVolumeInfo info, IModBehaviour mod) { - go.layer = LayerUtilities.Interactible; + go.layer = Layer.Interactible; var sphere = go.AddComponent(); sphere.radius = info.radius; diff --git a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs index aa6231b7..c92b6520 100644 --- a/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs +++ b/NewHorizons/Builder/StarSystem/SkyboxBuilder.cs @@ -33,7 +33,7 @@ namespace NewHorizons.Builder.StarSystem var skySphere = new GameObject("Sky Sphere"); skySphere.transform.SetParent(skybox.transform, false); - skySphere.layer = LayerUtilities.Skybox; + skySphere.layer = Layer.Skybox; skySphere.transform.localScale = Vector3.one * 5f; BuildSkySphereFace(skySphere, "Right", Quaternion.Euler(0f, 90f, 0f), mesh, rightTex); @@ -56,7 +56,7 @@ namespace NewHorizons.Builder.StarSystem var go = new GameObject(name) { - layer = LayerUtilities.Skybox + layer = Layer.Skybox }; var mf = go.AddComponent(); diff --git a/NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs b/NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs index 477d9323..3e2b723b 100644 --- a/NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/AudioVolumeBuilder.cs @@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes public static AudioVolume Make(GameObject planetGO, Sector sector, VolumesModule.AudioVolumeInfo info, IModBehaviour mod) { var go = GeneralPropBuilder.MakeNew("AudioVolume", planetGO, sector, info); - go.layer = LayerUtilities.AdvancedEffectVolume; + go.layer = Layer.AdvancedEffectVolume; var audioSource = go.AddComponent(); diff --git a/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs b/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs index a6dfae3b..5c64bb0a 100644 --- a/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/HazardVolumeBuilder.cs @@ -16,7 +16,7 @@ namespace NewHorizons.Builder.Volumes public static HazardVolume Make(GameObject planetGO, Sector sector, OWRigidbody owrb, VolumesModule.HazardVolumeInfo info, IModBehaviour mod) { var go = GeneralPropBuilder.MakeNew("HazardVolume", planetGO, sector, info); - go.layer = LayerUtilities.BasicEffectVolume; + go.layer = Layer.BasicEffectVolume; var shape = go.AddComponent(); shape.radius = info.radius; @@ -51,7 +51,7 @@ namespace NewHorizons.Builder.Volumes var detectorGO = new GameObject("ConstantFluidDetector"); detectorGO.transform.parent = go.transform; detectorGO.transform.localPosition = Vector3.zero; - detectorGO.layer = LayerUtilities.BasicDetector; + detectorGO.layer = Layer.BasicDetector; var detector = detectorGO.AddComponent(); detector._onlyDetectableFluid = water; detector._buoyancy.boundingRadius = 1; diff --git a/NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs b/NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs index d2f1a6c8..c02f2967 100644 --- a/NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/NotificationVolumeBuilder.cs @@ -19,7 +19,7 @@ namespace NewHorizons.Builder.Volumes public static NHNotificationVolume Make(GameObject planetGO, Sector sector, VolumesModule.NotificationVolumeInfo info, IModBehaviour mod) { var go = GeneralPropBuilder.MakeNew("NotificationVolume", planetGO, sector, info); - go.layer = LayerUtilities.BasicEffectVolume; + go.layer = Layer.BasicEffectVolume; var shape = go.AddComponent(); shape.radius = info.radius; diff --git a/NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs b/NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs index ad0d9cf4..fbb5c8c0 100644 --- a/NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/VanishVolumeBuilder.cs @@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes public static TVolume Make(GameObject planetGO, Sector sector, VolumesModule.VanishVolumeInfo info) where TVolume : VanishVolume { var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info); - go.layer = LayerUtilities.BasicEffectVolume; + go.layer = Layer.BasicEffectVolume; var collider = go.AddComponent(); collider.isTrigger = true; diff --git a/NewHorizons/Builder/Volumes/VolumeBuilder.cs b/NewHorizons/Builder/Volumes/VolumeBuilder.cs index 4ace754c..0a50d518 100644 --- a/NewHorizons/Builder/Volumes/VolumeBuilder.cs +++ b/NewHorizons/Builder/Volumes/VolumeBuilder.cs @@ -12,7 +12,7 @@ namespace NewHorizons.Builder.Volumes public static TVolume Make(GameObject planetGO, Sector sector, VolumesModule.VolumeInfo info) where TVolume : MonoBehaviour //Could be BaseVolume but I need to create vanilla volumes too. { var go = GeneralPropBuilder.MakeNew(typeof(TVolume).Name, planetGO, sector, info); - go.layer = LayerUtilities.BasicEffectVolume; + go.layer = Layer.BasicEffectVolume; var shape = go.AddComponent(); shape.radius = info.radius; diff --git a/NewHorizons/Components/Achievement/AchievementObserveTrigger.cs b/NewHorizons/Components/Achievement/AchievementObserveTrigger.cs index f0c0a51f..88392cb0 100644 --- a/NewHorizons/Components/Achievement/AchievementObserveTrigger.cs +++ b/NewHorizons/Components/Achievement/AchievementObserveTrigger.cs @@ -21,7 +21,7 @@ namespace NewHorizons.Components.Achievement private void Reset() { - gameObject.layer = LayerUtilities.Interactible; + gameObject.layer = Layer.Interactible; } private void Awake() diff --git a/NewHorizons/Components/AddPhysics.cs b/NewHorizons/Components/AddPhysics.cs index 16810de0..683b5a3c 100644 --- a/NewHorizons/Components/AddPhysics.cs +++ b/NewHorizons/Components/AddPhysics.cs @@ -39,7 +39,7 @@ public class AddPhysics : MonoBehaviour var owRigidbody = bodyGo.AddComponent(); owRigidbody._simulateInSector = Sector; - bodyGo.layer = LayerUtilities.PhysicalDetector; + bodyGo.layer = Layer.PhysicalDetector; bodyGo.tag = "DynamicPropDetector"; // this collider is not included in groups. oh well bodyGo.AddComponent().radius = Radius; diff --git a/NewHorizons/Utility/OWUtilities/LayerUtilities.cs b/NewHorizons/Utility/OWUtilities/Layer.cs similarity index 98% rename from NewHorizons/Utility/OWUtilities/LayerUtilities.cs rename to NewHorizons/Utility/OWUtilities/Layer.cs index bfd5e743..1b2c7240 100644 --- a/NewHorizons/Utility/OWUtilities/LayerUtilities.cs +++ b/NewHorizons/Utility/OWUtilities/Layer.cs @@ -2,7 +2,7 @@ using UnityEngine; namespace NewHorizons.Utility.OWUtilities { - public static class LayerUtilities + public static class Layer { public static int Default = LayerMask.NameToLayer(nameof(Default)); public static int TransparentFX = LayerMask.NameToLayer(nameof(TransparentFX)); From b495b1ea2a258d5f282cc92ef09dc00ddb6c65df Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 21 Mar 2023 17:33:15 -0700 Subject: [PATCH 3/6] one of the layers has a space in it >:( --- NewHorizons/Utility/OWUtilities/Layer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NewHorizons/Utility/OWUtilities/Layer.cs b/NewHorizons/Utility/OWUtilities/Layer.cs index 1b2c7240..a9eae8bb 100644 --- a/NewHorizons/Utility/OWUtilities/Layer.cs +++ b/NewHorizons/Utility/OWUtilities/Layer.cs @@ -6,7 +6,7 @@ namespace NewHorizons.Utility.OWUtilities { public static int Default = LayerMask.NameToLayer(nameof(Default)); public static int TransparentFX = LayerMask.NameToLayer(nameof(TransparentFX)); - public static int IgnoreRaycast = LayerMask.NameToLayer(nameof(IgnoreRaycast)); + public static int IgnoreRaycast = LayerMask.NameToLayer("Ignore Raycast"); public static int Water = LayerMask.NameToLayer(nameof(Water)); public static int UI = LayerMask.NameToLayer(nameof(UI)); public static int PlayerSafetyCollider = LayerMask.NameToLayer(nameof(PlayerSafetyCollider)); From a88f3c16a8a2e6d44ea56bd268394c740c095fad Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 21 Mar 2023 17:44:50 -0700 Subject: [PATCH 4/6] use nullable values instead of separate keepAutoPlacement thing --- .../TranslatorText/TranslatorTextBuilder.cs | 14 +++++++------- NewHorizons/External/Modules/PropModule.cs | 16 ++++++---------- 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs index 4cf69104..4967b9c5 100644 --- a/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs +++ b/NewHorizons/Builder/Props/TranslatorText/TranslatorTextBuilder.cs @@ -499,15 +499,15 @@ namespace NewHorizons.Builder.Props.TranslatorText var arcInfo = info.arcInfo[j]; var arc = arranger.spirals[j]; - if (arcInfo.keepAutoPlacement) continue; + if (arcInfo.position != null) arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0); - if (arcInfo.position == null) arc.transform.localPosition = Vector3.zero; - else arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0); + if (arcInfo.zRotation != null) arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation.Value); - arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation); - - if (arcInfo.mirror) arc.transform.localScale = new Vector3(-1, 1, 1); - else arc.transform.localScale = new Vector3( 1, 1, 1); + if (arcInfo.mirror != null) + { + if (arcInfo.mirror.Value) arc.transform.localScale = new Vector3(-1, 1, 1); + else arc.transform.localScale = new Vector3(1, 1, 1); + } } // make an entry in the cache for all these spirals diff --git a/NewHorizons/External/Modules/PropModule.cs b/NewHorizons/External/Modules/PropModule.cs index 5772cd26..639c361c 100644 --- a/NewHorizons/External/Modules/PropModule.cs +++ b/NewHorizons/External/Modules/PropModule.cs @@ -590,17 +590,12 @@ namespace NewHorizons.External.Modules } /// - /// Whether to skip modifying this spiral's placement, and instead keep the automatically determined placement. + /// Whether to flip the spiral from left-curling to right-curling or vice versa. If not specified, will use auto spiral generated value. /// - public bool keepAutoPlacement; + public bool? mirror; /// - /// Whether to flip the spiral from left-curling to right-curling or vice versa. - /// - public bool mirror; - - /// - /// The local position of this object on the wall. + /// The local position of this object on the wall. If not specified, will use auto spiral generated value. /// public MVector2 position; @@ -612,12 +607,13 @@ namespace NewHorizons.External.Modules /// /// Which variation of the chosen type to place. If not specified, a random variation will be selected based on the seed provided in the parent module. /// + [Obsolete("only used in old nomai text")] [DefaultValue(-1)] public int variation = -1; /// - /// The z euler angle for this arc. + /// The z euler angle for this arc. If not specified, will use auto spiral generated value. /// - [Range(0f, 360f)] public float zRotation; + [Range(0f, 360f)] public float? zRotation; } [JsonObject] From 8d13f1e5e5cb802d38d8d568e0f1a0e335f289f8 Mon Sep 17 00:00:00 2001 From: JohnCorby Date: Tue, 21 Mar 2023 17:45:34 -0700 Subject: [PATCH 5/6] oops --- NewHorizons/Builder/Props/NomaiTextBuilder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NewHorizons/Builder/Props/NomaiTextBuilder.cs b/NewHorizons/Builder/Props/NomaiTextBuilder.cs index 400170b6..5b8e91d4 100644 --- a/NewHorizons/Builder/Props/NomaiTextBuilder.cs +++ b/NewHorizons/Builder/Props/NomaiTextBuilder.cs @@ -704,9 +704,9 @@ namespace NewHorizons.Builder.Props if (arcInfo.position == null) arc.transform.localPosition = Vector3.zero; else arc.transform.localPosition = new Vector3(arcInfo.position.x, arcInfo.position.y, 0); - arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation); + arc.transform.localRotation = Quaternion.Euler(0, 0, arcInfo.zRotation.GetValueOrDefault()); - if (arcInfo.mirror) arc.transform.localScale = new Vector3(-1, 1, 1); + if (arcInfo.mirror.GetValueOrDefault()) arc.transform.localScale = new Vector3(-1, 1, 1); } // Try auto I guess else From 0f248049280b6bd9b5ba56d6a99f57f1ba9e45da Mon Sep 17 00:00:00 2001 From: Ben C Date: Wed, 22 Mar 2023 00:51:28 +0000 Subject: [PATCH 6/6] Updated Schemas --- NewHorizons/Schemas/body_schema.json | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/NewHorizons/Schemas/body_schema.json b/NewHorizons/Schemas/body_schema.json index 09f4f41d..bc6793b4 100644 --- a/NewHorizons/Schemas/body_schema.json +++ b/NewHorizons/Schemas/body_schema.json @@ -1457,16 +1457,15 @@ "type": "object", "additionalProperties": false, "properties": { - "keepAutoPlacement": { - "type": "boolean", - "description": "Whether to skip modifying this spiral's placement, and instead keep the automatically determined placement." - }, "mirror": { - "type": "boolean", - "description": "Whether to flip the spiral from left-curling to right-curling or vice versa." + "type": [ + "boolean", + "null" + ], + "description": "Whether to flip the spiral from left-curling to right-curling or vice versa. If not specified, will use auto spiral generated value." }, "position": { - "description": "The local position of this object on the wall.", + "description": "The local position of this object on the wall. If not specified, will use auto spiral generated value.", "$ref": "#/definitions/MVector2" }, "type": { @@ -1474,15 +1473,12 @@ "default": "adult", "$ref": "#/definitions/NomaiTextArcType" }, - "variation": { - "type": "integer", - "description": "Which variation of the chosen type to place. If not specified, a random variation will be selected based on the seed provided in the parent module.", - "format": "int32", - "default": -1 - }, "zRotation": { - "type": "number", - "description": "The z euler angle for this arc.", + "type": [ + "null", + "number" + ], + "description": "The z euler angle for this arc. If not specified, will use auto spiral generated value.", "format": "float", "maximum": 360.0, "minimum": 0.0