Merge pull request #416 from Aragas/dev

v5.8.2
Aragas · Jul 12, 2023 · e42ab29 · e42ab29
2 parents 4d1d0d4 + 8e96f19
commit e42ab29
Show file tree

Hide file tree

Showing 13 changed files with 2,291 additions and 78 deletions.
diff --git a/build/common.props b/build/common.props
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <GameVersion>1.0.0</GameVersion>
-    <Version>5.8.1</Version>
+    <Version>5.8.2</Version>
     <HarmonyVersion>2.2.2</HarmonyVersion>
     <ButterLibVersion>2.8.8</ButterLibVersion>
     <UIExtenderExVersion>2.8.0</UIExtenderExVersion>

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 5.8.2
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
+* Added Preset Import/Export/Deleting
+---------------------------------------------------------------------------------------------------
 Version: 5.8.1
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0,v1.1.1,v1.1.2,v1.1.3,v1.1.4,v1.1.5,v1.2.0,v1.2.1
 * Fixed missing Preset saving

diff --git a/src/MCM.Abstractions/GameFeatures/IFileSystemProvider.cs b/src/MCM.Abstractions/GameFeatures/IFileSystemProvider.cs
@@ -40,7 +40,8 @@ interface IFileSystemProvider
         GameFile[] GetFiles(GameDirectory directory, string searchPattern);
         GameFile? GetFile(GameDirectory directory, string fileName);
         GameFile GetOrCreateFile(GameDirectory directory, string fileName);
-        bool WriteData(GameFile file, byte[] data);
+        bool WriteData(GameFile file, byte[]? data);
         byte[]? ReadData(GameFile file);
+        string? GetSystemPath(GameFile file);
     }
 }
diff --git a/src/MCM.Abstractions/Presets/JsonSettingsPreset.cs b/src/MCM.Abstractions/Presets/JsonSettingsPreset.cs
@@ -40,6 +40,14 @@ private sealed class PresetContainer : PresetContainerDefinition
             public BaseSettings? Settings { get; set; }
         }
 
+        public static string? GetPresetId(string content)
+        {
+            var container = JsonConvert.DeserializeObject<PresetContainerDefinition?>(content);
+            if (container is null) return null;
+
+            return container.Id;
+        }
+
         public static JsonSettingsPreset? FromFile(BaseSettings settings, GameFile file) => FromFile(settings.Id, file, settings.CreateNew);
         public static JsonSettingsPreset? FromFile(string settingsId, GameFile file, Func<BaseSettings> getNewSettings)
         {

diff --git a/src/MCM.Bannerlord/GameFeatures/FileSystemProvider.cs b/src/MCM.Bannerlord/GameFeatures/FileSystemProvider.cs
@@ -64,9 +64,13 @@ public GameFile GetOrCreateFile(GameDirectory directory, string fileName)
             return new GameFile(directory, fileName);
         }
 
-        public bool WriteData(GameFile file, byte[] data)
+        public bool WriteData(GameFile file, byte[]? data)
         {
             var baseFile = new TWPlatformFilePath(new TWPlatformDirectoryPath((PlatformFileType) file.Owner.Type, file.Owner.Path), file.Name);
+
+            if (data is null)
+                return PlatformFileHelper.DeleteFile(baseFile);
+
             return PlatformFileHelper.SaveFile(baseFile, data) == SaveResult.Success;
         }
 
@@ -75,5 +79,11 @@ public bool WriteData(GameFile file, byte[] data)
             var baseFile = new TWPlatformFilePath(new TWPlatformDirectoryPath((PlatformFileType) file.Owner.Type, file.Owner.Path), file.Name);
             return !PlatformFileHelper.FileExists(baseFile) ? null : PlatformFileHelper.GetFileContent(baseFile);
         }
+
+        public string? GetSystemPath(GameFile file)
+        {
+            var baseFile = new TWPlatformFilePath(new TWPlatformDirectoryPath((PlatformFileType) file.Owner.Type, file.Owner.Path), file.Name);
+            return PlatformFileHelper.GetFileFullPath(baseFile);
+        }
     }
 }
diff --git a/src/MCM.Publish/_Module/ModuleData/Languages/EN/sta_strings.xml b/src/MCM.Publish/_Module/ModuleData/Languages/EN/sta_strings.xml
@@ -43,5 +43,9 @@
     <string id="ModOptionsVM_SaveAsPresetDesc" text="Choose the name of the preset"/>
     <string id="ModOptionsVM_OverridePreset" text="Preset Already Exists"/>
     <string id="ModOptionsVM_OverridePresetDesc" text="Preset already exists! Do you want to override it?"/>
+    <string id="ModOptionsVM_ManagePresets" text="Manage Presets"/>
+    <string id="ModOptionsVM_ManagePresetsImport" text="Import a new Preset"/>
+    <string id="ModOptionsVM_ManagePresetsExport" text="Export Preset '{PRESETNAME}'"/>
+    <string id="ModOptionsVM_ManagePresetsDelete" text="Delete Preset '{PRESETNAME}'"/>
   </strings>
 </base>
