Fix up monkey implementations with testing

ResoniteModdingGroup · Mar 1, 2025 · f9c2ad7 · f9c2ad7
1 parent 4442e51
commit f9c2ad7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/ShowmanTools/RestrictedCameraAnchors.cs b/ShowmanTools/RestrictedCameraAnchors.cs
@@ -15,10 +15,11 @@ namespace ShowmanTools
     [HarmonyPatchCategory(nameof(RestrictedCameraAnchors))]
     internal sealed class RestrictedCameraAnchors : ResoniteMonkey<RestrictedCameraAnchors>
     {
-        private static string slotFieldName = null!;
-
-        private static void Postfix(InteractiveCameraControl __instance)
+        [HarmonyPostfix]
+        private static async Task PostfixAsync(Task __result, InteractiveCameraControl __instance)
         {
+            await __result;
+
             if (!Enabled)
                 return;
 
@@ -30,7 +31,7 @@ private static void Postfix(InteractiveCameraControl __instance)
                 return;
             }
 
-            lastAnchor.GetComponentInChildren<Grabbable>().OnlyUsers.Add().Target = __instance.LocalUser;
+            lastAnchor.GetComponentInChildren<Grabbable>().OnlyUsers.Add().Target = lastAnchor.LocalUser;
         }
 
         private static MethodBase TargetMethod()
@@ -40,15 +41,6 @@ private static MethodBase TargetMethod()
                     && method.GetCustomAttribute<CompilerGeneratedAttribute>() is not null);
 
             return taskMethod;
-
-            var moveNextMethod = AccessTools.AsyncMoveNext(taskMethod);
-
-            var slotField = AccessTools.GetDeclaredFields(moveNextMethod.DeclaringType)
-                .First(field => field.FieldType == typeof(Slot));
-
-            var slotFieldName = slotField.Name;
-
-            return moveNextMethod;
         }
     }
 }
diff --git a/ShowmanTools/ShowMustGoOn.cs b/ShowmanTools/ShowMustGoOn.cs
@@ -17,7 +17,7 @@ namespace ShowmanTools
     [HarmonyPatch(typeof(AudioStreamInterface), nameof(AudioStreamInterface.SetAudioStream))]
     internal sealed class ShowMustGoOn : ConfiguredResoniteMonkey<ShowMustGoOn, ShowMustGoOnConfig>
     {
-        private static readonly ConditionalWeakTable<IAudioStream, Component?> _audioStreams = new();
+        private static readonly ConditionalWeakTable<IAudioStream, object?> _audioStreams = new();
 
         private static void Postfix(IAudioStream source)
         {
@@ -26,19 +26,23 @@ private static void Postfix(IAudioStream source)
         }
 
         [HarmonyPatch]
+        [HarmonyPatchCategory(nameof(ShowMustGoOn))]
         private static class UserAudioStreamPatch
         {
             private static bool MuteCheck(Component audioStream)
             {
                 var world = audioStream.World;
-                var stream = Traverse.Create(audioStream)
+                var stream = (IAudioStream)Traverse.Create(audioStream)
                     .Field(nameof(UserAudioStream<MonoSample>.Stream))
-                    .GetValue<IAudioStream>();
+                    .GetValue<ISyncRef>()
+                    .Target;
+
+                var isAudioStream = _audioStreams.TryGetValue(stream, out _);
 
                 return world.Focus == World.WorldFocus.Focused
                     || (world.Focus == World.WorldFocus.Background
-                        && (ConfigSection.EnableVoiceWhileUnfocused
-                            || (ConfigSection.EnableStreamingWhileUnfocused && _audioStreams.TryGetValue(stream, out _))));
+                        && ((!isAudioStream && ConfigSection.EnableVoiceWhileUnfocused)
+                            || (isAudioStream && ConfigSection.EnableStreamingWhileUnfocused)));
             }
 
             private static IEnumerable<MethodBase> TargetMethods()