From 73f819218a7048a66e5a853e24fefe176e492f96 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Tue, 14 Jun 2022 21:49:00 -0400 Subject: [PATCH 1/3] Change to IsNullOrEmpty --- NewHorizons/Builder/Body/CloakBuilder.cs | 4 ++-- NewHorizons/Builder/Props/SignalBuilder.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NewHorizons/Builder/Body/CloakBuilder.cs b/NewHorizons/Builder/Body/CloakBuilder.cs index ab18f6bf..2325dca2 100644 --- a/NewHorizons/Builder/Body/CloakBuilder.cs +++ b/NewHorizons/Builder/Body/CloakBuilder.cs @@ -12,8 +12,8 @@ namespace NewHorizons.Builder.Body var radius = module.radius; AudioClip clip = null; - if (module.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName(module.audioClip); - else if (module.audioFilePath != null) + if (!string.IsNullOrEmpty(module.audioClip)) clip = SearchUtilities.FindResourceOfTypeAndName(module.audioClip); + else if (!string.IsNullOrEmpty(module.audioFilePath)) { try { diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 097ea6cb..37e28b8d 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -153,8 +153,8 @@ namespace NewHorizons.Builder.Props var name = StringToSignalName(info.name); AudioClip clip = null; - if (info.audioClip != null) clip = SearchUtilities.FindResourceOfTypeAndName(info.audioClip); - else if (info.audioFilePath != null) + if (!string.IsNullOrEmpty(info.audioClip)) clip = SearchUtilities.FindResourceOfTypeAndName(info.audioClip); + else if (!string.IsNullOrEmpty(info.audioFilePath)) { try { From 60e03376486139cb7fe6373e96556407f555bdc4 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Tue, 14 Jun 2022 21:51:21 -0400 Subject: [PATCH 2/3] Change to match SystemCreationHandler --- NewHorizons/Builder/Body/CloakBuilder.cs | 16 +++++++++++++--- NewHorizons/Builder/Props/SignalBuilder.cs | 5 +---- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/NewHorizons/Builder/Body/CloakBuilder.cs b/NewHorizons/Builder/Body/CloakBuilder.cs index 2325dca2..ddb60013 100644 --- a/NewHorizons/Builder/Body/CloakBuilder.cs +++ b/NewHorizons/Builder/Body/CloakBuilder.cs @@ -12,16 +12,26 @@ namespace NewHorizons.Builder.Body var radius = module.radius; AudioClip clip = null; - if (!string.IsNullOrEmpty(module.audioClip)) clip = SearchUtilities.FindResourceOfTypeAndName(module.audioClip); + if (!string.IsNullOrEmpty(module.audioClip)) + { + clip = SearchUtilities.FindResourceOfTypeAndName(module.audioClip); + + if (clip == null) + { + Utility.Logger.LogError($"Couldn't get audio from clip [{module.audioClip}]"); + } + } else if (!string.IsNullOrEmpty(module.audioFilePath)) { try { clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + module.audioFilePath); } - catch (System.Exception e) + catch { } + + if (clip == null) { - Utility.Logger.LogError($"Couldn't load audio file {module.audioFilePath} : {e.Message}"); + Utility.Logger.LogError($"Couldn't get audio from file [{module.audioFilePath}]"); } } diff --git a/NewHorizons/Builder/Props/SignalBuilder.cs b/NewHorizons/Builder/Props/SignalBuilder.cs index 37e28b8d..856e57d6 100644 --- a/NewHorizons/Builder/Props/SignalBuilder.cs +++ b/NewHorizons/Builder/Props/SignalBuilder.cs @@ -160,10 +160,7 @@ namespace NewHorizons.Builder.Props { clip = AudioUtilities.LoadAudio(mod.ModHelper.Manifest.ModFolderPath + "/" + info.audioFilePath); } - catch (Exception e) - { - Logger.LogError($"Couldn't load audio file {info.audioFilePath} : {e.Message}"); - } + catch { } } if (clip == null) From 29a9c239f37da68e624c67f4c863c4020ff5dbe8 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Tue, 14 Jun 2022 22:02:43 -0400 Subject: [PATCH 3/3] Change travel music on next update --- NewHorizons/Handlers/SystemCreationHandler.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/NewHorizons/Handlers/SystemCreationHandler.cs b/NewHorizons/Handlers/SystemCreationHandler.cs index 6eb51621..af59fb81 100644 --- a/NewHorizons/Handlers/SystemCreationHandler.cs +++ b/NewHorizons/Handlers/SystemCreationHandler.cs @@ -54,12 +54,15 @@ namespace NewHorizons.Handlers if (clip != null) { - var travelSource = Locator.GetGlobalMusicController()._travelSource; - travelSource._audioLibraryClip = AudioType.None; - travelSource._clipArrayIndex = 0; - travelSource._clipArrayLength = 0; - travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL; - travelSource.clip = clip; + Main.Instance.ModHelper.Events.Unity.FireOnNextUpdate(() => + { + var travelSource = Locator.GetGlobalMusicController()._travelSource; + travelSource._audioLibraryClip = AudioType.None; + travelSource._clipArrayIndex = 0; + travelSource._clipArrayLength = 0; + travelSource._clipSelectionOnPlay = OWAudioSource.ClipSelectionOnPlay.MANUAL; + travelSource.clip = clip; + }); } } }