Pull loading userdata modules into private method and merge with DataModule::CreateOnDiskAsUserdata

Don't need this exposed to all the things, ModuleMan mans the modules
Abort if the userdata modules failed to load so this doesn't screw us at some point later

Author: MaximDude

Managers/ModuleMan.cpp

@@ -272,15 +272,32 @@ namespace RTE {
 			}
 
 			// Load userdata modules AFTER all other techs etc are loaded; might be referring to stuff in user mods.
-			for (const auto &[userdataModuleName, userdataModuleFriendlyName] : c_UserdataModules) {
-				if (!std::filesystem::exists(System::GetWorkingDirectory() + System::GetUserdataDirectory() + userdataModuleName)) {
-					bool scanContentsAndIgnoreMissing = userdataModuleName == c_UserScenesModuleName;
-					DataModule::CreateOnDiskAsUserdata(userdataModuleName, userdataModuleFriendlyName, scanContentsAndIgnoreMissing, scanContentsAndIgnoreMissing);
-				}
-				if (!LoadDataModule(userdataModuleName, false, true, LoadingScreen::LoadingSplashProgressReport)) {
-					return false;
+			return LoadUserdataModules();
+		}
+		return true;
+	}
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+	bool ModuleMan::LoadUserdataModules() {
+		for (const auto &[userdataModuleName, userdataModuleFriendlyName] : c_UserdataModules) {
+			if (std::string userDataModulePath = System::GetWorkingDirectory() + System::GetUserdataDirectory() + userdataModuleName; !std::filesystem::exists(userDataModulePath)) {
+				if (Writer writer(userDataModulePath + "/Index.ini", false, true); writer.WriterOK()) {
+					DataModule newUserdataModule;
+					newUserdataModule.m_FriendlyName = userdataModuleFriendlyName;
+					newUserdataModule.m_ModuleType = DataModule::DataModuleType::Userdata;
+
+					if (userdataModuleName == c_UserScenesModuleName) {
+						newUserdataModule.m_IgnoreMissingItems = true;
+						newUserdataModule.m_ScanFolderContents = true;
+					}
+					newUserdataModule.Save(writer);
+					writer.EndWrite();
 				}
 			}
+			if (!LoadDataModule(userdataModuleName, DataModule::DataModuleType::Userdata, LoadingScreen::LoadingSplashProgressReport)) {
+				RTEAbort("Failed to load userdata DataModule \"" + userdataModuleName + "\"!\n\nThis generally shouldn't happen, but it looks like it did.\nPlease delete this module in the Userdata directory to rebuild it.");
+			}
 		}
 		return true;
 	}

Managers/ModuleMan.h

@@ -215,6 +215,12 @@ namespace RTE {
 		/// <returns></returns>
 		void LoadOfficialModules();
 
+		/// <summary>
+		/// Loads all the userdata DataModules individually with LoadDataModule. Creates any missing userdata DataModules on disk if necessary.
+		/// </summary>
+		/// <returns></returns>
+		bool LoadUserdataModules();
+
 		/// <summary>
 		/// Iterates through the working directory to find any files matching the zipped module package extension (.rte.zip) and proceeds to extract them.
 		/// </summary>

System/DataModule.cpp

@@ -71,24 +71,6 @@ namespace RTE {
 		return -1;
 	}
 
-/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-	bool DataModule::CreateOnDiskAsUserdata(const std::string &moduleName, const std::string_view &friendlyName, bool ignoreMissingItems, bool scanFolderContents) {
-		std::string moduleNameWithPackageExtension = System::GetUserdataDirectory() + moduleName + (moduleName.ends_with(System::GetModulePackageExtension()) ? "" : System::GetModulePackageExtension());
-		if (Writer writer(moduleNameWithPackageExtension + "/Index.ini", false, true); writer.WriterOK()) {
-			DataModule newModule;
-			newModule.m_ModuleType = DataModuleType::Userdata;
-			newModule.m_FriendlyName = friendlyName;
-			newModule.m_IgnoreMissingItems = ignoreMissingItems;
-			newModule.m_ScanFolderContents = scanFolderContents;
-			newModule.Save(writer);
-			writer.EndWrite();
-		} else {
-			return false;
-		}
-		return true;
-	}
-
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 	void DataModule::Destroy() {

System/DataModule.h

@@ -65,16 +65,6 @@ namespace RTE {
 		/// <param name="progressCallback">A function pointer to a function that will be called and sent a string with information about the progress of this DataModule's creation.</param>
 		/// <returns>An error return value signaling success or any particular failure. Anything below 0 is an error signal.</returns>
 		int Create(const std::string &moduleName, const ProgressCallback &progressCallback = nullptr);
-
-		/// <summary>
-		/// Creates a new DataModule directory with "Index.ini" on disk to be used for userdata. Does NOT instantiate the newly created DataModule.
-		/// </summary>
-		/// <param name="moduleName">File/folder name of the data module, e.g. "MyMod.rte".</param>
-		/// <param name="friendlyName">Friendly name of the data module, e.g. "My Weapons Mod".</param>
-		/// <param name="scanFolderContents">Whether module loader should scan for any .ini's inside module folder instead of loading files defined in IncludeFile only.</param>
-		/// <param name="ignoreMissingItems">Whether module loader should ignore missing items in this module.</param>
-		/// <returns>Whether the DataModule was successfully created on disk.</returns>
-		static bool CreateOnDiskAsUserdata(const std::string &moduleName, const std::string_view &friendlyName, bool scanFolderContents = false, bool ignoreMissingItems = false);
 #pragma endregion
 
 #pragma region Destruction