Update for new MonkeyLoader version

ResoniteModdingGroup · Aug 26, 2024 · c95d552 · c95d552
1 parent 7ed8b12
commit c95d552
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 10 deletions.
diff --git a/MonkeyLoader.Resonite.Data/MonkeyLoader.Resonite.Data.csproj b/MonkeyLoader.Resonite.Data/MonkeyLoader.Resonite.Data.csproj
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonkeyLoader" Version="0.22.8-beta" />
+    <PackageReference Include="MonkeyLoader" Version="0.22.11-beta" />
     <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/MonkeyLoader.Resonite.Integration/DataFeeds/Settings/ModMetadataSettingsItems.cs b/MonkeyLoader.Resonite.Integration/DataFeeds/Settings/ModMetadataSettingsItems.cs
@@ -19,7 +19,7 @@ public override IAsyncEnumerable<DataFeedItem> Apply(IAsyncEnumerable<DataFeedIt
         {
             var path = parameters.Path;
 
-            if (path.Count is < 2 or > 3 || path[0] is not SettingsHelpers.MonkeyLoader)
+            if (path.Count is < 2 or > 3 || path[0] is not SettingsHelpers.MonkeyLoader || path[1] is SettingsHelpers.MonkeyLoader)
                 return current;
 
             if (path.Count == 3 && path[2] is not SettingsHelpers.MetaData)

diff --git a/MonkeyLoader.Resonite.Integration/DataFeeds/Settings/MonkeySettingsItems.cs b/MonkeyLoader.Resonite.Integration/DataFeeds/Settings/MonkeySettingsItems.cs
@@ -19,7 +19,7 @@ public override IAsyncEnumerable<DataFeedItem> Apply(IAsyncEnumerable<DataFeedIt
         {
             var path = parameters.Path;
 
-            if (path.Count is < 2 or > 4 || path[0] is not SettingsHelpers.MonkeyLoader)
+            if (path.Count is < 2 or > 4 || path[0] is not SettingsHelpers.MonkeyLoader || path[1] is SettingsHelpers.MonkeyLoader)
                 return current;
 
             if (path.Count >= 3 && path[2] is not SettingsHelpers.MonkeyToggles)

diff --git a/MonkeyLoader.Resonite.Integration/EngineInitHook.cs b/MonkeyLoader.Resonite.Integration/EngineInitHook.cs
@@ -54,7 +54,7 @@ private static void InitializePrefix(Engine __instance)
         {
             Logger.Info(() => "Engine started initializing! Adding shutdown hooks and executing EngineInit hooks on ResoniteMonkeys!");
 
-            Mod.Loader.LoggingController.Handler += ResoniteLoggingHandler.Instance;
+            Mod.Loader.Logging.Controller.Handler += ResoniteLoggingHandler.Instance;
 
             __instance.OnShutdownRequest += OnEngineShutdownRequested;
             __instance.OnShutdown += OnEngineShutdown;

diff --git a/MonkeyLoader.Resonite.Integration/MonkeyLoader.Resonite.Integration.csproj b/MonkeyLoader.Resonite.Integration/MonkeyLoader.Resonite.Integration.csproj
@@ -49,7 +49,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonkeyLoader" Version="0.22.8-beta" />
+    <PackageReference Include="MonkeyLoader" Version="0.22.11-beta" />
     <PackageReference Include="PolySharp" Version="1.14.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/MonkeyLoader.Resonite.Unity/MonkeyLoader.Resonite.Unity.csproj b/MonkeyLoader.Resonite.Unity/MonkeyLoader.Resonite.Unity.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MonkeyLoader" Version="0.22.8-beta" />
+    <PackageReference Include="MonkeyLoader" Version="0.22.11-beta" />
     <PackageReference Include="MonkeyLoader.GamePacks.Resonite" Version="0.19.0-beta-enumerabletoolkit" />
     <PackageReference Include="MonkeyLoader.GamePacks.Unity" Version="0.6.0-beta" />
     <PackageReference Include="PolySharp" Version="1.14.1">

diff --git a/MonkeyLoader.Resonite.Unity/UnityLoadProgressIndicator.cs b/MonkeyLoader.Resonite.Unity/UnityLoadProgressIndicator.cs
@@ -80,14 +80,11 @@ public bool SetSubphase(string? subphase)
 
             _loadProgress.SetSubphase(subphase);
 
-            Logger.Trace(() => $"Set EngineLoadProgress subphase to: {subphase}");
-
             return true;
         }
 
         /// <inheritdoc/>
-        protected override IEnumerable<IFeaturePatch> GetFeaturePatches()
-            => Enumerable.Empty<IFeaturePatch>();
+        protected override IEnumerable<IFeaturePatch> GetFeaturePatches() => [];
 
         /// <inheritdoc/>
         protected override bool OnFirstSceneReady(Scene scene)