diff --git a/src/MCM.UI/GUI/Brushes/SettingsBrush.xml b/src/MCM.UI/GUI/Brushes/SettingsBrush.xml
@@ -1,4 +1,10 @@
 <Brushes>
+  <Brush Name="MCM.Settings" GlobalAlphaFactor="1">
+    <Layers>
+      <BrushLayer Name="Default" Sprite="StdAssets\plus_button" />
+    </Layers>
+  </Brush>
+
   <Brush Name="MCM.Setting.Item">
     <Layers>
       <BrushLayer Name="Default" Sprite="mcm_entry" Color="#FFEBC1FF" />

diff --git a/src/MCM.UI/GUI/Prefabs/ModOptionsPageView.xml b/src/MCM.UI/GUI/Prefabs/ModOptionsPageView.xml
@@ -82,6 +82,11 @@
                           </Children>
                         </Widget>
 
+                        <!-- Manage Presets -->
+                        <ButtonWidget Id="ExtendButtonWidget" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="40" SuggestedHeight="40" MarginLeft="10" MarginRight="30"
+                                      HorizontalAlignment="Right" VerticalAlignment="Center" Brush="MCM.Settings" Command.Click="ExecuteManagePresets" >
+                        </ButtonWidget>
+
                         <!-- Title -->
                         <RichTextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="80" Brush="MCM.Title.Text"
                                         Text="@SelectedDisplayName" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -98,24 +103,6 @@
                       </Children>
                     </ListPanel>
 
-                    <!-- Preset Section -->
-                    <ListPanel WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="80" LayoutImp.LayoutMethod="HorizontalLeftToRight"
-                               HorizontalAlignment="Center" VerticalAlignment="Top" MarginBottom="-20" MarginTop="-30" >
-                      <Children>
-
-                        <!-- Save As Preset -->
-                        <ButtonWidget SuggestedWidth="200" SuggestedHeight="64" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                      MarginLeft="10" DoNotPassEventsToChildren="true" Brush="MCM.Cancel.Button" Command.Click="ExecuteSaveAsPreset"
-                                      IsVisible="@CanSaveAsPreset" >
-                          <Children>
-                            <TextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Text="@SaveAsPreset" Brush="MCM.Button.Text" />
-                          </Children>
-                        </ButtonWidget>
-
-                      </Children>
-                    </ListPanel>
-
                     <!-- Separator -->
                     <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2"  VerticalAlignment="Top" Brush="MCM.Divider.Yellow" MarginLeft="15" MarginRight="15"/>
 

diff --git a/src/MCM.UI/GUI/Prefabs/ModOptionsView.xml b/src/MCM.UI/GUI/Prefabs/ModOptionsView.xml
@@ -112,6 +112,11 @@
                           </Children>
                         </Widget>
 
+                        <!-- Manage Presets -->
+                        <ButtonWidget Id="ExtendButtonWidget" WidthSizePolicy="Fixed" HeightSizePolicy="Fixed" SuggestedWidth="40" SuggestedHeight="40" MarginLeft="10" MarginRight="30"
+                                      HorizontalAlignment="Right" VerticalAlignment="Center" Brush="MCM.Settings" Command.Click="ExecuteManagePresets" >
+                        </ButtonWidget>
+
                         <!-- Title -->
                         <RichTextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="80" Brush="MCM.Title.Text"
                                         Text="@SelectedDisplayName" HorizontalAlignment="Center" VerticalAlignment="Top"/>
@@ -128,24 +133,6 @@
                       </Children>
                     </ListPanel>
 
-                    <!-- Preset Section -->
-                    <ListPanel WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="80" LayoutImp.LayoutMethod="HorizontalLeftToRight"
-                               HorizontalAlignment="Center" VerticalAlignment="Top" MarginBottom="-20" MarginTop="-30" >
-                      <Children>
-
-                        <!-- Save As Preset -->
-                        <ButtonWidget SuggestedWidth="200" SuggestedHeight="64" HorizontalAlignment="Left" VerticalAlignment="Center"
-                                      MarginLeft="10" DoNotPassEventsToChildren="true" Brush="MCM.Cancel.Button" Command.Click="ExecuteSaveAsPreset"
-                                      IsVisible="@CanSaveAsPreset" >
-                          <Children>
-                            <TextWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="StretchToParent" VerticalAlignment="Center" HorizontalAlignment="Center"
-                                        Text="@SaveAsPreset" Brush="MCM.Button.Text" />
-                          </Children>
-                        </ButtonWidget>
-
-                      </Children>
-                    </ListPanel>
-
                     <!-- Separator -->
                     <BrushWidget WidthSizePolicy="StretchToParent" HeightSizePolicy="Fixed" SuggestedHeight="2"  VerticalAlignment="Top" Brush="MCM.Divider.Yellow" MarginLeft="15" MarginRight="15"/>