From a409545319628c8f39339fdbca6da0c2caff4cd0 Mon Sep 17 00:00:00 2001
From: CptMoore <39010654+CptMoore@users.noreply.github.com>
Date: Sat, 28 Dec 2024 06:04:44 +0100
Subject: [PATCH] Updated to UnitDoorstop 4.3.0 .

---
 ModTek.Preloader/ModTek.Preloader.csproj |  4 ++--
 ModTek.Preloader/doorstop_config.ini     |  2 ++
 ModTek.Preloader/run.sh                  | 12 +++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ModTek.Preloader/ModTek.Preloader.csproj b/ModTek.Preloader/ModTek.Preloader.csproj
index defd3974..8a4089ab 100644
--- a/ModTek.Preloader/ModTek.Preloader.csproj
+++ b/ModTek.Preloader/ModTek.Preloader.csproj
@@ -13,11 +13,11 @@
 
   <Target Name="DoorstopFetch" BeforeTargets="CopyFilesToGame" Condition="!Exists('$(BattleTechGameDir)\winhttp.dll')">
     <PropertyGroup>
-      <DoorstopUrl>https://github.com/BattletechModders/UnityDoorstop/releases/download/4.2.0steamfix/doorstop_all_4.2.0steamfix.zip</DoorstopUrl>
+      <DoorstopUrl>https://github.com/BattletechModders/UnityDoorstop/releases/download/4.3.0steamfix/doorstop_all_4.3.0steamfix.zip</DoorstopUrl>
       <DoorstopIntDir>$(MSBuildProjectExtensionsPath)\doorstop</DoorstopIntDir>
     </PropertyGroup>
     <DownloadFile SourceUrl="$(DoorstopUrl)" DestinationFolder="$(DoorstopIntDir)" />
-    <Unzip SourceFiles="$(DoorstopIntDir)\doorstop_all_4.2.0steamfix.zip" DestinationFolder="$(DoorstopIntDir)" />
+    <Unzip SourceFiles="$(DoorstopIntDir)\doorstop_all_4.3.0steamfix.zip" DestinationFolder="$(DoorstopIntDir)" />
     <Copy SourceFiles="$(DoorstopIntDir)\doorstop_win_release\x64\winhttp.dll" DestinationFolder="$(BattleTechGameDir)" />
     <Copy SourceFiles="$(DoorstopIntDir)\doorstop_linux_release\x64\libdoorstop.so" DestinationFolder="$(BattleTechGameDir)" />
     <Copy SourceFiles="$(DoorstopIntDir)\doorstop_macos_release\x64\libdoorstop.dylib" DestinationFolder="$(BattleTechGameDir)" />
diff --git a/ModTek.Preloader/doorstop_config.ini b/ModTek.Preloader/doorstop_config.ini
index 8dcab575..b620232d 100644
--- a/ModTek.Preloader/doorstop_config.ini
+++ b/ModTek.Preloader/doorstop_config.ini
@@ -5,6 +5,8 @@ target_assembly=Mods\ModTek\lib\ModTek.Preloader.dll
 redirect_output_log=false
 # Options specific to running under Unity Mono runtime
 [UnityMono]
+# Overrides default Mono DLL search path
+dll_search_path_override=Mods\ModTek\lib\
 # If true, Mono debugger server will be enabled
 debug_enabled=false
 # When debug_enabled is true, specifies the address to use for the debugger server
diff --git a/ModTek.Preloader/run.sh b/ModTek.Preloader/run.sh
index fcc8d50c..bbf03724 100755
--- a/ModTek.Preloader/run.sh
+++ b/ModTek.Preloader/run.sh
@@ -32,12 +32,14 @@ fi
 
 # get doorstop settings for linux/mac from the ini (why does doorstop not do this for us?)
 doorstop_config() { grep "^${1}=" "${BASEDIR}/doorstop_config.ini" | cut -d= -f2- ; }
-doorstop_bool() { sed s@true@1@ | sed s@false@0@ ; }
-export DOORSTOP_MONO_DEBUG_ENABLED="$(doorstop_config debug_enabled | doorstop_bool)"
+doorstop_convert_bool() { sed s@true@1@ | sed s@false@0@ ; }
+doorstop_convert_path() { tr '\\' '/' ; }
+export DOORSTOP_MONO_DEBUG_ENABLED="$(doorstop_config debug_enabled | doorstop_convert_bool)"
 export DOORSTOP_MONO_DEBUG_ADDRESS="$(doorstop_config debug_address)"
-export DOORSTOP_MONO_DEBUG_SUSPEND="$(doorstop_config debug_suspend | doorstop_bool)"
-export DOORSTOP_ENABLED="$(doorstop_config enabled | doorstop_bool)"
-export DOORSTOP_TARGET_ASSEMBLY="$(doorstop_config target_assembly | tr '\\' '/' )"
+export DOORSTOP_MONO_DEBUG_SUSPEND="$(doorstop_config debug_suspend | doorstop_convert_bool)"
+export DOORSTOP_ENABLED="$(doorstop_config enabled | doorstop_convert_bool)"
+export DOORSTOP_TARGET_ASSEMBLY="$(doorstop_config target_assembly | doorstop_convert_path)"
+export DOORSTOP_MONO_DLL_SEARCH_PATH_OVERRIDE="$(doorstop_config dll_search_path_override | doorstop_convert_path)"
 
 # check if the first parameter is the executable, e.g. as forwarded through Steam
 if [ -n "${1:-}" ] && [ -x "$1" ]