Add ESC to go back in UIMainMenu and fix logging

NebulaModTeam · Sep 7, 2024 · fd7c760 · fd7c760
1 parent c03e3e5
commit fd7c760
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/NebulaNetwork/PacketProcessors/Logistics/StationUIInitialSyncRequestProcessor.cs b/NebulaNetwork/PacketProcessors/Logistics/StationUIInitialSyncRequestProcessor.cs
@@ -30,7 +30,7 @@ protected override void ProcessPacket(StationUIInitialSyncRequest packet, Nebula
 
         if (stationComponent == null)
         {
-            Log.Error(
+            Log.Warn(
                 $"StationUIInitialSyncRequestProcessor: Unable to find requested station on planet {packet.PlanetId} with id {packet.StationId} and gid {packet.StationGId}");
             return;
         }

diff --git a/NebulaPatcher/Patches/Dynamic/PlanetData_Patch.cs b/NebulaPatcher/Patches/Dynamic/PlanetData_Patch.cs
@@ -35,12 +35,8 @@ public static bool UpdateDirtyMesh_Prefix(PlanetData __instance, int dirtyIdx, r
         {
             return true;
         }
-        Log.Warn(__instance == GameMain.localPlanet
-            ? "Local"
-            : "Remote" + $" PlanetData.UpdateDirtyMesh: meshes[{dirtyIdx}] is null");
         __result = false;
         return false;
-
     }
 
     [HarmonyPrefix]

diff --git a/NebulaPatcher/Patches/Dynamic/UIMainMenu_Patch.cs b/NebulaPatcher/Patches/Dynamic/UIMainMenu_Patch.cs
@@ -73,6 +73,31 @@ public static void OnUpdateLogButtonClick_Postfix()
         OnMultiplayerBackButtonClick();
     }
 
+    [HarmonyPrefix]
+    [HarmonyPatch(nameof(UIMainMenu.UpdateDemoScene))]
+    [HarmonyPatch(nameof(UIMainMenu._OnUpdate))]
+    public static void OnEscSwitch()
+    {
+        if (!VFInput.escape) return;
+
+        // Go back to the upper level when hitting esc
+        if (multiplayerMenu.gameObject.activeInHierarchy)
+        {
+            OnJoinGameBackButtonClick();
+            VFInput.UseEscape();
+        }
+        else if (UIRoot.instance.loadGameWindow.active)
+        {
+            UIRoot.instance.loadGameWindow.OnCancelClick(0);
+            VFInput.UseEscape();
+        }
+        else if (multiplayerSubMenu.gameObject.activeInHierarchy)
+        {
+            OnMultiplayerBackButtonClick();
+            VFInput.UseEscape();
+        }
+    }
+
     // Main Menu
     private static void AddMultiplayerButton()
     {