Revert "Cleanup"

This reverts commit 05e7bd2.
LavaGang · Dec 8, 2021 · 74d5677 · 74d5677
1 parent 05e7bd2
commit 74d5677
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 47 deletions.
diff --git a/Bootstrap/Utils/Console.cpp b/Bootstrap/Utils/Console.cpp
@@ -58,11 +58,11 @@ bool Console::Initialize()
 	if (Core::IsRunningInWine())
 		UseLegacyColoring = true;
 
-	mode |= ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT;
+	mode |= 0x3;
 	if (!SetConsoleMode(OutputHandle, mode))
 	{
 		UseLegacyColoring = true;
-		mode &= ~ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT;
+		mode &= ~0x3;
 	}
 	else
 	{
@@ -73,6 +73,7 @@ bool Console::Initialize()
 			mode &= ~ENABLE_VIRTUAL_TERMINAL_PROCESSING;
 		}
 	}
+
 	mode |= ENABLE_EXTENDED_FLAGS;
 	mode &= ~ENABLE_MOUSE_INPUT;
 	mode &= ~ENABLE_WINDOW_INPUT;

diff --git a/SM_Il2Cpp/Main.cs b/SM_Il2Cpp/Main.cs
@@ -57,6 +57,7 @@ private static ISupportModule_To Initialize(ISupportModule_From interface_from)
             }
             catch (Exception ex) { MelonLogger.Error($"SceneManager.sceneUnloaded override failed: {ex}"); }
 
+            /*
             try
             {
                 Camera.onPostRender = (
@@ -66,8 +67,9 @@ private static ISupportModule_To Initialize(ISupportModule_From interface_from)
                     );
             }
             catch (Exception ex) { MelonLogger.Error($"Camera.onPostRender override failed: {ex}"); }
+            */
 
-            //MonoEnumeratorWrapper.Register();
+            MonoEnumeratorWrapper.Register();
 
             ClassInjector.RegisterTypeInIl2Cpp<SM_Component>();
             SM_Component.Create();
@@ -77,8 +79,8 @@ private static ISupportModule_To Initialize(ISupportModule_From interface_from)
         private static void OnSceneLoad(Scene scene, LoadSceneMode mode) { if (scene == null) return; if (MelonUtils.IsBONEWORKS) BONEWORKS_SceneHandler.OnSceneLoad(scene.buildIndex, scene.name); else Interface.OnSceneWasLoaded(scene.buildIndex, scene.name); }
         private static void OnSceneUnload(Scene scene) { if (scene == null) return; Interface.OnSceneWasUnloaded(scene.buildIndex, scene.name); }
 
-        private static Camera OnPostRenderCam = null;
-        private static void OnPostRender(Camera cam) { if (OnPostRenderCam == null) OnPostRenderCam = cam; if (OnPostRenderCam == cam) Coroutines.ProcessWaitForEndOfFrame(); }
+        //private static Camera OnPostRenderCam = null;
+        //private static void OnPostRender(Camera cam) { if (OnPostRenderCam == null) OnPostRenderCam = cam; if (OnPostRenderCam == cam) Coroutines.ProcessWaitForEndOfFrame(); }
 
         private static Assembly Il2Cppmscorlib = null;
         private static Type streamType = null;

diff --git a/SM_Il2Cpp/MonoEnumeratorWrapper.cs b/SM_Il2Cpp/MonoEnumeratorWrapper.cs
@@ -14,21 +14,18 @@ public MonoEnumeratorWrapper(IntPtr ptr) : base(ptr) { }
         public MonoEnumeratorWrapper(IEnumerator _enumerator) : base(ClassInjector.DerivedConstructorPointer<MonoEnumeratorWrapper>())
         {
             ClassInjector.DerivedConstructorBody(this);
-            enumerator = _enumerator ?? throw new NullReferenceException("routine is null");
+            enumerator = _enumerator ?? throw new NullReferenceException("routine is null");;
         }
 
         public Il2CppSystem.Object /*IEnumerator.*/Current
         {
-            get
-            {
-                return enumerator.Current switch
+            get => enumerator.Current switch
                 {
-                    null => null,
                     IEnumerator next => new MonoEnumeratorWrapper(next),
                     Il2CppSystem.Object il2cppObject => il2cppObject,
+                    null => null,
                     _ => throw new NotSupportedException($"{enumerator.GetType()}: Unsupported type {enumerator.Current.GetType()}"),
                 };
-            }
         }
 
         public bool MoveNext() => enumerator.MoveNext();

