diff --git a/IPA/IPA.csproj b/IPA/IPA.csproj index e3ce2d01..cf4e8634 100644 --- a/IPA/IPA.csproj +++ b/IPA/IPA.csproj @@ -40,19 +40,19 @@ - ..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll True - ..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.Mdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll False - ..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.Pdb.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll False - ..\packages\Mono.Cecil.0.9.6.4\lib\net35\Mono.Cecil.Rocks.dll + ..\packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll False diff --git a/IPA/obj/Debug/IPA.csproj.CoreCompileInputs.cache b/IPA/obj/Debug/IPA.csproj.CoreCompileInputs.cache index bb31db24..d5116832 100644 --- a/IPA/obj/Debug/IPA.csproj.CoreCompileInputs.cache +++ b/IPA/obj/Debug/IPA.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -6744afebdfdc05ced46858bdac21e047b0d6e43f +33cd6c2ad2a5a7958d22e4f89028cf896273055b diff --git a/IPA/packages.config b/IPA/packages.config index 74fdd86f..f30e7947 100644 --- a/IPA/packages.config +++ b/IPA/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/IllusionInjector/BeatSaber/CompositeBSPlugin.cs b/IllusionInjector/BeatSaber/CompositeBSPlugin.cs index b2cb45a4..37dba73b 100644 --- a/IllusionInjector/BeatSaber/CompositeBSPlugin.cs +++ b/IllusionInjector/BeatSaber/CompositeBSPlugin.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using UnityEngine; using UnityEngine.SceneManagement; -using Logger = IllusionPlugin.Logger; +using Logger = IllusionInjector.Logging.Logger; namespace IllusionInjector { public class CompositeBSPlugin : IBeatSaberPlugin @@ -13,8 +13,6 @@ namespace IllusionInjector { IEnumerable plugins; private delegate void CompositeCall(IBeatSaberPlugin plugin); - - private Logger debugLogger => PluginManager.debugLogger; public CompositeBSPlugin(IEnumerable plugins) { this.plugins = plugins; @@ -34,7 +32,7 @@ namespace IllusionInjector { plugin.OnSceneLoaded(scene, sceneMode); } catch (Exception ex) { - debugLogger.Exception($"{plugin.Name}: {ex}"); + Logger.log.Error($"{plugin.Name}: {ex}"); } } } @@ -45,7 +43,7 @@ namespace IllusionInjector { plugin.OnSceneUnloaded(scene); } catch (Exception ex) { - debugLogger.Exception($"{plugin.Name}: {ex}"); + Logger.log.Error($"{plugin.Name}: {ex}"); } } } @@ -56,7 +54,7 @@ namespace IllusionInjector { plugin.OnActiveSceneChanged(prevScene, nextScene); } catch (Exception ex) { - debugLogger.Exception($"{plugin.Name}: {ex}"); + Logger.log.Error($"{plugin.Name}: {ex}"); } } } @@ -67,7 +65,7 @@ namespace IllusionInjector { callback(plugin); } catch (Exception ex) { - debugLogger.Exception($"{plugin.Name}: {ex}"); + Logger.log.Error($"{plugin.Name}: {ex}"); } } } diff --git a/IllusionInjector/IPA/CompositeIPAPlugin.cs b/IllusionInjector/IPA/CompositeIPAPlugin.cs index 5b64bfaa..001677a6 100644 --- a/IllusionInjector/IPA/CompositeIPAPlugin.cs +++ b/IllusionInjector/IPA/CompositeIPAPlugin.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using UnityEngine; using UnityEngine.SceneManagement; -using Logger = IllusionPlugin.Logger; +using Logger = IllusionInjector.Logging.Logger; namespace IllusionInjector { #pragma warning disable CS0618 // Type or member is obsolete @@ -14,8 +14,6 @@ namespace IllusionInjector { IEnumerable plugins; private delegate void CompositeCall(IPlugin plugin); - - private Logger debugLogger => PluginManager.debugLogger; public CompositeIPAPlugin(IEnumerable plugins) { this.plugins = plugins; @@ -35,7 +33,7 @@ namespace IllusionInjector { callback(plugin); } catch (Exception ex) { - debugLogger.Exception($"{plugin.Name}: {ex}"); + Logger.log.Error($"{plugin.Name}: {ex}"); } } } diff --git a/IllusionInjector/IllusionInjector.csproj b/IllusionInjector/IllusionInjector.csproj index 7008659c..a8a56c31 100644 --- a/IllusionInjector/IllusionInjector.csproj +++ b/IllusionInjector/IllusionInjector.csproj @@ -45,6 +45,9 @@ ..\Libs\UnityEngine.CoreModule.dll False + + ..\packages\zlib.net.1.0.4.0\lib\zlib.net.dll + @@ -52,6 +55,10 @@ + + + + @@ -62,6 +69,9 @@ IllusionPlugin + + +