Changed how melon loader mods are registered

TDToolbox · Dec 22, 2020 · 13f30e2 · 13f30e2
1 parent a2bc612
commit 13f30e2
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/BTD Backend.dll b/BTD Backend.dll
diff --git a/BTD6 Mod Manager.Lib/BTD6 Mod Manager.Lib.csproj b/BTD6 Mod Manager.Lib/BTD6 Mod Manager.Lib.csproj
@@ -31,8 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="MelonLoader.ModHandler">
-      <HintPath>F:\Program Files (x86)\Steam\steamapps\common\BloonsTD6\MelonLoader\MelonLoader.ModHandler.dll</HintPath>
+    <Reference Include="MelonLoader.ModHandler, Version=0.2.7.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\BTD6 Mod Manager.wpf\bin\Debug\MelonLoader.ModHandler.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\BTD6 Mod Manager.wpf\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/BTD6 Mod Manager.wpf/BTD6 Mod Manager.csproj b/BTD6 Mod Manager.wpf/BTD6 Mod Manager.csproj
@@ -62,8 +62,9 @@
     <Reference Include="DotNetZip, Version=1.13.8.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
       <HintPath>packages\DotNetZip.1.13.8\lib\net40\DotNetZip.dll</HintPath>
     </Reference>
-    <Reference Include="MelonLoader.ModHandler">
-      <HintPath>F:\Program Files (x86)\Steam\steamapps\common\Bloons Adventure Time TD\MelonLoader\MelonLoader.ModHandler.dll</HintPath>
+    <Reference Include="MelonLoader.ModHandler, Version=0.2.7.4, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>bin\Debug\MelonLoader.ModHandler.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Microsoft.WindowsAPICodePack-Core.1.1.0.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>

diff --git a/BTD6 Mod Manager.wpf/Properties/AssemblyInfo.cs b/BTD6 Mod Manager.wpf/Properties/AssemblyInfo.cs
@@ -49,5 +49,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyVersion("2.1.1")]
+[assembly: AssemblyFileVersion("2.1.1")]
diff --git a/BTD6 Mod Manager.wpf/UserControls/Mods_UserControl.xaml.cs b/BTD6 Mod Manager.wpf/UserControls/Mods_UserControl.xaml.cs
@@ -68,8 +68,9 @@ public void PopulateMods(GameType game)
                         if (!modName.EndsWith(item) || Mods_ListBox.Items.Contains(mod) || modName.ToLower().Contains("nkhook"))
                             continue;
 
-                        if (item == ".dll" && !MelonMod_Handler.IsValidMelonMod(mod.FullName))
-                            continue;
+                        //Following code has been removed for now. Causes issues if MelonLoader.ModHandler is not included with Mod Manager
+                        /*if (item == ".dll" && !MelonMod_Handler.IsValidMelonMod(mod.FullName))
+                            continue;*/
 
                         AddItemToModsList(mod);
                     }