cleanup and output (#32)

amazingalek · web-flow · commit f5eef6670786 · 2019-12-28T14:03:02.000+01:00
diff --git a/OWML.Common/IModBehaviour.cs b/OWML.Common/IModBehaviour.cs
diff --git a/OWML.Common/OWML.Common.csproj b/OWML.Common/OWML.Common.csproj
@@ -57,7 +57,6 @@
     <Compile Include="IHarmonyHelper.cs" />
     <Compile Include="IModAssets.cs" />
     <Compile Include="IModAsset.cs" />
-    <Compile Include="IModBehaviour.cs" />
     <Compile Include="IModConfig.cs" />
     <Compile Include="IModEvents.cs" />
     <Compile Include="IModFinder.cs" />
diff --git a/OWML.ModHelper.Events/HarmonyHelper.cs b/OWML.ModHelper.Events/HarmonyHelper.cs
@@ -21,7 +21,6 @@ public void AddPrefix<T>(string methodName, Type patchType, string patchMethodNa
             var prefix = patchType.GetAnyMethod(patchMethodName);
             if (prefix == null)
             {
-                _logger.Log("prefix is null");
                 _console.WriteLine("prefix is null");
                 return;
             }
@@ -33,7 +32,6 @@ public void AddPostfix<T>(string methodName, Type patchType, string patchMethodN
             var postfix = patchType.GetAnyMethod(patchMethodName);
             if (postfix == null)
             {
-                _logger.Log("postfix is null");
                 _console.WriteLine("postfix is null");
                 return;
             }
@@ -50,7 +48,6 @@ public void Transpile<T>(string methodName, Type patchType, string patchMethodNa
             var patchMethod = patchType.GetAnyMethod(patchMethodName);
             if (patchMethod == null)
             {
-                _logger.Log("patchMethod is null");
                 _console.WriteLine("patchMethod is null");
                 return;
             }
@@ -70,7 +67,6 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,
             }
             catch (Exception ex)
             {
-                _logger.Log($"Exception while creating harmony instance: {ex}");
                 _console.WriteLine($"Exception while creating harmony instance: {ex}");
                 return;
             }
@@ -83,13 +79,11 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,
             }
             catch (Exception ex)
             {
-                _logger.Log($"Exception while getting method {methodName} of {targetType.Name}: {ex}");
                 _console.WriteLine($"Exception while getting method {methodName} of {targetType.Name}: {ex}");
                 return;
             }
             if (original == null)
             {
-                _logger.Log("original is null");
                 _console.WriteLine("original is null");
                 return;
             }
@@ -103,7 +97,6 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,
             }
             catch (Exception ex)
             {
-                _logger.Log($"Exception while patching {targetType.Name}: {ex}");
                 _console.WriteLine($"Exception while patching {targetType.Name}: {ex}");
             }
         }
diff --git a/OWML.ModHelper.Events/TypeExtensions.cs b/OWML.ModHelper.Events/TypeExtensions.cs
@@ -57,7 +57,6 @@ public static void SetValue(this object obj, string name, object value)
             if (property != null)
             {
                 property.SetValue(obj, value, null);
-                return;
             }
         }
 
