Merge pull request #15 from commandblox/dev

v0.1.4

Author: WackyModer

Logger.cs

@@ -1,6 +1,9 @@
-using System;
+using HarmonyLib;
+using System;
 using System.Diagnostics;
 using System.IO;
+using UnityEngine;
+
 
 public static class Logger
 {
@@ -29,6 +32,7 @@ private static string GetCallingClass()
         return null;
     }
 
+
     /// <summary>
     /// Initializes the console.
     /// 
@@ -58,6 +62,9 @@ internal static void InitLogger()
         Console.SetOut(sw);
 
 
+        Application.logMessageReceived += HandleUnityLogs;
+
+
         Logger.Log("Log test");
         Logger.Warning("Warn test");
         Logger.Error("Error test");
@@ -67,13 +74,55 @@ internal static void InitLogger()
         Logger.Log("Logging initialized.");
 
     }
+    private static string PrevMSG = "";
+    private static void HandleUnityLogs(string condition, string stackTrace, LogType type)
+    {
+        if (condition == PrevMSG)
+        {
+            return;
+        }
+        switch (type)
+        {
+            case LogType.Error:
+                Logger.Error(condition, true);
+                Logger.Error(stackTrace, true); 
+                break;
+            case LogType.Warning:
+                Logger.Warning(condition, true); 
+                break;
+            case LogType.Log:
+                Logger.Log(condition, true); 
+                break;
+            case LogType.Exception:
+                Logger.Error(condition, true);
+                Logger.Error(stackTrace, true); 
+                break;
+            case LogType.Assert:
+                Logger.Error(condition, true);
+                Logger.Error(stackTrace, true); 
+                break;
+        }
+    }
+
 
     /// <summary>
     /// Logs into console and output_log.txt
     /// </summary>
-    public static void Log(string message)
+    public static void Log(string message, bool doublestack = false)
     {
-        string formattedString = $"[INFO    : {GetCallingClass()}] {message}";
+        string formattedString;
+        if (doublestack)
+        {
+
+            formattedString = $"[INFO    : Unity] {message}";
+        }
+        else
+        {
+            formattedString = $"[INFO    : {GetCallingClass()}] {message}";
+        }
+        //string formattedString = $"[INFO    : {GetCallingClass()}] {message}";
+
+        PrevMSG = formattedString;
 
         Console.ForegroundColor = ConsoleColor.Gray;
 
@@ -84,9 +133,20 @@ public static void Log(string message)
     /// <summary>
     /// Logs a warning into console and logs to output_log.txt
     /// </summary>
-    public static void Warning(string message)
+    public static void Warning(string message, bool doublestack = false)
     {
-        string formattedString = $"[WARNING : {GetCallingClass()}] {message}";
+        string formattedString;
+        if (doublestack)
+        {
+
+            formattedString = $"[WARNING : Unity] {message}";
+        }
+        else
+        {
+            formattedString = $"[WARNING : {GetCallingClass()}] {message}";
+        }
+
+        PrevMSG = formattedString;
 
         Console.ForegroundColor = ConsoleColor.Yellow;
 
@@ -99,9 +159,21 @@ public static void Warning(string message)
     /// <summary>
     /// Logs an error into console and logs to output_log.txt
     /// </summary>
-    public static void Error(string message)
+    public static void Error(string message, bool doublestack = false)
     {
-        string formattedString = $"[ERROR   : {GetCallingClass()}] {message}";
+        string formattedString;
+        if (doublestack)
+        {
+
+            formattedString = $"[ERROR   : Unity] {message}";
+        }
+        else
+        {
+            formattedString = $"[ERROR   : {GetCallingClass()}] {message}";
+        }
+        //string formattedString = $"[ERROR   : {GetCallingClass()}] {message}";
+
+        PrevMSG = formattedString;
 
         Console.ForegroundColor = ConsoleColor.Red;
 
@@ -116,13 +188,25 @@ public static void Error(string message)
     /// 
     /// <c> VERBOSE LOGGING NEEDS TO BE ENABLED </c>
     /// </summary>
-    public static void Debug(string message)
+    public static void Debug(string message, bool doublestack = false)
     {
         if (!Splotch.Config.LoadedSplotchConfig.verboseLoggingEnabled)
         {
             return;
         }
-        string formattedString = $"[DEBUG   : {GetCallingClass()}] {message}";
+
+        string formattedString;
+        if (doublestack)
+        {
+
+            formattedString = $"[DEBUG   : Unity] {message}";
+        }
+        else
+        {
+            formattedString = $"[DEBUG   : {GetCallingClass()}] {message}";
+        }
+
+        PrevMSG = formattedString;
 
         Console.ForegroundColor = ConsoleColor.White;
 

Properties/AssemblyInfo.cs

@@ -37,4 +37,4 @@
 // X: major versions
 // Y: feature addition/ removal
 // Z: small patch/ bugfix
-[assembly: AssemblyVersion("0.1.3")]
+[assembly: AssemblyVersion("0.1.4")]