diff --git a/SM_Il2Cpp/SM_Component.cs b/SM_Il2Cpp/SM_Component.cs
@@ -32,26 +32,22 @@ internal void Destroy()
         void Start() => SiblingFix();
         void Awake()
         {
-            /*
             foreach (var queuedCoroutine in SupportModule_To.QueuedCoroutines)
-                if (queuedCoroutine != null)
-                    StartCoroutine(new Il2CppSystem.Collections.IEnumerator(new MonoEnumeratorWrapper(queuedCoroutine).Pointer));
+                StartCoroutine(new Il2CppSystem.Collections.IEnumerator(new MonoEnumeratorWrapper(queuedCoroutine).Pointer));
             SupportModule_To.QueuedCoroutines.Clear();
-            SupportModule_To.ShouldUseQueue = false;
-            */
         }
         void Update()
         {
             SiblingFix();
             if (MelonUtils.IsBONEWORKS)
                 BONEWORKS_SceneHandler.OnUpdate();
             Main.Interface.Update();
-            Coroutines.Process();
+            //Coroutines.Process();
         }
         void FixedUpdate()
         {
             Main.Interface.FixedUpdate();
-            Coroutines.ProcessWaitForFixedUpdate();
+            //Coroutines.ProcessWaitForFixedUpdate();
         }
         void LateUpdate() => Main.Interface.LateUpdate();
         void OnGUI() => Main.Interface.OnGUI();

diff --git a/SM_Il2Cpp/SupportModule_To.cs b/SM_Il2Cpp/SupportModule_To.cs
@@ -6,10 +6,8 @@ namespace MelonLoader.Support
 {
     internal class SupportModule_To : ISupportModule_To
     {
-        internal static bool ShouldUseQueue = true;
         internal static readonly List<IEnumerator> QueuedCoroutines = new List<IEnumerator>();
 
-        /*
         public object StartCoroutine(IEnumerator coroutine)
         {
             if (Main.component != null)
@@ -24,34 +22,9 @@ public void StopCoroutine(object coroutineToken)
             else
                 Main.component.StopCoroutine(coroutineToken as Coroutine);
         }
-        */
 
-        /*
-        public object StartCoroutine(IEnumerator coroutine)
-        {
-            if (coroutine != null)
-            {
-                if (!ShouldUseQueue)
-                    return Main.component.StartCoroutine(new Il2CppSystem.Collections.IEnumerator(new MonoEnumeratorWrapper(coroutine).Pointer));
-                QueuedCoroutines.Add(coroutine);
-            }
-            return coroutine;
-        }
-
-        public void StopCoroutine(object coroutineToken)
-        {
-            if (coroutineToken != null)
-            {
-                if (ShouldUseQueue)
-                    QueuedCoroutines.Remove(coroutineToken as IEnumerator);
-                else
-                    Main.component.StopCoroutine(coroutineToken as Coroutine);
-            }
-        }
-        */
-
-        public object StartCoroutine(IEnumerator coroutine) => Coroutines.Start(coroutine);
-        public void StopCoroutine(object coroutineToken) => Coroutines.Stop((IEnumerator)coroutineToken);
+        //public object StartCoroutine(IEnumerator coroutine) => Coroutines.Start(coroutine);
+        //public void StopCoroutine(object coroutineToken) => Coroutines.Stop((IEnumerator)coroutineToken);
 
         public void UnityDebugLog(string msg) => Debug.Log(msg);
     }