Improving performance

CodeResources.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using Serilog;
+
+namespace ModShardLauncher
+{
+    internal static class CodeResources
+    {
+        private static readonly Lazy<Dictionary<string, string>> _scripts = new(LoadAllScripts);
+        public static string GetGML(string name)
+        {
+            if (_scripts.Value.TryGetValue(name, out var script)) return script;
+
+            throw new ArgumentException($"GML script '{name}' not found");
+        }
+        private static Dictionary<string, string> LoadAllScripts()
+        {
+            Dictionary<string, string> scripts = new();
+            Assembly assembly = Assembly.GetExecutingAssembly();
+
+            // Load all .gml resources
+            IEnumerable<string> resourceNames = assembly.GetManifestResourceNames()
+                .Where(name => name.EndsWith(".gml"));
+            foreach (string resourceName in resourceNames)
+            {
+                string? scriptName = Path.GetFileNameWithoutExtension(resourceName);
+
+                using Stream? stream =
+                    assembly.GetManifestResourceStream(resourceName) ??
+                    throw new FileNotFoundException($"GML script '{scriptName}' not found");
+                using StreamReader reader = new(stream);
+                scripts[scriptName.Split('.').Last()] = reader.ReadToEnd();
+            }
+
+            return scripts;
+        }
+    }
+}

Controls/GeneralPage.xaml

@@ -292,7 +292,7 @@
         </ComboBox>
         <Label Content="{DynamicResource SettingHeader_Log}" VerticalAlignment="Top" Margin="32,100,0,0"
                Style="{StaticResource xFont}" FontSize="12" Foreground="#95796A"/>
-        <CheckBox HorizontalAlignment="Left" Margin="160,102,0,0" VerticalAlignment="Top" IsChecked="{Binding isEnabled, Mode=TwoWay}" Name="Logger" 
+        <CheckBox HorizontalAlignment="Left" Margin="160,102,0,0" VerticalAlignment="Top" IsChecked="{Binding Enabled, Mode=TwoWay}" Name="Logger" 
                   Checked="Logger_Checked" Unchecked="Logger_Checked">
             <CheckBox.Style>
                 <Style TargetType="CheckBox">

Controls/ModBar.xaml

@@ -51,7 +51,7 @@
             <GridSplitter Width="2" Height="48" HorizontalAlignment="Center" VerticalAlignment="Bottom"
                           Margin="12" Background="#33323F"/>
             <CheckBox HorizontalAlignment="Right" Margin="0,32,128,0" Content="{DynamicResource Enable}"
-                      FontFamily="{StaticResource ssFont}" Foreground="#FFFFFF" IsChecked="{Binding isEnabled, Mode=TwoWay}">
+                      FontFamily="{StaticResource ssFont}" Foreground="#FFFFFF" IsChecked="{Binding Enabled, Mode=TwoWay}">
                 <CheckBox.Style>
                     <Style TargetType="CheckBox">
                         <Setter Property="IsChecked" Value="False"/>

Controls/ModInfos.xaml.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
@@ -36,23 +38,26 @@ private async void Save_Click(object sender, EventArgs e)
 
             bool patchSucess = false;
 
-            try 
+            Stopwatch watch = Stopwatch.StartNew();
+            try
             {
                 ModLoader.PatchFile();
+                long elapsedMs = watch.ElapsedMilliseconds;
+                Main.Instance.LogModListStatus();
+                Log.Information("Patching lasts {{{0}}} ms", elapsedMs);
                 Log.Information("Successfully patch vanilla");
                 patchSucess = true;
-                Main.Instance.LogModList();
             }
-            catch(Exception ex)
+            catch (Exception ex)
             {
-                Main.Instance.LogModList();
+                Main.Instance.LogModListStatus();
                 Log.Error(ex, "Something went wrong");
                 Log.Information("Failed patching vanilla");
                 MessageBox.Show(ex.ToString(), Application.Current.FindResource("SaveDataWarning").ToString());
             }
 
             // attempt to save the patched data
-            if (patchSucess) 
+            if (patchSucess)
             {
                 Task<bool> save = DataLoader.DoSaveDialog();
                 await save;

Controls/ModSourceInfos.xaml

@@ -19,13 +19,6 @@
                         <ImageBrush x:Key="OverSource"  ImageSource="/Resources/Sprites/open_over.png"/>
                     </controls:MyToggleButton.Resources>
                 </controls:MyToggleButton>
-                <controls:MyToggleButton ImageSource="/Resources/Sprites/save.png" Click="Save_Click" ToolTip="Save Data File"
-                         Margin="64,0,0,0">
-                    <controls:MyToggleButton.Resources>
-                        <ImageBrush x:Key="DownSource"  ImageSource="/Resources/Sprites/save_down.png"/>
-                        <ImageBrush x:Key="OverSource"  ImageSource="/Resources/Sprites/save_over.png"/>
-                    </controls:MyToggleButton.Resources>
-                </controls:MyToggleButton>
                 <Border BorderBrush="#43424D" BorderThickness="2"/>
             </Grid>
             <controls:MyItemsControl MaxHeight="672" Height="672" x:Name="SourceList"

Controls/ModSourceInfos.xaml.cs

@@ -23,33 +23,5 @@ private async void Open_Click(object sender, EventArgs e)
             await DataLoader.DoOpenDialog();
             Main.Instance.Refresh();
         }
