From ae418366591b429fc7dd9785c872fb709636f28e Mon Sep 17 00:00:00 2001
From: Soar Qin <soarchin@gmail.com>
Date: Thu, 26 Oct 2023 21:11:36 +0800
Subject: [PATCH] minor fixes

---
 CheatEnabler/FactoryPatch.cs               | 6 +++++-
 OCBatchBuild/OrbitalCollectorBatchBuild.cs | 2 +-
 UXAssist/GamePatch.cs                      | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CheatEnabler/FactoryPatch.cs b/CheatEnabler/FactoryPatch.cs
index 46eb871..7ea543a 100644
--- a/CheatEnabler/FactoryPatch.cs
+++ b/CheatEnabler/FactoryPatch.cs
@@ -156,7 +156,7 @@ public static class FactoryPatch
         private static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instructions, ILGenerator generator)
         {
             var matcher = new CodeMatcher(instructions, generator);
-            matcher.MatchForward(false,
+            matcher.End().MatchBack(false,
                 new CodeMatch(OpCodes.Ret)
             );
             if (matcher.IsInvalid)
@@ -167,7 +167,11 @@ public static class FactoryPatch
 
             matcher.Advance(-1);
             if (matcher.Opcode != OpCodes.Nop && (matcher.Opcode != OpCodes.Call || !matcher.Instruction.OperandIs(AccessTools.Method(typeof(GC), nameof(GC.Collect)))))
+            {
+                CheatEnabler.Logger.LogWarning($"Failed to patch CreatePrebuilds: last instruction is not `Nop` or `Call GC.Collect()`: {matcher.Instruction}");
                 return matcher.InstructionEnumeration();
+            }
+
             var labels = matcher.Labels;
             matcher.Labels = new List<Label>();
             matcher.Insert(
diff --git a/OCBatchBuild/OrbitalCollectorBatchBuild.cs b/OCBatchBuild/OrbitalCollectorBatchBuild.cs
index f18ee96..bfd554c 100644
--- a/OCBatchBuild/OrbitalCollectorBatchBuild.cs
+++ b/OCBatchBuild/OrbitalCollectorBatchBuild.cs
@@ -34,7 +34,7 @@ public class OrbitalCollectorBatchBuild : BaseUnityPlugin
         var buildPreview = __instance.buildPreviews[0];
         /* Check if is collector station */
         if (!buildPreview.desc.isCollectStation) return;
-       
+
         var factory = __instance.factory;
         var stationPool = factory.transport.stationPool;
         var entityPool = factory.entityPool;
diff --git a/UXAssist/GamePatch.cs b/UXAssist/GamePatch.cs
index 910ce01..a3ecaf7 100644
--- a/UXAssist/GamePatch.cs
+++ b/UXAssist/GamePatch.cs
@@ -33,8 +33,8 @@ public static class GamePatch
         _gamePatch = null;
     }
 
-    [HarmonyPrefix, HarmonyPatch(typeof(Application), nameof(Application.Quit), new Type[]{})]
-    private static void Application_Quit_Prefix()
+    [HarmonyPrefix, HarmonyPatch(typeof(GameMain), nameof(GameMain.HandleApplicationQuit))]
+    private static void GameMain_HandleApplicationQuit_Prefix()
     {
         var wnd = WinApi.FindWindow(GameWindowClass, GameWindowTitle);
         if (wnd == IntPtr.Zero) return;