fix: Resolved issues w/ addition of BepInEx

Author: KaBooMa

S1API/Dialogues/DialogueInjector.cs

@@ -1,16 +1,20 @@
 using System.Collections.Generic;
-
 using UnityEngine;
-using MelonLoader;
 using S1API.Dialogues;
+#if (IL2CPPMELON || MONOMELON)
+using MelonLoader;
+#endif
+
 #if IL2CPPMELON || IL2CPPBEPINEX
 using Il2CppScheduleOne.Dialogue;
 using Il2CppScheduleOne.NPCs;
 using Il2CppScheduleOne.NPCs.Schedules;
+using Il2CppFishNet;
 #else
 using ScheduleOne.Dialogue;
 using ScheduleOne.NPCs;
 using ScheduleOne.NPCs.Schedules;
+using FishNet;
 #endif
 /// <summary>
 /// The DialogueInjector class is a static utility that facilitates the injection of custom dialogue entries
@@ -54,8 +58,12 @@ private static void HookUpdateLoop()
     {
         if (isHooked) return;
         isHooked = true;
-
+        
+#if (IL2CPPMELON || MONOMELON)
         MelonCoroutines.Start(WaitForNPCsAndInject());
+#elif (IL2CPPBEPINEX || MONOBEPINEX)
+        InstanceFinder.TimeManager.StartCoroutine(WaitForNPCsAndInject());
+#endif
     }
 
     /// <summary>
@@ -117,7 +125,7 @@ private static void TryInject(DialogueInjection injection, NPC npc)
         DialogueNodeData node = null;
         for (int i = 0; i < container.DialogueNodeData.Count; i++)
         {
-            var n = container.DialogueNodeData[i];
+            var n = container.DialogueNodeData.ToArray()[i];
             if (n != null && n.Guid == injection.FromNodeGuid)
             {
                 node = n;
@@ -158,6 +166,7 @@ private static void TryInject(DialogueInjection injection, NPC npc)
 
         DialogueChoiceListener.Register(handler, injection.ChoiceLabel, injection.OnConfirmed);
 
-        MelonLogger.Msg($"[DialogueInjector] Injected '{injection.ChoiceLabel}' into NPC '{npc.name}'");
+        // TODO (@omar-akermi): Can you convert this to the new logger pls?
+        // MelonLogger.Msg($"[DialogueInjector] Injected '{injection.ChoiceLabel}' into NPC '{npc.name}'");
     }
 }

S1API/Internal/Utils/CrossType.cs

@@ -1,6 +1,6 @@
-#if (MONOMELON || MONOBEPINEX)
+#if (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
 using System;
-# elif (IL2CPPMELON || IL2CPPBEPINEX)
+# elif (IL2CPPMELON)
 using Il2CppSystem;
 using Il2CppInterop.Runtime;
 using Il2CppInterop.Runtime.InteropTypes;
@@ -21,9 +21,9 @@ internal static class CrossType
         /// <returns>The type of the class.</returns>
         internal static Type Of<T>()
         {
-#if (MONOMELON || MONOBEPINEX)
+#if (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
             return typeof(T);
-# elif (IL2CPPMELON || IL2CPPBEPINEX)
+# elif (IL2CPPMELON)
             return Il2CppType.Of<T>();
 #endif
         }
@@ -36,13 +36,13 @@ internal static Type Of<T>()
         /// <typeparam name="T">The class we're checking against.</typeparam>
         /// <returns>Whether obj is of class T or not.</returns>
         internal static bool Is<T>(object obj, out T result)
-#if (IL2CPPMELON || IL2CPPBEPINEX)
+#if (IL2CPPMELON)
             where T : Il2CppObjectBase
-#elif (MONOMELON || MONOBEPINEX)
+#elif (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
             where T : class
 #endif
         {
-#if (IL2CPPMELON || IL2CPPBEPINEX)
+#if (IL2CPPMELON)
             if (obj is Object il2CppObj)
             {
                 Type il2CppType = Il2CppType.Of<T>();
@@ -52,7 +52,7 @@ internal static bool Is<T>(object obj, out T result)
                     return true;
                 }
             }
-#elif (MONOMELON || MONOBEPINEX)
+#elif (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
             if (obj is T t)
             {
                 result = t;
@@ -71,15 +71,15 @@ internal static bool Is<T>(object obj, out T result)
         /// <typeparam name="T">The type to cast to.</typeparam>
         /// <returns>The object cast to the specified type.</returns>
         internal static T As<T>(object obj)
-#if (IL2CPPMELON || IL2CPPBEPINEX)
+#if (IL2CPPMELON)
             where T : Il2CppObjectBase
-#elif (MONOMELON || MONOBEPINEX)
+#elif (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
             where T : class
 #endif
             =>
-#if (IL2CPPMELON || IL2CPPBEPINEX)
+#if (IL2CPPMELON)
                 obj is Object il2CppObj ? il2CppObj.Cast<T>() : null!;
-#elif (MONOMELON || MONOBEPINEX)
+#elif (MONOMELON || MONOBEPINEX || IL2CPPBEPINEX)
                 (T)obj;
 #endif
     }