Merge pull request #330 from mklierman/dev

Add ExecCmds functionality for Shipping builds

Mods/SML/Source/SML/Private/SMLModule.cpp

@@ -30,6 +30,9 @@ void FSMLModule::StartupModule() {
 	//UObject subsystem and Engine are initialized on PostEngineInit and we need to delay their initialization to that moment
 	FCoreDelegates::OnPostEngineInit.AddStatic(FSatisfactoryModLoader::InitializeModLoading);
 
+	// ExecCmds are run after Engine is initialized as they use GEngine to run the commands
+	FCoreDelegates::OnPostEngineInit.AddStatic(FSatisfactoryModLoader::ParseExecCmds);
+
 	RegisterPluginGameplayTagInis();
 }
 

Mods/SML/Source/SML/Private/SatisfactoryModLoader.cpp

@@ -17,6 +17,7 @@
 #include "Misc/FileHelper.h"
 #include "Serialization/JsonReader.h"
 #include "Serialization/JsonSerializer.h"
+#include "ParseExecCommands.h"
 
 #ifndef FACTORYGAME_VERSION
 #define FACTORYGAME_VERSION 0
@@ -216,3 +217,12 @@ void FSatisfactoryModLoader::InitializeModLoading() {
     }
     UE_LOG(LogSatisfactoryModLoader, Display, TEXT("Initialization finished!"));
 }
+
+void FSatisfactoryModLoader::ParseExecCmds()
+{
+    //ExecCmds is run natively by UE on non-Shipping builds, so we only want to run our reimplementation when in Shipping (in case CSS enables it later)
+#if UE_BUILD_SHIPPING && !(ENABLE_PGO_PROFILE)
+    UE_LOG(LogSatisfactoryModLoader, Display, TEXT("Parsing ExecCmds"));
+    ParseExecCommands::QueueDeferredCommands(ParseExecCommands::ParseExecCmdsFromCommandLine(TEXT("ExecCmds")));
+#endif
+}

Mods/SML/Source/SML/Public/SatisfactoryModLoader.h

@@ -45,4 +45,7 @@ class SML_API FSatisfactoryModLoader {
 
 	/** Finishes mod loading and mounts packages, initializes subsystems, loads mod configurations, etc */
 	static void InitializeModLoading();
+
+	/** Runs console commands using the ExecCmds argument (reimplementation; existing UE ExecCmds doesn't work in shipping) */
+	static void ParseExecCmds();
 };