Add new launch flag ("binary-dir") & Change the path for loading mods (#1439)

* change loading libraries to use getBinaryPath & add new launch flag

* move to LoaderImpl

Author: FireMario211

loader/src/loader/LoaderImpl.cpp

@@ -99,6 +99,11 @@ Result<> Loader::Impl::setup() {
         }
     }
 
+    if (auto value = this->getLaunchArgument("binary-dir")) {
+        log::info("Using custom binary directory: {}", value.value());
+        m_binaryPath = value.value();
+    }
+
     if (this->getLaunchFlag("enable-tulip-hook-logs")) {
         log::info("Enabling TulipHook logs");
         tulip::hook::setLogCallback([](std::string_view msg) {
@@ -1299,4 +1304,8 @@ bool Loader::Impl::isRestartRequired() const {
 
 bool Loader::Impl::isPatchless() const {
     return m_isPatchless;
-}
+}
+
+std::optional<std::string> Loader::Impl::getBinaryPath() const {
+    return m_binaryPath;
+}

loader/src/loader/LoaderImpl.hpp

@@ -71,6 +71,7 @@ namespace geode {
         std::unordered_map<void*, std::pair<tulip::hook::HandlerHandle, size_t>> m_handlerHandles;
 
         bool m_isPatchless = false;
+        std::optional<std::string> m_binaryPath;
 
         Result<tulip::hook::HandlerHandle> getHandler(void* address);
         Result<tulip::hook::HandlerHandle> getOrCreateHandler(void* address, tulip::hook::HandlerMetadata const& metadata);
@@ -156,6 +157,7 @@ namespace geode {
         bool isRestartRequired() const;
 
         bool isPatchless() const;
+        std::optional<std::string> getBinaryPath() const;
     };
 
     class LoaderImpl : public Loader::Impl {

loader/src/loader/ModImpl.cpp

@@ -133,6 +133,9 @@ std::filesystem::path Mod::Impl::getTempDir() const {
 }
 
 std::filesystem::path Mod::Impl::getBinaryPath() const {
+    if (auto value = LoaderImpl::get()->getBinaryPath()) {
+        return std::filesystem::path(value.value()) / m_metadata.getBinaryName();
+    }
     return m_tempDirName / m_metadata.getBinaryName();
 }
 

loader/src/platform/android/ModImpl.cpp

@@ -16,7 +16,7 @@ T findSymbolOrMangled(void* so, char const* name, char const* mangled) {
 
 Result<> Mod::Impl::loadPlatformBinary() {
     auto so =
-        dlopen((m_tempDirName / m_metadata.getBinaryName()).string().c_str(), RTLD_LAZY);
+        dlopen(this->getBinaryPath().string().c_str(), RTLD_LAZY);
     if (so) {
         if (m_platformInfo) {
             delete m_platformInfo;

loader/src/platform/ios/ModImpl.cpp

@@ -17,7 +17,7 @@ T findSymbolOrMangled(void* dylib, char const* name, char const* mangled) {
 
 Result<> Mod::Impl::loadPlatformBinary() {
     auto dylib =
-        dlopen((m_tempDirName / m_metadata.getBinaryName()).string().c_str(), RTLD_LAZY);
+        dlopen(this->getBinaryPath().string().c_str(), RTLD_LAZY);
     if (dylib) {
         if (m_platformInfo) {
             delete m_platformInfo;

loader/src/platform/mac/ModImpl.cpp

@@ -17,7 +17,7 @@ T findSymbolOrMangled(void* dylib, char const* name, char const* mangled) {
 
 Result<> Mod::Impl::loadPlatformBinary() {
     auto dylib =
-        dlopen((m_tempDirName / m_metadata.getBinaryName()).string().c_str(), RTLD_LAZY);
+        dlopen(this->getBinaryPath().string().c_str(), RTLD_LAZY);
     if (dylib) {
         if (m_platformInfo) {
             delete m_platformInfo;

loader/src/platform/windows/ModImpl.cpp

@@ -54,7 +54,7 @@ std::string getLastWinError() {
 }
 
 Result<> Mod::Impl::loadPlatformBinary() {
-    auto load = LoadLibraryW((m_tempDirName / m_metadata.getBinaryName()).wstring().c_str());
+    auto load = LoadLibraryW(this->getBinaryPath().wstring().c_str());
     if (load) {
         if (m_platformInfo) {
             delete m_platformInfo;