Update version to handle logging changes

Author: Banane9

MonkeyLoader.Unity.Integration/MonkeyLoader.GamePacks.Unity.Debug.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>MonkeyLoader.GamePacks.Unity</id>
-    <version>0.4.0-beta</version>
+    <version>0.5.0-beta</version>
     <title>Unity GamePack</title>
     <authors>Banane9</authors>
     <owners>Banane9</owners>
@@ -20,7 +20,7 @@
 
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="MonkeyLoader" version="0.4.0-beta" />
+        <dependency id="MonkeyLoader" version="0.9.0-beta" />
       </group>
     </dependencies>
   </metadata>

MonkeyLoader.Unity.Integration/MonkeyLoader.GamePacks.Unity.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>MonkeyLoader.GamePacks.Unity</id>
-    <version>0.4.0-beta</version>
+    <version>0.5.0-beta</version>
     <title>Unity GamePack</title>
     <authors>Banane9</authors>
     <owners>Banane9</owners>
@@ -20,7 +20,7 @@
 
     <dependencies>
       <group targetFramework=".NETFramework4.6.2">
-        <dependency id="MonkeyLoader" version="0.4.0-beta" />
+        <dependency id="MonkeyLoader" version="0.9.0-beta" />
       </group>
     </dependencies>
   </metadata>

MonkeyLoader.Unity.Integration/MonkeyLoader.Unity.Integration.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-    <Version>0.4.0-beta</Version>
+    <Version>0.5.0-beta</Version>
     <AssemblyTitle>MonkeyLoader.Unity.Integration</AssemblyTitle>
     <AssemblyFileName>$(AssemblyTitle).dll</AssemblyFileName>
     <RootNamespace>MonkeyLoader.Unity</RootNamespace>
@@ -14,7 +14,7 @@
   </Target>
 
   <ItemGroup>
-    <PackageReference Include="MonkeyLoader" Version="0.5.0-beta" />
+    <PackageReference Include="MonkeyLoader" Version="0.9.0-beta" />
     <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

MonkeyLoader.Unity.Integration/UnityHooks.cs

@@ -13,44 +13,52 @@ namespace MonkeyLoader.Unity
 {
     internal sealed class UnityHooks : Monkey<UnityHooks>
     {
-        private static IUnityMonkeyInternal[] UnityMonkeys
-        {
-            get
-            {
-                var monkeys = Mod.Loader.Mods
-                    .GetMonkeysAscending()
-                    .SelectCastable<IMonkey, IUnityMonkeyInternal>()
-                    .ToArray();
-
-                return monkeys;
-            }
-        }
+        private Scene _firstScene;
 
         protected override IEnumerable<IFeaturePatch> GetFeaturePatches() => Enumerable.Empty<IFeaturePatch>();
 
         protected override bool OnLoaded()
         {
-            SceneManager.sceneLoaded += SceneManager_sceneLoaded;
+            SceneManager.sceneLoaded += OnFirstSceneReady;
             Application.quitting += () => Mod.Loader.Shutdown();
 
             return true;
         }
 
-        private void SceneManager_sceneLoaded(Scene scene, LoadSceneMode sceneMode)
+        private void LateRunFirstSceneReady(MonkeyLoader loader, IEnumerable<Mod> mods)
+        {
+            Logger.Info(() => "New mods were loaded! Executing OnFirstSceneReady hooks on UnityMonkeys!");
+
+            RunFirstSceneReadyHooks(mods);
+        }
+
+        private void OnFirstSceneReady(Scene scene, LoadSceneMode sceneMode)
         {
-            Info(() => "First Scene Loaded! Executing OnFirstSceneReady hooks on UnityMonkeys!");
+            _firstScene = scene;
+            SceneManager.sceneLoaded -= OnFirstSceneReady;
+
+            Mod.Loader.ModsRan += LateRunFirstSceneReady;
+            Logger.Info(() => "First Scene Loaded! Executing OnFirstSceneReady hooks on UnityMonkeys!");
+
+            RunFirstSceneReadyHooks(Mod.Loader.Mods);
+        }
+
+        private void RunFirstSceneReadyHooks(IEnumerable<Mod> mods)
+        {
+            var unityMonkeys = mods
+                    .GetMonkeysAscending()
+                    .SelectCastable<IMonkey, IUnityMonkeyInternal>()
+                    .ToArray();
 
-            var unityMonkeys = UnityMonkeys;
             Logger.Trace(() => "Running FirstSceneReady hooks in this order:");
             Logger.Trace(unityMonkeys.Select(uM => new Func<object>(() => $"{uM.Mod.Title}/{uM.Name}")));
 
-            SceneManager.sceneLoaded -= SceneManager_sceneLoaded;
             var sw = Stopwatch.StartNew();
 
             foreach (var unityMonkey in unityMonkeys)
-                unityMonkey.FirstSceneReady(scene);
+                unityMonkey.FirstSceneReady(_firstScene);
 
-            Info(() => $"Done executing OnFirstSceneReady hooks on UnityMonkeys in {sw.ElapsedMilliseconds}ms!");
+            Logger.Info(() => $"Done executing OnFirstSceneReady hooks on UnityMonkeys in {sw.ElapsedMilliseconds}ms!");
         }
     }
 }

MonkeyLoader.Unity.Integration/UnityMonkey.cs

@@ -57,28 +57,28 @@ bool IUnityMonkeyInternal.FirstSceneReady(Scene scene)
         {
             if (Failed)
             {
-                Warn(() => "Monkey already failed Run, skipping OnFirstSceneReady!");
+                Logger.Warn(() => "Monkey already failed Run, skipping OnFirstSceneReady!");
                 return false;
             }
 
             if (FirstSceneReadyRan)
                 throw new InvalidOperationException("A Unity monkey's OnFirstSceneReady() method must only be called once!");
 
             FirstSceneReadyRan = true;
-            Debug(() => "Running OnFirstSceneReady");
+            Logger.Debug(() => "Running OnFirstSceneReady");
 
             try
             {
                 if (!OnFirstSceneReady(scene))
                 {
                     FirstSceneReadyFailed = true;
-                    Warn(() => "OnFirstSceneReady failed!");
+                    Logger.Warn(() => "OnFirstSceneReady failed!");
                 }
             }
             catch (Exception ex)
             {
                 FirstSceneReadyFailed = true;
-                Error(() => ex.Format("OnFirstSceneReady threw an Exception:"));
+                Logger.Error(() => ex.Format("OnFirstSceneReady threw an Exception:"));
             }
 
             return !FirstSceneReadyFailed;