Switching to MCM v3 API

Designer225 · May 26, 2020 · 0943b34 · 0943b34
1 parent c9c8a2c
commit 0943b34
Show file tree

Hide file tree

Showing 31 changed files with 25 additions and 15 deletions.
diff --git a/FixedBanditSpawning/.vs/FixedBanditSpawning/v16/.suo b/FixedBanditSpawning/.vs/FixedBanditSpawning/v16/.suo
diff --git a/FixedBanditSpawning/.vs/FixedBanditSpawning/v16/Server/sqlite3/storage.ide b/FixedBanditSpawning/.vs/FixedBanditSpawning/v16/Server/sqlite3/storage.ide
diff --git a/FixedBanditSpawning/D225MiscFixesSettings.cs b/FixedBanditSpawning/D225MiscFixesSettings.cs
@@ -3,19 +3,19 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using MBOptionScreen.Settings;
-using MBOptionScreen.Attributes;
-using MBOptionScreen.Attributes.v2;
+using MCM.Abstractions.Settings.Base.Global;
+using MCM.Abstractions.Attributes;
+using MCM.Abstractions.Attributes.v2;
 
 namespace FixedBanditSpawning
 {
-    public partial class D225MiscFixesSettings : AttributeSettings<D225MiscFixesSettings>
+    public partial class D225MiscFixesSettings : AttributeGlobalSettings<D225MiscFixesSettings>
     {
-        public override string Id { get; set; } = "D225.MiscFixes";
+        public override string Id => "D225.MiscFixes";
 
-        public override string ModuleFolderName => "D225.MiscFixes";
+        public override string FolderName => "D225.MiscFixes";
 
-        public override string ModName => ModNameTextObject.ToString();
+        public override string DisplayName => ModNameTextObject.ToString();
 
         [SettingPropertyBool(PatchBanditSpawningName, HintText = PatchBanditSpawningHint, Order = 0, RequireRestart = true)]
         public bool PatchBanditSpawning { get; set; } = true;

diff --git a/FixedBanditSpawning/FixedBanditSpawning.csproj b/FixedBanditSpawning/FixedBanditSpawning.csproj
@@ -34,8 +34,14 @@
     <Reference Include="0Harmony, Version=2.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>packages\Lib.Harmony.2.0.1\lib\net472\0Harmony.dll</HintPath>
     </Reference>
-    <Reference Include="MBOptionScreen.v2.0.10, Version=2.0.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Bannerlord.MBOptionScreen.2.0.10\lib\net472\MBOptionScreen.v2.0.10.dll</HintPath>
+    <Reference Include="MCMv3, Version=3.1.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.4\lib\net472\MCMv3.dll</HintPath>
+    </Reference>
+    <Reference Include="MCMv3.Implementation.v3.1.4, Version=3.1.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.4\lib\net472\MCMv3.Implementation.v3.1.4.dll</HintPath>
+    </Reference>
+    <Reference Include="MCMv3.UI.v3.1.4, Version=3.1.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Bannerlord.MCM.Integrated.3.1.4\lib\net472\MCMv3.UI.v3.1.4.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -89,6 +95,8 @@
 xcopy $(TargetFileName) ..\..\..\bin\Win64_Shipping_Client /y
 xcopy $(TargetName).pdb ..\..\..\bin\Win64_Shipping_Client /y
 xcopy 0Harmony.dll ..\..\..\bin\Win64_Shipping_Client /y
-xcopy MBOptionScreen.v2.0.10.dll ..\..\..\bin\Win64_Shipping_Client /y</PostBuildEvent>
+xcopy MCMv3.dll ..\..\..\bin\Win64_Shipping_Client /y
+xcopy MCMv3.Implementation.v3.1.4.dll ..\..\..\bin\Win64_Shipping_Client /y
+xcopy MCMv3.UI.v3.1.4.dll ..\..\..\bin\Win64_Shipping_Client /y</PostBuildEvent>
   </PropertyGroup>
 </Project>
diff --git a/FixedBanditSpawning/bin/Debug/FixedBanditSpawning.dll b/FixedBanditSpawning/bin/Debug/FixedBanditSpawning.dll
diff --git a/FixedBanditSpawning/bin/Debug/FixedBanditSpawning.pdb b/FixedBanditSpawning/bin/Debug/FixedBanditSpawning.pdb
diff --git a/FixedBanditSpawning/bin/Debug/MBOptionScreen.v2.0.10.dll b/FixedBanditSpawning/bin/Debug/MBOptionScreen.v2.0.10.dll
diff --git a/FixedBanditSpawning/bin/Debug/MCMv3.Implementation.v3.1.4.dll b/FixedBanditSpawning/bin/Debug/MCMv3.Implementation.v3.1.4.dll
diff --git a/FixedBanditSpawning/bin/Debug/MCMv3.UI.v3.1.4.dll b/FixedBanditSpawning/bin/Debug/MCMv3.UI.v3.1.4.dll
diff --git a/FixedBanditSpawning/bin/Debug/MCMv3.dll b/FixedBanditSpawning/bin/Debug/MCMv3.dll
diff --git a/FixedBanditSpawning/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/FixedBanditSpawning/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.csproj.FileListAbsolute.txt b/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.csproj.FileListAbsolute.txt
@@ -28,4 +28,6 @@ D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBandit
 D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\obj\Debug\FixedBanditSpawning.pdb
 D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\obj\Debug\FixedBanditSpawning.csprojAssemblyReference.cache
 D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\bin\Debug\TaleWorlds.ObjectSystem.dll
-D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\bin\Debug\MBOptionScreen.v2.0.10.dll
+D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\bin\Debug\MCMv3.dll
+D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\bin\Debug\MCMv3.Implementation.v3.1.4.dll
+D:\SteamLibrary\steamapps\common\Mount & Blade II Bannerlord\Modules\FixedBanditSpawning\FixedBanditSpawning\bin\Debug\MCMv3.UI.v3.1.4.dll
diff --git a/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.csprojAssemblyReference.cache b/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.csprojAssemblyReference.cache
diff --git a/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.dll b/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.dll
diff --git a/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.pdb b/FixedBanditSpawning/obj/Debug/FixedBanditSpawning.pdb
diff --git a/FixedBanditSpawning/packages.config b/FixedBanditSpawning/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Bannerlord.MBOptionScreen" version="2.0.10" targetFramework="net472" />
+  <package id="Bannerlord.MCM.Integrated" version="3.1.4" targetFramework="net472" />
   <package id="Lib.Harmony" version="2.0.1" targetFramework="net472" />
 </packages>
diff --git a/...Spawning/packages/Bannerlord.MBOptionScreen.2.0.10/Bannerlord.MBOptionScreen.2.0.10.nupkg b/...Spawning/packages/Bannerlord.MBOptionScreen.2.0.10/Bannerlord.MBOptionScreen.2.0.10.nupkg
diff --git a/...tSpawning/packages/Bannerlord.MBOptionScreen.2.0.10/lib/net472/MBOptionScreen.v2.0.10.dll b/...tSpawning/packages/Bannerlord.MBOptionScreen.2.0.10/lib/net472/MBOptionScreen.v2.0.10.dll
diff --git a/...g/packages/Bannerlord.MBOptionScreen.2.0.10/lib/netstandard2.0/MBOptionScreen.v2.0.10.dll b/...g/packages/Bannerlord.MBOptionScreen.2.0.10/lib/netstandard2.0/MBOptionScreen.v2.0.10.dll
diff --git a/...lord.MBOptionScreen.2.0.10/.signature.p7s → ...rlord.MCM.Integrated.3.1.4/.signature.p7s b/...lord.MBOptionScreen.2.0.10/.signature.p7s → ...rlord.MCM.Integrated.3.1.4/.signature.p7s
diff --git a/...itSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/Bannerlord.MCM.Integrated.3.1.4.nupkg b/...itSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/Bannerlord.MCM.Integrated.3.1.4.nupkg
diff --git a/...wning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.Implementation.v3.1.4.dll b/...wning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.Implementation.v3.1.4.dll
diff --git a/FixedBanditSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.UI.v3.1.4.dll b/FixedBanditSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.UI.v3.1.4.dll
diff --git a/FixedBanditSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.dll b/FixedBanditSpawning/packages/Bannerlord.MCM.Integrated.3.1.4/lib/net472/MCMv3.dll
diff --git a/SubModule.xml b/SubModule.xml
@@ -23,9 +23,9 @@
       </Tags>
     </SubModule>
     <SubModule>
-      <Name value="MBOptionScreen" />
-      <DLLName value="MBOptionScreen.v2.0.10.dll" />
-      <SubModuleClassType value="MBOptionScreen.MBOptionScreenSubModuleV2010" />
+      <Name value="MCMv3 Integrated Loader" />
+      <DLLName value="MCMv3.dll" />
+      <SubModuleClassType value="MCM.IntegratedLoaderSubModule" />
       <Tags>
         <Tag key="DedicatedServerType" value="none" />
         <Tag key="IsNoRenderModeElement" value="false" />

diff --git a/bin/Win64_Shipping_Client/FixedBanditSpawning.dll b/bin/Win64_Shipping_Client/FixedBanditSpawning.dll
diff --git a/bin/Win64_Shipping_Client/FixedBanditSpawning.pdb b/bin/Win64_Shipping_Client/FixedBanditSpawning.pdb
diff --git a/bin/Win64_Shipping_Client/MBOptionScreen.v2.0.10.dll b/bin/Win64_Shipping_Client/MBOptionScreen.v2.0.10.dll
diff --git a/bin/Win64_Shipping_Client/MCMv3.Implementation.v3.1.4.dll b/bin/Win64_Shipping_Client/MCMv3.Implementation.v3.1.4.dll
diff --git a/bin/Win64_Shipping_Client/MCMv3.UI.v3.1.4.dll b/bin/Win64_Shipping_Client/MCMv3.UI.v3.1.4.dll
diff --git a/bin/Win64_Shipping_Client/MCMv3.dll b/bin/Win64_Shipping_Client/MCMv3.dll