-        private async void Save_Click(object sender, EventArgs e)
-        {
-            if (DataLoader.data.FORM == null)
-            {
-                MessageBox.Show(Application.Current.FindResource("LoadDataWarning").ToString());
-                return;
-            }
-
-            bool patchSucess = false;
-
-            try 
-            {
-                ModLoader.PatchFile();
-                Log.Information("Successfully patch vanilla");
-                patchSucess = true;
-                Main.Instance.LogModList();
-            }
-            catch(Exception ex)
-            {
-                Main.Instance.LogModList();
-                Log.Error(ex, "Something went wrong");
-                Log.Information("Failed patching vanilla");
-                MessageBox.Show(ex.ToString(), Application.Current.FindResource("SaveDataWarning").ToString());
-            }
-
-            if (patchSucess) await DataLoader.DoSaveDialog();
-            Main.Instance.Refresh();
-        }
     }
 }

FileReader.cs

@@ -16,15 +16,15 @@
 {
     public class FileChunk 
     {
         public string name;
         public int offset;
         public int length;
     }
     public class ModSource
     {
         public string Name { get; set; }
         public string Path { get; set; }
-        public bool isExisted => File.Exists(Path);
+        public bool Existed => File.Exists(Path);
         public override string ToString()
         {
             return Name;
@@ -38,25 +38,25 @@
     }
     public class ModFile
     {
         public string Name;
         public string Version {  get; set; }
         public List<FileChunk> Files = new();
         public Assembly Assembly;
         public int FileOffset;
         public FileStream Stream;
         public string Path;
         public Mod instance { get; set; }
-        public bool isEnabled { get; set; }
+        public bool Enabled { get; set; }
         public PatchStatus PatchStatus { get; set; } = PatchStatus.None;
-        public bool isExisted => File.Exists(Path);
+        public bool Existed => File.Exists(Path);
         public byte[] Icon { get; set; } = Array.Empty<byte>();
         public override string ToString()
         {
             return instance.ToString();
         }
         public byte[] GetFile(string fileName)
         {
-            if(!isExisted)
+            if(!Existed)
             {
                 MessageBox.Show(Application.Current.FindResource("ModLostWarning").ToString() + " : " + Name);
                 ModLoader.LoadFiles();

Main.xaml.cs

@@ -131,27 +131,31 @@ private void SetInitialSize()
             }
         }
 
-        public void LogModList()
+        public void LogModListStatus()
         {
-            foreach (ModFile modFile in ModPage.Mods.Where(x => x.isEnabled))
+            foreach (ModFile modFile in ModPage.Mods.Where(x => x.Enabled))
             {
-                string statusMessage = "";
-                switch (modFile.PatchStatus)
-                {
-                    case PatchStatus.Patching:
-                        statusMessage = "Patching failed";
-                        break;
+                LogModStatus(modFile);
+            }
+        }
+        public static void LogModStatus(ModFile modFile)
+        {
+            string statusMessage = "";
+            switch (modFile.PatchStatus)
+            {
+                case PatchStatus.Patching:
+                    statusMessage = "Patching failed";
+                    break;
 
-                    case PatchStatus.Success:
-                        statusMessage = "Patching succeeded";
-                        break;
+                case PatchStatus.Success:
+                    statusMessage = "Patching succeeded";
+                    break;
 
-                    case PatchStatus.None:
-                        statusMessage = "Waiting to be patched";
-                        break;
-                }
-                Log.Warning("Patching {{{2}}} for {{{0}}} {{{1}}}", modFile.Name, modFile.Version, statusMessage);
+                case PatchStatus.None:
+                    statusMessage = "Waiting to be patched";
+                    break;
             }
+            Log.Warning("Patching {{{2}}} for {{{0}}} {{{1}}}", modFile.Name, modFile.Version, statusMessage);
         }
         private void MyToggleButton_Checked(object sender, EventArgs e)
         {
@@ -219,7 +223,7 @@ public class UserSettings
     {
         public string Language = "English";
         public bool EnableLogger = true;
-        public List<string> EnableMods = new();
+        public List<string> EnabledMods = new();
         public static void LoadSettings()
         {
             // if no settings file, early stop
@@ -233,16 +237,14 @@ public static void LoadSettings()
             CheckLog(Main.Settings.EnableLogger);
 
             // auto check active mods
-            if (Main.Settings.EnableMods.Count > 0)
+            if (Main.Settings.EnabledMods.Count > 0)
             {
                 List<ModFile> listModFile = ModInfos.Instance.Mods;
-                foreach (string i in Main.Settings.EnableMods)
+                foreach (string i in Main.Settings.EnabledMods)
                 {
                     (int indexMod, ModFile? modFile) = listModFile.Enumerate().FirstOrDefault(t => t.Item2.Name == i);
-                    if (modFile != null)
-                        listModFile[indexMod].isEnabled = true;
-                    else
-                        Log.Warning($"Mod {i} not found");
+                    if (modFile != null) listModFile[indexMod].Enabled = true;
+                    else Log.Warning($"Mod {i} not found");
                 }
             }
         }