Fix GameSwitchedTo event with some statefulness

GamecraftModdingAPI/Events/GameActivatedComposePatch.cs

@@ -18,8 +18,12 @@ namespace GamecraftModdingAPI.Events
     /// Patch of RobocraftX.FullGameCompositionRoot.ActivateGame()
     /// </summary>
 	[HarmonyPatch]
-    class GameActivatedPatch
+    class GameActivatedComposePatch
     {
+		public static bool IsGameSwitching = false;
+
+		public static bool IsGameReloading = false;
+
         public static void Postfix(ref EnginesRoot enginesRoot)
         {
             // register custom game engines
@@ -29,6 +33,18 @@ namespace GamecraftModdingAPI.Events
 			EventManager.RegisterEngines(enginesRoot);
             Logging.Log("Dispatching Game Activated event");
             EventManager.GetEventEmitter("GamecraftModdingAPIGameActivatedEventEmitter").Emit();
+			if (IsGameSwitching)
+			{
+				IsGameSwitching = false;
+                Logging.Log("Dispatching Game Switched To event");
+                EventManager.GetEventEmitter("GamecraftModdingAPIGameSwitchedToEventEmitter").Emit();
+			}
+			if (IsGameReloading)
+			{
+				IsGameReloading = false;
+				Logging.Log("Dispatching Game Reloaded event");
+                EventManager.GetEventEmitter("GamecraftModdingAPIGameReloadedEventEmitter").Emit();
+			}
         }
 
         public static MethodBase TargetMethod()

GamecraftModdingAPI/Events/GameReloadedPatch.cs

@@ -19,9 +19,7 @@ namespace GamecraftModdingAPI.Events
     {
         public static void Postfix()
         {
-            // Event emitters and handlers should already be registered by GameActivatedPatch
+			GameActivatedComposePatch.IsGameReloading = true;
-            Logging.Log("Dispatching Game Reloaded event");
-            EventManager.GetEventEmitter("GamecraftModdingAPIGameReloadedEventEmitter").Emit();
         }
     }
 }

GamecraftModdingAPI/Events/GameSwitchedToPatch.cs

@@ -3,25 +3,27 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Reflection;
 
 using Harmony;
 using RobocraftX;
+using RobocraftX.CR.MainGame;
+using Svelto.ECS;
 
 using GamecraftModdingAPI.Utility;
 
 namespace GamecraftModdingAPI.Events
 {
     /// <summary>
-    /// Patch of RobocraftX.FullGameCompositionRoot.SwitchToGame()
+    /// Patch of RobocraftX.FullGameCompositionRoot.ActivateGame()
+	/// (scheduled for execution during RobocraftX.FullGameCompositionRoot.SwitchToGame())
     /// </summary>
 	[HarmonyPatch(typeof(FullGameCompositionRoot), "SwitchToGame")]
     class GameSwitchedToPatch
     {
-        public static void Postfix()
+		public static void Prefix()
         {
-            // Event emitters and handlers should already be registered by GameActivated event
+			GameActivatedComposePatch.IsGameSwitching = true;
-            Logging.Log("Not dispatching Game Switched To event");
-            //EventManager.GetEventEmitter("GamecraftModdingAPIGameSwitchedToEventEmitter").Emit();
         }
     }
 }

GamecraftModdingAPI/Tests/GamecraftModdingAPIPluginTest.cs

@@ -26,7 +26,7 @@ namespace GamecraftModdingAPI.Tests
     {
         private static HarmonyInstance harmony { get; set; }
 
-        public string[] Filter { get; } = new string[] { "Gamecraft" };
+        public string[] Filter { get; } = new string[] { "Gamecraft", "GamecraftPreview" };
 
         public string Name { get; } = Assembly.GetExecutingAssembly().GetName().Name;
 
@@ -50,7 +50,8 @@ namespace GamecraftModdingAPI.Tests
 			// disable some Gamecraft analytics
 			//AnalyticsDisablerPatch.DisableAnalytics = true;
 			// disable background music
-            AudioTools.SetVolume(0.0f, "Music");
+			Logging.MetaDebugLog("Audio Mixers: "+string.Join(",", AudioTools.GetMixers()));
+            //AudioTools.SetVolume(0.0f, "Music"); // The game now sets this from settings again after this is called
 
             /*if (!FMODUnity.RuntimeManager.HasBankLoaded("Modded"))
             {
@@ -75,12 +76,14 @@ namespace GamecraftModdingAPI.Tests
                 EventType.GameSwitchedTo, "gameswitch API debug"));
 
             // debug/test commands
+			if (Dependency.Hell("ExtraCommands"))
+			{
 				CommandManager.AddCommand(new SimpleCustomCommandEngine(() => { UnityEngine.Application.Quit(); },
                 "Exit", "Close Gamecraft without any prompts"));
                 CommandManager.AddCommand(new SimpleCustomCommandEngine<float>((float d) => { UnityEngine.Camera.main.fieldOfView = d; },
                     "SetFOV", "Set the player camera's field of view"));
                 CommandManager.AddCommand(new SimpleCustomCommandEngine<float, float, float>(
-                (x,y,z) => {
+                    (x, y, z) => {
                         bool success = GamecraftModdingAPI.Blocks.Movement.MoveConnectedBlocks(
                             GamecraftModdingAPI.Blocks.BlockIdentifiers.LatestBlockID,
                             new Unity.Mathematics.float3(x, y, z));
@@ -90,13 +93,22 @@ namespace GamecraftModdingAPI.Tests
                         }
                     }, "MoveLastBlock", "Move the most-recently-placed block, and any connected blocks by the given offset"));
                 CommandManager.AddCommand(new SimpleCustomCommandEngine<float, float, float>(
-                (x,y,z) => { Blocks.Placement.PlaceBlock(Blocks.BlockIDs.AluminiumCube, new Unity.Mathematics.float3(x, y, z)); },
+                    (x, y, z) => { Blocks.Placement.PlaceBlock(Blocks.BlockIDs.AluminiumCube, new Unity.Mathematics.float3(x, y, z)); },
                     "PlaceAluminium", "Place a block of aluminium at the given coordinates"));
                 Analytics.DeltaDNAHelper.PlayerLifetimeParameters plp = new Analytics.DeltaDNAHelper.PlayerLifetimeParameters();
                 CommandManager.AddCommand(new SimpleCustomCommandEngine<string>(
                     (s) => { Analytics.DeltaDNAHelper.SendActionCompletedEvent(in plp, s.Replace(", ", " ")); },
                     "SendAnalyticsAction", "Send an analytics action"));
 			}
+            if (Dependency.Hell("GamecraftScripting", new Version("0.0.1.0")))
+			{
+				Logging.LogWarning("You're in GamecraftScripting dependency hell");
+			}
+			else
+			{
+				Logging.Log("Compatible GamecraftScripting detected");
+			}
+        }
 
         public void OnFixedUpdate() { }
 

GamecraftModdingAPI/Utility/Dependency.cs

@@ -0,0 +1,10 @@
+using System;
+namespace GamecraftModdingAPI
+{
+    public class Dependency
+    {
+        public Dependency()
+        {
+        }
+    }
+}