- Update scripting manager to return the loaded mod

- Add steamworks support on mod
edunad · Aug 3, 2024 · 445de2d · 445de2d
1 parent 1c2c5dd
commit 445de2d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/rawrbox.scripting/include/rawrbox/scripting/manager.hpp b/rawrbox.scripting/include/rawrbox/scripting/manager.hpp
@@ -73,8 +73,8 @@ namespace rawrbox {
 		static void init(int hotReloadMs = 0);
 
 		// LOADING ----
-		static std::unordered_map<std::filesystem::path, bool> loadMods(const std::filesystem::path& rootFolder);
-		static bool loadMod(const std::string& id, const std::filesystem::path& modFolder);
+		static std::unordered_map<std::filesystem::path, rawrbox::Mod*> loadMods(const std::filesystem::path& rootFolder);
+		static rawrbox::Mod* loadMod(const std::string& id, const std::filesystem::path& modFolder);
 
 		static bool unloadMod(const std::filesystem::path& modFolder);
 		static bool unloadMod(const std::string& modId);

diff --git a/rawrbox.scripting/include/rawrbox/scripting/mod.hpp b/rawrbox.scripting/include/rawrbox/scripting/mod.hpp
@@ -7,6 +7,10 @@
 #include <filesystem>
 #include <memory>
 
+#ifdef RAWRBOX_STEAMWORKS
+	#include <steam/steam_api.h>
+#endif
+
 namespace rawrbox {
 	class Mod {
 		// LUA ----
@@ -24,6 +28,9 @@ namespace rawrbox {
 		// Settings ---
 		std::filesystem::path _folder;
 		std::string _id = "UNKNOWN";
+#ifdef RAWRBOX_STEAMWORKS
+		PublishedFileId_t _workshopId = 0;
+#endif
 		// -----------
 
 		// OTHER ----
@@ -57,6 +64,11 @@ namespace rawrbox {
 		[[nodiscard]] virtual const glz::json_t& getMetadata() const;
 
 		[[nodiscard]] virtual lua_State* getEnvironment();
+
+#ifdef RAWRBOX_STEAMWORKS
+		virtual void setWorkshopId(PublishedFileId_t id);
+		[[nodiscard]] virtual PublishedFileId_t getWorkshopId() const;
+#endif
 		// -----
 
 		template <typename... CallbackArgs>

diff --git a/rawrbox.scripting/src/manager.cpp b/rawrbox.scripting/src/manager.cpp
@@ -346,10 +346,10 @@ namespace rawrbox {
 	}
 
 	// LOADING ----
-	std::unordered_map<std::filesystem::path, bool> SCRIPTING::loadMods(const std::filesystem::path& rootFolder) { // Load mods
+	std::unordered_map<std::filesystem::path, rawrbox::Mod*> SCRIPTING::loadMods(const std::filesystem::path& rootFolder) { // Load mods
 		if (!std::filesystem::exists(rootFolder)) throw _logger->error("Failed to locate root folder '{}'", rootFolder.generic_string());
 
-		std::unordered_map<std::filesystem::path, bool> success = {};
+		std::unordered_map<std::filesystem::path, rawrbox::Mod*> success = {};
 		for (const auto& p : std::filesystem::directory_iterator(rootFolder)) {
 			if (!p.is_directory()) continue;
 			success[p] = loadMod(p.path().filename().generic_string(), p);
@@ -358,12 +358,12 @@ namespace rawrbox {
 		return success;
 	}
 
-	bool SCRIPTING::loadMod(const std::string& id, const std::filesystem::path& modFolder) {
+	rawrbox::Mod* SCRIPTING::loadMod(const std::string& id, const std::filesystem::path& modFolder) {
 		if (id.empty()) throw _logger->error("Mod ID cannot be empty");
 		if (!std::filesystem::exists(modFolder)) throw _logger->error("Failed to locate mod folder '{}'", modFolder.generic_string());
 		if (_mods.find(id) != _mods.end()) {
 			_logger->warn("Mod {} already loaded! Mod name conflict?", id);
-			return false;
+			return nullptr;
 		}
 
 		// LOAD METADATA ---
@@ -396,11 +396,13 @@ namespace rawrbox {
 			registerLoadedFile(mod->getID(), mod->getEntryFilePath()); // Register file for hot-reloading
 		} catch (const std::runtime_error& err) {
 			_logger->printError("{}", err.what());
-			return false;
+			return nullptr;
 		}
 
+		rawrbox::Mod* modPtr = mod.get();
 		_mods.emplace(id, std::move(mod));
-		return true;
+
+		return modPtr;
 	}
 
 	bool SCRIPTING::unloadMod(const std::filesystem::path& modFolder) {

diff --git a/rawrbox.scripting/src/mod.cpp b/rawrbox.scripting/src/mod.cpp
@@ -71,5 +71,10 @@ namespace rawrbox {
 	const glz::json_t& Mod::getMetadata() const { return this->_metadata; }
 
 	lua_State* Mod::getEnvironment() { return this->_L; }
+
+#ifdef RAWRBOX_STEAMWORKS
+	void Mod::setWorkshopId(PublishedFileId_t id) { this->_workshopId = id; }
+	PublishedFileId_t Mod::getWorkshopId() const { return this->_workshopId; }
+#endif
 	// -----
 } // namespace rawrbox