diff --git a/OWML.ModHelper/ModBehaviour.cs b/OWML.ModHelper/ModBehaviour.cs
@@ -3,7 +3,7 @@
 
 namespace OWML.ModHelper
 {
-    public class ModBehaviour : MonoBehaviour, IModBehaviour
+    public class ModBehaviour : MonoBehaviour
     {
         public static IModHelper ModHelper;
 
diff --git a/OWML.ModHelper/ModConsole.cs b/OWML.ModHelper/ModConsole.cs
@@ -8,14 +8,17 @@ namespace OWML.ModHelper
     public class ModConsole : IModConsole
     {
         private readonly FileStream _writer;
+        private readonly IModLogger _logger;
 
-        public ModConsole(IModConfig config)
+        public ModConsole(IModConfig config, IModLogger logger)
         {
+            _logger = logger;
             _writer = File.Open(config.OutputFilePath, FileMode.Create, FileAccess.Write, FileShare.ReadWrite);
         }
 
         public void WriteLine(string s)
         {
+            _logger.Log(s);
             var bytes = Encoding.UTF8.GetBytes(s + Environment.NewLine);
             _writer.Write(bytes, 0, bytes.Length);
             _writer.Flush();
diff --git a/OWML.ModLoader/ModLoader.cs b/OWML.ModLoader/ModLoader.cs
@@ -11,35 +11,23 @@ namespace OWML.ModLoader
     public class ModLoader
     {
         private static readonly string ConfigPath = $"{Application.dataPath}/Managed/OWML.Config.json";
-        private static readonly string SecondaryLogPath = $"{Application.dataPath}/Resources/OWML.Output.txt";
 
         public static void LoadMods()
         {
-            SecondaryLog($"In {nameof(ModLoader)}.{nameof(LoadMods)}!");
-            SecondaryLog("Getting config...");
             var config = GetConfig();
             if (config == null)
             {
-                SecondaryLog("Config is null");
                 return;
             }
-            SecondaryLog("Got config!");
-            SecondaryLog("Loading mods...");
-            try
-            {
-                var logger = new ModLogger(config);
-                var console = new ModConsole(config);
-                var harmonyHelper = new HarmonyHelper(logger, console);
-                var events = new ModEvents(harmonyHelper);
-                var modFinder = new ModFinder(config);
-                var owo = new Owo(modFinder, logger, console, config, harmonyHelper, events);
-                owo.LoadMods();
-                SecondaryLog("Loaded mods");
-            }
-            catch (Exception ex)
-            {
-                SecondaryLog("Error while loading mods: " + ex);
-            }
+            var logger = new ModLogger(config);
+            logger.Log("Got config!");
+            var console = new ModConsole(config, logger);
+            console.WriteLine("Mod loader has been initialized.");
+            var harmonyHelper = new HarmonyHelper(logger, console);
+            var events = new ModEvents(harmonyHelper);
+            var modFinder = new ModFinder(config);
+            var owo = new Owo(modFinder, logger, console, config, harmonyHelper, events);
+            owo.LoadMods();
         }
 
         private static IModConfig GetConfig()
@@ -49,17 +37,11 @@ private static IModConfig GetConfig()
                 var json = File.ReadAllText(ConfigPath);
                 return JsonConvert.DeserializeObject<ModConfig>(json);
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                SecondaryLog("Error while loading config: " + ex);
                 return null;
             }
         }
 
-        private static void SecondaryLog(string s)
-        {
-            File.AppendAllText(SecondaryLogPath, $"{DateTime.Now}: {s}{Environment.NewLine}");
-        }
-
     }
 }
diff --git a/OWML.ModLoader/Owo.cs b/OWML.ModLoader/Owo.cs
@@ -29,9 +29,9 @@ public Owo(IModFinder modFinder, IModLogger logger, IModConsole console, IModCon
 
         public void LoadMods()
         {
-            _logger.Log($"{nameof(Owo)}: {nameof(LoadMods)}");
             if (_config.Verbose)
             {
+                _console.WriteLine("Verbose mod is enabled");
                 Application.logMessageReceived += OnLogMessageReceived;
             }
             var manifests = _modFinder.GetManifests();
@@ -69,11 +69,18 @@ private void LoadMod(IModHelper helper)
             _logger.Log($"Loading {helper.Manifest.UniqueName} ({helper.Manifest.Version})...");
             _logger.Log("Adding mod behaviour...");
             var go = new GameObject(helper.Manifest.UniqueName);
-            var mod = (ModBehaviour)go.AddComponent(modType);
-            _logger.Log("Added! Initializing...");
-            mod.Init(helper);
+            try
+            {
+                var mod = (ModBehaviour)go.AddComponent(modType);
+                _logger.Log("Added! Initializing...");
+                mod.Init(helper);
+            }
+            catch (Exception ex)
+            {
+                _console.WriteLine($"Error while adding/initializing {helper.Manifest.UniqueName}: {ex}");
+                return;
+            }
             _console.WriteLine($"Loaded {helper.Manifest.UniqueName} ({helper.Manifest.Version}).");
-            _logger.Log($"Loaded {helper.Manifest.UniqueName} ({helper.Manifest.Version}).");
         }
 
         private Type LoadModType(IModManifest manifest)
@@ -92,7 +99,6 @@ private Type LoadModType(IModManifest manifest)
             }
             catch (Exception ex)
             {
-                _logger.Log($"Error while trying to get {typeof(ModBehaviour)}: {ex.Message}");
                 _console.WriteLine($"Error while trying to get {typeof(ModBehaviour)}: {ex.Message}");
                 return null;
             }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ public void AddPrefix<T>(string methodName, Type patchType, string patchMethodNa`
`21`	`21`	`var prefix = patchType.GetAnyMethod(patchMethodName);`
`22`	`22`	`if (prefix == null)`
`23`	`23`	`{`
`24`		`- _logger.Log("prefix is null");`
`25`	`24`	`_console.WriteLine("prefix is null");`
`26`	`25`	`return;`
`27`	`26`	`}`
`@@ -33,7 +32,6 @@ public void AddPostfix<T>(string methodName, Type patchType, string patchMethodN`
`33`	`32`	`var postfix = patchType.GetAnyMethod(patchMethodName);`
`34`	`33`	`if (postfix == null)`
`35`	`34`	`{`
`36`		`- _logger.Log("postfix is null");`
`37`	`35`	`_console.WriteLine("postfix is null");`
`38`	`36`	`return;`
`39`	`37`	`}`
`@@ -50,7 +48,6 @@ public void Transpile<T>(string methodName, Type patchType, string patchMethodNa`
`50`	`48`	`var patchMethod = patchType.GetAnyMethod(patchMethodName);`
`51`	`49`	`if (patchMethod == null)`
`52`	`50`	`{`
`53`		`- _logger.Log("patchMethod is null");`
`54`	`51`	`_console.WriteLine("patchMethod is null");`
`55`	`52`	`return;`
`56`	`53`	`}`
`@@ -70,7 +67,6 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,`
`70`	`67`	`}`
`71`	`68`	`catch (Exception ex)`
`72`	`69`	`{`
`73`		`- _logger.Log($"Exception while creating harmony instance: {ex}");`
`74`	`70`	`_console.WriteLine($"Exception while creating harmony instance: {ex}");`
`75`	`71`	`return;`
`76`	`72`	`}`
`@@ -83,13 +79,11 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,`
`83`	`79`	`}`
`84`	`80`	`catch (Exception ex)`
`85`	`81`	`{`
`86`		`- _logger.Log($"Exception while getting method {methodName} of {targetType.Name}: {ex}");`
`87`	`82`	`_console.WriteLine($"Exception while getting method {methodName} of {targetType.Name}: {ex}");`
`88`	`83`	`return;`
`89`	`84`	`}`
`90`	`85`	`if (original == null)`
`91`	`86`	`{`
`92`		`- _logger.Log("original is null");`
`93`	`87`	`_console.WriteLine("original is null");`
`94`	`88`	`return;`
`95`	`89`	`}`
`@@ -103,7 +97,6 @@ private void Patch<T>(string methodName, MethodInfo prefix, MethodInfo postfix,`
`103`	`97`	`}`
`104`	`98`	`catch (Exception ex)`
`105`	`99`	`{`
`106`		`- _logger.Log($"Exception while patching {targetType.Name}: {ex}");`
`107`	`100`	`_console.WriteLine($"Exception while patching {targetType.Name}: {ex}");`
`108`	`101`	`}`
`109`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ public static void SetValue(this object obj, string name, object value)`
`57`	`57`	`if (property != null)`
`58`	`58`	`{`
`59`	`59`	`property.SetValue(obj, value, null);`
`60`		`- return;`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`namespace OWML.ModHelper`
`5`	`5`	`{`
`6`		`- public class ModBehaviour : MonoBehaviour, IModBehaviour`
	`6`	`+ public class ModBehaviour : MonoBehaviour`
`7`	`7`	`{`
`8`	`8`	`public static IModHelper ModHelper;`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -8,14 +8,17 @@ namespace OWML.ModHelper`
`8`	`8`	`public class ModConsole : IModConsole`
`9`	`9`	`{`
`10`	`10`	`private readonly FileStream _writer;`
	`11`	`+ private readonly IModLogger _logger;`
`11`	`12`
`12`		`- public ModConsole(IModConfig config)`
	`13`	`+ public ModConsole(IModConfig config, IModLogger logger)`
`13`	`14`	`{`
	`15`	`+ _logger = logger;`
`14`	`16`	`_writer = File.Open(config.OutputFilePath, FileMode.Create, FileAccess.Write, FileShare.ReadWrite);`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`public void WriteLine(string s)`
`18`	`20`	`{`
	`21`	`+ _logger.Log(s);`
`19`	`22`	`var bytes = Encoding.UTF8.GetBytes(s + Environment.NewLine);`
`20`	`23`	`_writer.Write(bytes, 0, bytes.Length);`
`21`	`24`	`_writer.Flush();`
Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,9 @@ public Owo(IModFinder modFinder, IModLogger logger, IModConsole console, IModCon`
`29`	`29`
`30`	`30`	`public void LoadMods()`
`31`	`31`	`{`
`32`		`- _logger.Log($"{nameof(Owo)}: {nameof(LoadMods)}");`
`33`	`32`	`if (_config.Verbose)`
`34`	`33`	`{`
	`34`	`+ _console.WriteLine("Verbose mod is enabled");`
`35`	`35`	`Application.logMessageReceived += OnLogMessageReceived;`
`36`	`36`	`}`
`37`	`37`	`var manifests = _modFinder.GetManifests();`
`@@ -69,11 +69,18 @@ private void LoadMod(IModHelper helper)`
`69`	`69`	`_logger.Log($"Loading {helper.Manifest.UniqueName} ({helper.Manifest.Version})...");`
`70`	`70`	`_logger.Log("Adding mod behaviour...");`
`71`	`71`	`var go = new GameObject(helper.Manifest.UniqueName);`
`72`		`- var mod = (ModBehaviour)go.AddComponent(modType);`
`73`		`- _logger.Log("Added! Initializing...");`
`74`		`- mod.Init(helper);`
	`72`	`+ try`
	`73`	`+ {`
	`74`	`+ var mod = (ModBehaviour)go.AddComponent(modType);`
	`75`	`+ _logger.Log("Added! Initializing...");`
	`76`	`+ mod.Init(helper);`
	`77`	`+ }`
	`78`	`+ catch (Exception ex)`
	`79`	`+ {`
	`80`	`+ _console.WriteLine($"Error while adding/initializing {helper.Manifest.UniqueName}: {ex}");`
	`81`	`+ return;`
	`82`	`+ }`
`75`	`83`	`_console.WriteLine($"Loaded {helper.Manifest.UniqueName} ({helper.Manifest.Version}).");`
`76`		`- _logger.Log($"Loaded {helper.Manifest.UniqueName} ({helper.Manifest.Version}).");`
`77`	`84`	`}`
`78`	`85`
`79`	`86`	`private Type LoadModType(IModManifest manifest)`
`@@ -92,7 +99,6 @@ private Type LoadModType(IModManifest manifest)`
`92`	`99`	`}`
`93`	`100`	`catch (Exception ex)`
`94`	`101`	`{`
`95`		`- _logger.Log($"Error while trying to get {typeof(ModBehaviour)}: {ex.Message}");`
`96`	`102`	`_console.WriteLine($"Error while trying to get {typeof(ModBehaviour)}: {ex.Message}");`
`97`	`103`	`return null;`
`98`	`104`	`}`