diff --git a/Source/Restock/ModuleRestockModifyFairingMaterials.cs b/Source/Restock/ModuleRestockModifyFairingMaterials.cs index 4d7f257a..908dab6a 100644 --- a/Source/Restock/ModuleRestockModifyFairingMaterials.cs +++ b/Source/Restock/ModuleRestockModifyFairingMaterials.cs @@ -31,7 +31,7 @@ namespace Restock if (string.IsNullOrEmpty(serializedNode)) { - Debug.LogError("Serialized node is null or empty!"); + this.LogError("Serialized node is null or empty!"); yield break; } @@ -41,7 +41,7 @@ namespace Restock if (fairingModule == null) { - Debug.LogError("No fairing module found on part!"); + this.LogError("No fairing module found on part!"); yield break; } @@ -56,7 +56,7 @@ namespace Restock } catch (Exception ex) { - Debug.LogException(new Exception($"[{nameof(ModuleRestockModifyFairingMaterials)}] cannot parse node as material modifier: \n{node2.ToString()}\n", ex)); + this.LogException($"cannot parse node as material modifier: \n{node2.ToString()}\n", ex); continue; } diff --git a/Source/Restock/ModuleRestockModifyMaterials.cs b/Source/Restock/ModuleRestockModifyMaterials.cs index c10c5163..85b827ae 100644 --- a/Source/Restock/ModuleRestockModifyMaterials.cs +++ b/Source/Restock/ModuleRestockModifyMaterials.cs @@ -29,7 +29,7 @@ namespace Restock } else { - Debug.LogError($"Can't find shader {newShaderName}"); + this.LogError($"Can't find shader {newShaderName}"); continue; } @@ -46,7 +46,7 @@ namespace Restock } catch (Exception ex) { - Debug.LogException(new Exception($"[{nameof(ModuleRestockModifyMaterials)}] cannot parse node as material modifier: \n{node3.ToString()}\n", ex)); + this.LogException($"cannot parse node as material modifier: \n{node3.ToString()}\n", ex); continue; } @@ -74,7 +74,7 @@ namespace Restock if (modelTransforms.Length == 0) { - Debug.LogError($"Couldn't find transform named '{value.name}' on part"); + this.LogError($"Couldn't find transform named '{value.name}' on part"); continue; } @@ -84,7 +84,7 @@ namespace Restock Renderer renderer = transform.GetComponent(); if (renderer == null) - Debug.LogError($"No renderer found on transform '{transform.name}'"); + this.LogError($"No renderer found on transform '{transform.name}'"); else transformRenderers.Add(renderer); } @@ -98,7 +98,7 @@ namespace Restock if (modelTransforms.Length == 0) { - Debug.LogError($"Couldn't find transform named '{value.name}' on part"); + this.LogError($"Couldn't find transform named '{value.name}' on part"); continue; } @@ -107,7 +107,7 @@ namespace Restock Renderer[] transformRenderers = transform.GetComponentsInChildren(); if (transformRenderers.Length == 0) - Debug.LogError($"No renderers found on transform '{transform.name}' or its children"); + this.LogError($"No renderers found on transform '{transform.name}' or its children"); else renderers.Concat(transform.GetComponentsInChildren()); } @@ -121,7 +121,7 @@ namespace Restock Transform modelTransform = part.partTransform.Find("model"); if (modelTransform == null) - Debug.LogError("Couldn't find model transform"); + this.LogError("Couldn't find model transform"); else renderers = modelTransform.GetComponentsInChildren(); } diff --git a/Source/Restock/PartModuleExtensions.cs b/Source/Restock/PartModuleExtensions.cs new file mode 100644 index 00000000..51834e53 --- /dev/null +++ b/Source/Restock/PartModuleExtensions.cs @@ -0,0 +1,16 @@ +using System; +using UnityEngine; + +namespace Restock +{ + public static class PartModuleExtensions + { + public static void Log(this PartModule module, string message) => Debug.Log(FormatMessage(module, message)); + public static void LogWarning(this PartModule module, string message) => Debug.LogWarning(FormatMessage(module, message)); + public static void LogError(this PartModule module, string message) => Debug.LogError(FormatMessage(module, message)); + public static void LogException(this PartModule module, string message, Exception exception) => Debug.LogException(new Exception(FormatMessage(module, message), exception)); + + private static string FormatMessage(PartModule module, string message) => $"[{GetPartName(module.part)} {module.GetType()}] {message}"; + private static string GetPartName(Part part) => part.partInfo?.name ?? part.name; + } +}