diff --git a/NewHorizons/NewHorizonsApi.cs b/NewHorizons/NewHorizonsApi.cs index d6d78ed9..a96673d5 100644 --- a/NewHorizons/NewHorizonsApi.cs +++ b/NewHorizons/NewHorizonsApi.cs @@ -26,314 +26,315 @@ using UnityEngine; using UnityEngine.Events; using static NewHorizons.External.Modules.ShipLogModule; -namespace NewHorizons; - -public class NewHorizonsApi : INewHorizons +namespace NewHorizons { - [Obsolete("Create(Dictionary config) is deprecated, please use LoadConfigs(IModBehaviour mod) instead")] - public void Create(Dictionary config) + public class NewHorizonsApi : INewHorizons { - Create(config, null); - } - - [Obsolete("Create(Dictionary config) is deprecated, please use LoadConfigs(IModBehaviour mod) instead")] - public void Create(Dictionary config, IModBehaviour mod) - { - try + [Obsolete("Create(Dictionary config) is deprecated, please use LoadConfigs(IModBehaviour mod) instead")] + public void Create(Dictionary config) { - var name = (string)config["Name"]; + Create(config, null); + } - NHLogger.LogWarning($"Recieved API request to create planet [{name}]"); - - if (name == null) return; - - var relativePath = $"temp/{name}.json"; - var fullPath = Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, relativePath); - if (!Directory.Exists(Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, "temp"))) + [Obsolete("Create(Dictionary config) is deprecated, please use LoadConfigs(IModBehaviour mod) instead")] + public void Create(Dictionary config, IModBehaviour mod) + { + try { - Directory.CreateDirectory(Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, "temp")); + var name = (string)config["Name"]; + + NHLogger.LogWarning($"Recieved API request to create planet [{name}]"); + + if (name == null) return; + + var relativePath = $"temp/{name}.json"; + var fullPath = Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, relativePath); + if (!Directory.Exists(Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, "temp"))) + { + Directory.CreateDirectory(Path.Combine(Main.Instance.ModHelper.Manifest.ModFolderPath, "temp")); + } + JsonHelper.SaveJsonObject(fullPath, config); + var body = Main.Instance.LoadConfig(Main.Instance, relativePath); + File.Delete(fullPath); + + // Update it to point to their mod for textures and stuff + body.Mod = mod ?? Main.Instance; + + if (!Main.BodyDict.ContainsKey(body.Config.starSystem)) Main.BodyDict.Add(body.Config.starSystem, new List()); + Main.BodyDict[body.Config.starSystem].Add(body); } - JsonHelper.SaveJsonObject(fullPath, config); - var body = Main.Instance.LoadConfig(Main.Instance, relativePath); - File.Delete(fullPath); - - // Update it to point to their mod for textures and stuff - body.Mod = mod ?? Main.Instance; - - if (!Main.BodyDict.ContainsKey(body.Config.starSystem)) Main.BodyDict.Add(body.Config.starSystem, new List()); - Main.BodyDict[body.Config.starSystem].Add(body); - } - catch (Exception ex) - { - NHLogger.LogError($"Error in Create API:\n{ex}"); - } - } - - [Obsolete("SpawnObject(GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, float scale, bool alignRadial) is deprecated, please use SpawnObject(IModBehaviour mod, GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, float scale, bool alignRadial) instead")] - public GameObject SpawnObject(GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, - float scale, bool alignRadial) - { - return SpawnObject(null, planet, sector, propToCopyPath, position, eulerAngles, scale, alignRadial); - } - - public void LoadConfigs(IModBehaviour mod) - { - Main.Instance.LoadConfigs(mod); - } - - public GameObject GetPlanet(string name) - { - return Main.BodyDict.Values.SelectMany(x => x)?.ToList()?.FirstOrDefault(x => x.Config.name == name)?.Object; - } - - public string GetCurrentStarSystem() => Main.Instance.CurrentStarSystem; - public UnityEvent GetChangeStarSystemEvent() => Main.Instance.OnChangeStarSystem; - public UnityEvent GetStarSystemLoadedEvent() => Main.Instance.OnStarSystemLoaded; - public UnityEvent GetBodyLoadedEvent() => Main.Instance.OnPlanetLoaded; - - public bool SetDefaultSystem(string name) - { - if (!Main.SystemDict.ContainsKey(name)) return false; - - Main.Instance.SetDefaultSystem(name); - return true; - } - - public bool ChangeCurrentStarSystem(string name) - { - if (!Main.SystemDict.ContainsKey(name)) return false; - - Main.Instance.ChangeCurrentStarSystem(name); - return true; - } - - public string[] GetInstalledAddons() - { - try - { - return Main.MountedAddons.Select(x => x?.ModHelper?.Manifest?.UniqueName).ToArray(); - } - catch (Exception ex) - { - NHLogger.LogError($"Couldn't get installed addons:\n{ex}"); - return new string[] { }; - } - } - - private static object QueryJson(Type outType, string filePath, string jsonPath) - { - if (filePath == "") return null; - try - { - var jsonText = File.ReadAllText(filePath); - var jsonData = JObject.Parse(jsonText); - return jsonData.SelectToken(jsonPath)?.ToObject(outType); - } - catch (FileNotFoundException) - { - return null; - } - catch (JsonException e) - { - NHLogger.LogError(e.ToString()); - return null; - } - } - - public object QueryBody(Type outType, string bodyName, string jsonPath) - { - var planet = Main.BodyDict[Main.Instance.CurrentStarSystem].Find((b) => b.Config.name == bodyName); - return planet == null - ? null - : QueryJson(outType, Path.Combine(planet.Mod.ModHelper.Manifest.ModFolderPath, planet.RelativePath), jsonPath); - } - - public T QueryBody(string bodyName, string jsonPath) - { - var data = QueryBody(typeof(T), bodyName, jsonPath); - if (data is T result) - { - return result; - } - return default; - } - - public object QuerySystem(Type outType, string jsonPath) - { - var system = Main.SystemDict[Main.Instance.CurrentStarSystem]; - return system == null - ? null - : QueryJson(outType, Path.Combine(system.Mod.ModHelper.Manifest.ModFolderPath, system.RelativePath), jsonPath); - } - - public T QuerySystem(string jsonPath) - { - var data = QuerySystem(typeof(T), jsonPath); - if (data is T result) - { - return result; - } - return default; - } - - public GameObject SpawnObject(IModBehaviour mod, GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, - float scale, bool alignRadial) - { - var prefab = SearchUtilities.Find(propToCopyPath); - var detailInfo = new DetailInfo() - { - position = position, - rotation = eulerAngles, - scale = scale, - alignRadial = alignRadial - }; - return DetailBuilder.Make(planet, sector, mod, prefab, detailInfo); - } - - public AudioSignal SpawnSignal(IModBehaviour mod, GameObject root, string audio, string name, string frequency, - float sourceRadius = 1f, float detectionRadius = 20f, float identificationRadius = 10f, bool insideCloak = false, - bool onlyAudibleToScope = true, string reveals = "") - { - var info = new SignalInfo() - { - audio = audio, - detectionRadius = detectionRadius, - frequency = frequency, - identificationRadius = identificationRadius, - insideCloak = insideCloak, - name = name, - onlyAudibleToScope = onlyAudibleToScope, - position = Vector3.zero, - reveals = reveals, - sourceRadius = sourceRadius - }; - - return SignalBuilder.Make(root, null, info, mod).GetComponent(); - } - - public (CharacterDialogueTree, RemoteDialogueTrigger) SpawnDialogue(IModBehaviour mod, GameObject root, string xmlFile, float radius = 1f, - float range = 1f, string blockAfterPersistentCondition = null, float lookAtRadius = 1f, string pathToAnimController = null, - float remoteTriggerRadius = 0f) - { - var info = new DialogueInfo() - { - blockAfterPersistentCondition = blockAfterPersistentCondition, - lookAtRadius = lookAtRadius, - pathToAnimController = pathToAnimController, - position = Vector3.zero, - radius = radius, - range = range, - xmlFile = xmlFile, - remoteTrigger = remoteTriggerRadius > 0f ? new RemoteTriggerInfo() + catch (Exception ex) { - position = null, - radius = remoteTriggerRadius, - } : null, - }; - - return DialogueBuilder.Make(root, null, info, mod); - } - - public void CreatePlanet(string config, IModBehaviour mod) - { - try - { - var planet = JsonConvert.DeserializeObject(config); - if (planet == null) - { - NHLogger.LogError($"Couldn't load planet via API. Is your Json formatted correctly? {config}"); - return; + NHLogger.LogError($"Error in Create API:\n{ex}"); } - - var body = Main.Instance.RegisterPlanetConfig(planet, mod, null); - - if (!Main.BodyDict.ContainsKey(body.Config.starSystem)) Main.BodyDict.Add(body.Config.starSystem, new List()); - Main.BodyDict[body.Config.starSystem].Add(body); } - catch (Exception ex) + + [Obsolete("SpawnObject(GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, float scale, bool alignRadial) is deprecated, please use SpawnObject(IModBehaviour mod, GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, float scale, bool alignRadial) instead")] + public GameObject SpawnObject(GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, + float scale, bool alignRadial) { - NHLogger.LogError($"Error in CreatePlanet API:\n{ex}"); + return SpawnObject(null, planet, sector, propToCopyPath, position, eulerAngles, scale, alignRadial); } - } - public void DefineStarSystem(string name, string config, IModBehaviour mod) - { - var starSystemConfig = JsonConvert.DeserializeObject(config); - Main.Instance.LoadStarSystemConfig(name, starSystemConfig, null, mod); - } - - public (CharacterDialogueTree, RemoteDialogueTrigger) CreateDialogueFromXML(string textAssetID, string xml, string dialogueInfo, GameObject planetGO) - { - var info = JsonConvert.DeserializeObject(dialogueInfo); - return DialogueBuilder.Make(planetGO, null, info, xml, textAssetID); - } - - public GameObject CreateNomaiText(string xml, string textInfo, GameObject planetGO) - { - var info = JsonConvert.DeserializeObject(textInfo); - return TranslatorTextBuilder.Make(planetGO, null, info, null, xml); - } - - public void AddShipLogXML(IModBehaviour mod, XElement xml, string planetName, string imageFolder, Dictionary entryPositions, Dictionary curiousityColours) - { - // This method has to be called each time the ship log manager is created, i.e. each time a system loads so it will only ever be relevant to the current one. - var starSystem = Main.Instance.CurrentStarSystem; - - var body = new NewHorizonsBody(new PlanetConfig() + public void LoadConfigs(IModBehaviour mod) { - name = planetName, - starSystem = starSystem, - ShipLog = new ShipLogModule() + Main.Instance.LoadConfigs(mod); + } + + public GameObject GetPlanet(string name) + { + return Main.BodyDict.Values.SelectMany(x => x)?.ToList()?.FirstOrDefault(x => x.Config.name == name)?.Object; + } + + public string GetCurrentStarSystem() => Main.Instance.CurrentStarSystem; + public UnityEvent GetChangeStarSystemEvent() => Main.Instance.OnChangeStarSystem; + public UnityEvent GetStarSystemLoadedEvent() => Main.Instance.OnStarSystemLoaded; + public UnityEvent GetBodyLoadedEvent() => Main.Instance.OnPlanetLoaded; + + public bool SetDefaultSystem(string name) + { + if (!Main.SystemDict.ContainsKey(name)) return false; + + Main.Instance.SetDefaultSystem(name); + return true; + } + + public bool ChangeCurrentStarSystem(string name) + { + if (!Main.SystemDict.ContainsKey(name)) return false; + + Main.Instance.ChangeCurrentStarSystem(name); + return true; + } + + public string[] GetInstalledAddons() + { + try { - spriteFolder = imageFolder + return Main.MountedAddons.Select(x => x?.ModHelper?.Manifest?.UniqueName).ToArray(); } - }, mod); - - if (!Main.BodyDict.ContainsKey(starSystem)) - { - Main.BodyDict.Add(starSystem, new List()); - Main.BodyDict[starSystem].Add(body); - } - else - { - var existingBody = Main.BodyDict[starSystem] - .FirstOrDefault(x => x.Config.name == planetName && x.Mod.ModHelper.Manifest.UniqueName == mod.ModHelper.Manifest.UniqueName); - if (existingBody != null) + catch (Exception ex) { - body = existingBody; + NHLogger.LogError($"Couldn't get installed addons:\n{ex}"); + return new string[] { }; + } + } + + private static object QueryJson(Type outType, string filePath, string jsonPath) + { + if (filePath == "") return null; + try + { + var jsonText = File.ReadAllText(filePath); + var jsonData = JObject.Parse(jsonText); + return jsonData.SelectToken(jsonPath)?.ToObject(outType); + } + catch (FileNotFoundException) + { + return null; + } + catch (JsonException e) + { + NHLogger.LogError(e.ToString()); + return null; + } + } + + public object QueryBody(Type outType, string bodyName, string jsonPath) + { + var planet = Main.BodyDict[Main.Instance.CurrentStarSystem].Find((b) => b.Config.name == bodyName); + return planet == null + ? null + : QueryJson(outType, Path.Combine(planet.Mod.ModHelper.Manifest.ModFolderPath, planet.RelativePath), jsonPath); + } + + public T QueryBody(string bodyName, string jsonPath) + { + var data = QueryBody(typeof(T), bodyName, jsonPath); + if (data is T result) + { + return result; + } + return default; + } + + public object QuerySystem(Type outType, string jsonPath) + { + var system = Main.SystemDict[Main.Instance.CurrentStarSystem]; + return system == null + ? null + : QueryJson(outType, Path.Combine(system.Mod.ModHelper.Manifest.ModFolderPath, system.RelativePath), jsonPath); + } + + public T QuerySystem(string jsonPath) + { + var data = QuerySystem(typeof(T), jsonPath); + if (data is T result) + { + return result; + } + return default; + } + + public GameObject SpawnObject(IModBehaviour mod, GameObject planet, Sector sector, string propToCopyPath, Vector3 position, Vector3 eulerAngles, + float scale, bool alignRadial) + { + var prefab = SearchUtilities.Find(propToCopyPath); + var detailInfo = new DetailInfo() + { + position = position, + rotation = eulerAngles, + scale = scale, + alignRadial = alignRadial + }; + return DetailBuilder.Make(planet, sector, mod, prefab, detailInfo); + } + + public AudioSignal SpawnSignal(IModBehaviour mod, GameObject root, string audio, string name, string frequency, + float sourceRadius = 1f, float detectionRadius = 20f, float identificationRadius = 10f, bool insideCloak = false, + bool onlyAudibleToScope = true, string reveals = "") + { + var info = new SignalInfo() + { + audio = audio, + detectionRadius = detectionRadius, + frequency = frequency, + identificationRadius = identificationRadius, + insideCloak = insideCloak, + name = name, + onlyAudibleToScope = onlyAudibleToScope, + position = Vector3.zero, + reveals = reveals, + sourceRadius = sourceRadius + }; + + return SignalBuilder.Make(root, null, info, mod).GetComponent(); + } + + public (CharacterDialogueTree, RemoteDialogueTrigger) SpawnDialogue(IModBehaviour mod, GameObject root, string xmlFile, float radius = 1f, + float range = 1f, string blockAfterPersistentCondition = null, float lookAtRadius = 1f, string pathToAnimController = null, + float remoteTriggerRadius = 0f) + { + var info = new DialogueInfo() + { + blockAfterPersistentCondition = blockAfterPersistentCondition, + lookAtRadius = lookAtRadius, + pathToAnimController = pathToAnimController, + position = Vector3.zero, + radius = radius, + range = range, + xmlFile = xmlFile, + remoteTrigger = remoteTriggerRadius > 0f ? new RemoteTriggerInfo() + { + position = null, + radius = remoteTriggerRadius, + } : null, + }; + + return DialogueBuilder.Make(root, null, info, mod); + } + + public void CreatePlanet(string config, IModBehaviour mod) + { + try + { + var planet = JsonConvert.DeserializeObject(config); + if (planet == null) + { + NHLogger.LogError($"Couldn't load planet via API. Is your Json formatted correctly? {config}"); + return; + } + + var body = Main.Instance.RegisterPlanetConfig(planet, mod, null); + + if (!Main.BodyDict.ContainsKey(body.Config.starSystem)) Main.BodyDict.Add(body.Config.starSystem, new List()); + Main.BodyDict[body.Config.starSystem].Add(body); + } + catch (Exception ex) + { + NHLogger.LogError($"Error in CreatePlanet API:\n{ex}"); + } + } + + public void DefineStarSystem(string name, string config, IModBehaviour mod) + { + var starSystemConfig = JsonConvert.DeserializeObject(config); + Main.Instance.LoadStarSystemConfig(name, starSystemConfig, null, mod); + } + + public (CharacterDialogueTree, RemoteDialogueTrigger) CreateDialogueFromXML(string textAssetID, string xml, string dialogueInfo, GameObject planetGO) + { + var info = JsonConvert.DeserializeObject(dialogueInfo); + return DialogueBuilder.Make(planetGO, null, info, xml, textAssetID); + } + + public GameObject CreateNomaiText(string xml, string textInfo, GameObject planetGO) + { + var info = JsonConvert.DeserializeObject(textInfo); + return TranslatorTextBuilder.Make(planetGO, null, info, null, xml); + } + + public void AddShipLogXML(IModBehaviour mod, XElement xml, string planetName, string imageFolder, Dictionary entryPositions, Dictionary curiousityColours) + { + // This method has to be called each time the ship log manager is created, i.e. each time a system loads so it will only ever be relevant to the current one. + var starSystem = Main.Instance.CurrentStarSystem; + + var body = new NewHorizonsBody(new PlanetConfig() + { + name = planetName, + starSystem = starSystem, + ShipLog = new ShipLogModule() + { + spriteFolder = imageFolder + } + }, mod); + + if (!Main.BodyDict.ContainsKey(starSystem)) + { + Main.BodyDict.Add(starSystem, new List()); + Main.BodyDict[starSystem].Add(body); } else { - Main.BodyDict[starSystem].Add(body); + var existingBody = Main.BodyDict[starSystem] + .FirstOrDefault(x => x.Config.name == planetName && x.Mod.ModHelper.Manifest.UniqueName == mod.ModHelper.Manifest.UniqueName); + if (existingBody != null) + { + body = existingBody; + } + else + { + Main.BodyDict[starSystem].Add(body); + } } + + var system = new StarSystemConfig() + { + entryPositions = entryPositions? + .Select((pair) => new EntryPositionInfo() { id = pair.Key, position = pair.Value }) + .ToArray(), + curiosities = curiousityColours? + .Select((pair) => new CuriosityColorInfo() { id = pair.Key, color = MColor.FromColor(pair.Value.colour), highlightColor = MColor.FromColor(pair.Value.highlight) }) + .ToArray() + }; + + Main.Instance.LoadStarSystemConfig(starSystem, system, null, mod); + + RumorModeBuilder.AddShipLogXML(GameObject.FindObjectOfType(), xml, body); } - var system = new StarSystemConfig() - { - entryPositions = entryPositions? - .Select((pair) => new EntryPositionInfo() { id = pair.Key, position = pair.Value }) - .ToArray(), - curiosities = curiousityColours? - .Select((pair) => new CuriosityColorInfo() { id = pair.Key, color = MColor.FromColor(pair.Value.colour), highlightColor = MColor.FromColor(pair.Value.highlight) }) - .ToArray() - }; + /// + /// Register your own builder that will act on the given GameObject by reading its raw json string + /// + /// + public void RegisterCustomBuilder(Action builder) => PlanetCreationHandler.CustomBuilders.Add(builder); - Main.Instance.LoadStarSystemConfig(starSystem, system, null, mod); + public string GetTranslationForShipLog(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.SHIPLOG); - RumorModeBuilder.AddShipLogXML(GameObject.FindObjectOfType(), xml, body); + public string GetTranslationForDialogue(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.DIALOGUE); + + public string GetTranslationForUI(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.UI); + + public string GetTranslationForOtherText(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.OTHER); } - - /// - /// Register your own builder that will act on the given GameObject by reading its raw json string - /// - /// - public void RegisterCustomBuilder(Action builder) => PlanetCreationHandler.CustomBuilders.Add(builder); - - public string GetTranslationForShipLog(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.SHIPLOG); - - public string GetTranslationForDialogue(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.DIALOGUE); - - public string GetTranslationForUI(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.UI); - - public string GetTranslationForOtherText(string text) => TranslationHandler.GetTranslation(text, TranslationHandler.TextType.OTHER); } diff --git a/NewHorizons/Utility/Files/AssetBundleUtilities.cs b/NewHorizons/Utility/Files/AssetBundleUtilities.cs index 83bf1461..72bb05c2 100644 --- a/NewHorizons/Utility/Files/AssetBundleUtilities.cs +++ b/NewHorizons/Utility/Files/AssetBundleUtilities.cs @@ -6,144 +6,145 @@ using System.IO; using System.Linq; using UnityEngine; -namespace NewHorizons.Utility.Files; - -public static class AssetBundleUtilities +namespace NewHorizons.Utility.Files { - public static Dictionary AssetBundles = new Dictionary(); - - public static void ClearCache() + public static class AssetBundleUtilities { - foreach (var pair in AssetBundles) + public static Dictionary AssetBundles = new Dictionary(); + + public static void ClearCache() { - if (!pair.Value.keepLoaded) + foreach (var pair in AssetBundles) { - if (pair.Value.bundle == null) + if (!pair.Value.keepLoaded) { - NHLogger.LogError($"The asset bundle for {pair.Key} was null when trying to unload"); + if (pair.Value.bundle == null) + { + NHLogger.LogError($"The asset bundle for {pair.Key} was null when trying to unload"); + } + else + { + pair.Value.bundle.Unload(true); + } + } + + } + AssetBundles = AssetBundles.Where(x => x.Value.keepLoaded).ToDictionary(x => x.Key, x => x.Value); + } + + public static void PreloadBundle(string assetBundleRelativeDir, IModBehaviour mod) + { + string key = Path.GetFileName(assetBundleRelativeDir); + var completePath = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, assetBundleRelativeDir); + var request = AssetBundle.LoadFromFileAsync(completePath); + request.completed += _ => + { + NHLogger.Log($"Finished loading async bundle {assetBundleRelativeDir}"); + AssetBundles[key] = (request.assetBundle, true); + }; + } + + public static T Load(string assetBundleRelativeDir, string pathInBundle, IModBehaviour mod) where T : UnityEngine.Object + { + string key = Path.GetFileName(assetBundleRelativeDir); + T obj; + + try + { + AssetBundle bundle; + + if (AssetBundles.ContainsKey(key)) + { + bundle = AssetBundles[key].bundle; } else { - pair.Value.bundle.Unload(true); + var completePath = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, assetBundleRelativeDir); + bundle = AssetBundle.LoadFromFile(completePath); + if (bundle == null) + { + NHLogger.LogError($"Couldn't load AssetBundle at [{completePath}] for [{mod.ModHelper.Manifest.Name}]"); + return null; + } + + AssetBundles[key] = (bundle, false); } + + obj = bundle.LoadAsset(pathInBundle); } - - } - AssetBundles = AssetBundles.Where(x => x.Value.keepLoaded).ToDictionary(x => x.Key, x => x.Value); - } - - public static void PreloadBundle(string assetBundleRelativeDir, IModBehaviour mod) - { - string key = Path.GetFileName(assetBundleRelativeDir); - var completePath = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, assetBundleRelativeDir); - var request = AssetBundle.LoadFromFileAsync(completePath); - request.completed += _ => - { - NHLogger.Log($"Finished loading async bundle {assetBundleRelativeDir}"); - AssetBundles[key] = (request.assetBundle, true); - }; - } - - public static T Load(string assetBundleRelativeDir, string pathInBundle, IModBehaviour mod) where T : UnityEngine.Object - { - string key = Path.GetFileName(assetBundleRelativeDir); - T obj; - - try - { - AssetBundle bundle; - - if (AssetBundles.ContainsKey(key)) + catch (Exception e) { - bundle = AssetBundles[key].bundle; - } - else - { - var completePath = Path.Combine(mod.ModHelper.Manifest.ModFolderPath, assetBundleRelativeDir); - bundle = AssetBundle.LoadFromFile(completePath); - if (bundle == null) - { - NHLogger.LogError($"Couldn't load AssetBundle at [{completePath}] for [{mod.ModHelper.Manifest.Name}]"); - return null; - } - - AssetBundles[key] = (bundle, false); + NHLogger.LogError($"Couldn't load asset {pathInBundle} from AssetBundle {assetBundleRelativeDir}:\n{e}"); + return null; } - obj = bundle.LoadAsset(pathInBundle); - } - catch (Exception e) - { - NHLogger.LogError($"Couldn't load asset {pathInBundle} from AssetBundle {assetBundleRelativeDir}:\n{e}"); - return null; + return obj; } - return obj; - } - - public static GameObject LoadPrefab(string assetBundleRelativeDir, string pathInBundle, IModBehaviour mod) - { - var prefab = Load(assetBundleRelativeDir, pathInBundle, mod); - - prefab.SetActive(false); - - ReplaceShaders(prefab); - - return prefab; - } - - public static void ReplaceShaders(GameObject prefab) - { - foreach (var renderer in prefab.GetComponentsInChildren(true)) + public static GameObject LoadPrefab(string assetBundleRelativeDir, string pathInBundle, IModBehaviour mod) { - foreach (var material in renderer.sharedMaterials) + var prefab = Load(assetBundleRelativeDir, pathInBundle, mod); + + prefab.SetActive(false); + + ReplaceShaders(prefab); + + return prefab; + } + + public static void ReplaceShaders(GameObject prefab) + { + foreach (var renderer in prefab.GetComponentsInChildren(true)) { - if (material == null) continue; - - var replacementShader = Shader.Find(material.shader.name); - if (replacementShader == null) continue; - - // preserve override tag and render queue (for Standard shader) - // keywords and properties are already preserved - if (material.renderQueue != material.shader.renderQueue) + foreach (var material in renderer.sharedMaterials) { - var renderType = material.GetTag("RenderType", false); - var renderQueue = material.renderQueue; - material.shader = replacementShader; - material.SetOverrideTag("RenderType", renderType); - material.renderQueue = renderQueue; - } - else - { - material.shader = replacementShader; + if (material == null) continue; + + var replacementShader = Shader.Find(material.shader.name); + if (replacementShader == null) continue; + + // preserve override tag and render queue (for Standard shader) + // keywords and properties are already preserved + if (material.renderQueue != material.shader.renderQueue) + { + var renderType = material.GetTag("RenderType", false); + var renderQueue = material.renderQueue; + material.shader = replacementShader; + material.SetOverrideTag("RenderType", renderType); + material.renderQueue = renderQueue; + } + else + { + material.shader = replacementShader; + } } } - } - foreach (var trenderer in prefab.GetComponentsInChildren(true)) - { - foreach (var material in trenderer.sharedMaterials) + foreach (var trenderer in prefab.GetComponentsInChildren(true)) { - if (material == null) continue; - - var replacementShader = Shader.Find(material.shader.name); - if (replacementShader == null) continue; - - // preserve override tag and render queue (for Standard shader) - // keywords and properties are already preserved - if (material.renderQueue != material.shader.renderQueue) + foreach (var material in trenderer.sharedMaterials) { - var renderType = material.GetTag("RenderType", false); - var renderQueue = material.renderQueue; - material.shader = replacementShader; - material.SetOverrideTag("RenderType", renderType); - material.renderQueue = renderQueue; - } - else - { - material.shader = replacementShader; + if (material == null) continue; + + var replacementShader = Shader.Find(material.shader.name); + if (replacementShader == null) continue; + + // preserve override tag and render queue (for Standard shader) + // keywords and properties are already preserved + if (material.renderQueue != material.shader.renderQueue) + { + var renderType = material.GetTag("RenderType", false); + var renderQueue = material.renderQueue; + material.shader = replacementShader; + material.SetOverrideTag("RenderType", renderType); + material.renderQueue = renderQueue; + } + else + { + material.shader = replacementShader; + } } } } } -} +} \ No newline at end of file