From c6ae4dec87ce2901fe80ad630016c6600154852f Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Thu, 10 Feb 2022 19:45:11 +0100
Subject: [PATCH 01/13] Add trailer.mp4 file.

---
 {Logo => Media}/KHPC-VF-logo.svg | 0
 {Logo => Media}/logo.png         | 0
 Media/trailer.mp4                | 3 +++
 3 files changed, 3 insertions(+)
 rename {Logo => Media}/KHPC-VF-logo.svg (100%)
 rename {Logo => Media}/logo.png (100%)
 create mode 100644 Media/trailer.mp4

diff --git a/Logo/KHPC-VF-logo.svg b/Media/KHPC-VF-logo.svg
similarity index 100%
rename from Logo/KHPC-VF-logo.svg
rename to Media/KHPC-VF-logo.svg
diff --git a/Logo/logo.png b/Media/logo.png
similarity index 100%
rename from Logo/logo.png
rename to Media/logo.png
diff --git a/Media/trailer.mp4 b/Media/trailer.mp4
new file mode 100644
index 00000000..30ad5e13
--- /dev/null
+++ b/Media/trailer.mp4
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d8189b855ccc46da34d66d3f73fde8d07daf28dcbc3e8bec1858919a9e0badd
+size 21734415

From 2e71b81134d1424c99202258737ed07e9c6044ab Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Fri, 21 Jun 2024 22:11:27 +0200
Subject: [PATCH 02/13] Add a check for the Steam Deck path.

---
 KHFM-VF-Patch/MainWindow.xaml    |  2 +-
 KHFM-VF-Patch/MainWindow.xaml.cs | 23 ++++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/KHFM-VF-Patch/MainWindow.xaml b/KHFM-VF-Patch/MainWindow.xaml
index 90172c1e..2f13100d 100644
--- a/KHFM-VF-Patch/MainWindow.xaml
+++ b/KHFM-VF-Patch/MainWindow.xaml
@@ -76,7 +76,7 @@
         <TextBlock x:Name="GameFoundMessage" Grid.Column="0" Grid.Row="1" TextWrapping="Wrap" Padding="5" FontWeight="Bold" TextAlignment="Center" Foreground="#FF56BF5F">Le dossier du jeu semble correct et est prêt à être patché ! Cliquez sur le bouton ci-dessous lorsque vous êtes prêt.</TextBlock>
         <TextBlock x:Name="PatchProgressionMessage" Grid.Column="0" Grid.Row="1" TextWrapping="Wrap" Padding="5" FontWeight="Normal" TextAlignment="Center" Foreground="#FF56BF5F">[Progression du patch]</TextBlock>
         <ProgressBar x:Name="PatchProgressBar"  Grid.Column="0" Grid.Row="2" Minimum="0" Maximum="100" Height="42" Value="{Binding PatchState}" Visibility="Visible" />
-        <Button Grid.Column="0" Grid.Row="3" x:Name="BrowseButton" Width="450" Height="100" Content="Chercher le dossier du jeu" Click="BrowsFolderButtonClick" Visibility="Visible" Background="#FFD32626" Foreground="White" FontWeight="Bold" FontSize="20"/>
+        <Button Grid.Column="0" Grid.Row="3" x:Name="BrowseButton" Width="450" Height="100" Content="Chercher le dossier du jeu" Click="BrowseFolderButtonClick" Visibility="Visible" Background="#FFD32626" Foreground="White" FontWeight="Bold" FontSize="20"/>
         <Button Grid.Column="0" Grid.Row="3" x:Name="PatchButton" Width="450" Height="50" Content="Patcher le jeu" Click="PatchGameButtonClick" Visibility="Collapsed" Background="#FF43B133" Foreground="White" FontWeight="Bold" FontSize="20" />
         <TextBlock x:Name="Credits" Grid.Column="0" Grid.Row="2" TextWrapping="Wrap" Padding="5" FontWeight="Normal" TextAlignment="Center" VerticalAlignment="Stretch" Foreground="Black"> 
             <TextBlock FontSize="25" FontWeight="Bold" TextAlignment="Center" VerticalAlignment="Stretch" Foreground="Black">Crédits</TextBlock>
diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index 636bf84e..bf48bf42 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -26,7 +26,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
 
         private const int REQUIRED_RANDOM_QUOTES_COUNT = 3;
 
-        private List<string> RANDOM_QUOTES = new List<string>()
+        private List<string> RANDOM_QUOTES = new()
         {
             "Cela pourrait être un peu long, je vous conseille d'aller chercher un café...",
             "Sinon ça a été votre journée ?",
@@ -64,6 +64,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
 
         private const string DEFAULT_EPIC_GAMES_FOLDER = @"C:\Program Files\Epic Games\KH_1.5_2.5";
         private const string DEFAULT_STEAM_FOLDER = @"C:\Program Files (x86)\Steam\steamapps\common\KINGDOM HEARTS -HD 1.5+2.5 ReMIX-";
+        private const string DEFAULT_STEAM_DECK_FOLDER = "/home/deck/.local/share/Steam/steamapps/Common/KINGDOM HEARTS -HD 1.5+2.5 ReMIX-";
         private const string SAVE_FOLDER_NAME = "Patch/Saves";
         private const string PATCHED_FILES_FOLDER_NAME = "Patch/Temp";
         private static readonly List<string> REQUIRED_FILE_NAMES = new List<string>()
@@ -74,13 +75,12 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             "kh1_fifth.pkg", "kh1_fifth.hed",
         };
 
-        private Progress<List<object>> _progress;
-
         public event PropertyChangedEventHandler PropertyChanged;
+        private Progress<List<object>> _progress;
         private float _patchState = 0f;
         private string _selectedGameFolder;
         private int _randomQuotesCounter = 0;
-        private bool isSteamInstall = false;
+        private bool _isSteamInstall = false;
 
         public float PatchState
         {
@@ -156,6 +156,11 @@ public MainWindow()
                 _selectedGameFolder = DEFAULT_STEAM_FOLDER;
                 ReadyToPatchState();
             }
+            else if (CheckGameFolder(DEFAULT_STEAM_DECK_FOLDER))
+            {
+                _selectedGameFolder = DEFAULT_STEAM_DECK_FOLDER;
+                ReadyToPatchState();
+            }
             else
             {
                 Debug.WriteLine("Default game folder not found.");
@@ -280,7 +285,7 @@ private void FinishedState()
             RandomQuotes.Visibility = Visibility.Collapsed;
         }
 
-        private void BrowsFolderButtonClick(object sender, RoutedEventArgs e)
+        private void BrowseFolderButtonClick(object sender, RoutedEventArgs e)
         {
             using (var dialog = new FolderBrowserDialog())
             {
@@ -313,14 +318,14 @@ private void BrowsFolderButtonClick(object sender, RoutedEventArgs e)
 
         private List<string> GetRequiredFiles()
         {
-            var pathname = isSteamInstall ? "dt/" : "en/";
+            var pathname = _isSteamInstall ? "dt/" : "en/";
             var filepaths = new List<string>();
 
             foreach (var filename in REQUIRED_FILE_NAMES)
             {
                 filepaths.Add("Image/" + pathname + filename);
             }
-         
+
             return filepaths;
         }
 
@@ -340,7 +345,7 @@ private bool CheckGameFolder(string folder)
         {
             // Check if install is a Steam install
             var steamPath = Path.Combine(folder, "STEAM");
-            isSteamInstall = Directory.Exists(steamPath);
+            _isSteamInstall = Directory.Exists(steamPath);
 
             // Check PKG/HED files
             foreach (var requiredFile in GetRequiredFiles())
@@ -485,7 +490,7 @@ private async Task PatchVideos()
 
                 var openingVideoFile = Path.Combine(PATCH_FOLDER, KH1_PATCH_EXTRACTION_FOLDER_NAME, KH1_OPENING_VIDEO_FILENAME);
                 var endingVideoFile = Path.Combine(PATCH_FOLDER, KH1_PATCH_EXTRACTION_FOLDER_NAME, KH1_ENDING_VIDEO_FILENAME);
-                var movieFolderPath = isSteamInstall ? @"STEAM\dt\KH1Movie" : @"EPIC\en\KH1Movie";
+                var movieFolderPath = _isSteamInstall ? @"STEAM\dt\KH1Movie" : @"EPIC\en\KH1Movie";
                 var gameVideosFolder = Path.Combine(_selectedGameFolder, movieFolderPath);
                 var originalOpeningVideoFile = Path.Combine(gameVideosFolder, KH1_OPENING_VIDEO_FILENAME);
                 var originalEndingVideoFile = Path.Combine(gameVideosFolder, KH1_ENDING_VIDEO_FILENAME);

From d30ec93e1adc3e802acd2cb8048710a65dade0df Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 10:45:53 +0200
Subject: [PATCH 03/13] Fix quotes.

---
 KHFM-VF-Patch/MainWindow.xaml.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index 636bf84e..b9faec0e 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -35,13 +35,12 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             "Richard Darbois est connu pour avoir fait des voix emblématiques, dont celle d'Indiana Jones ou de Buzz l'Éclair, mais saviez-vous qu'il a participé à ce Kingdom Hearts en doublant le génie et Oogie Boogie ?",
             "Kingdom Hearts est le premier jeu de la série, mais ce n'est pas par lui que commence véritablement l'histoire.",
             "Si comme moi vous n'avez jamais fait la version Final Mix du jeu, sachez qu'un boss plus compliqué que Sephiroth vous attend ! J'ai tellement hâte !",
-            "Ce patch a nécessité des dizaines d'heures de travail et totalise actuellement 119 commits sur 3 repo différents !",
-            "Ne vous inquietez pas, le patch pour les voix française sur Kingdom Hearts 2 est déjà dans les tuyaux !",
-            "Vous trouverez probablement un patch dans le futur qui permettra de ré-utiliser les textures de PS3 sur la version PC (qui sont de meilleures qualité que celle de la version PS4 utilisé aujourd'hui).",
-            "Une modification futur de ce patch permettra peut-être de supprimer les sous-titres pour renforcer l'immersion.",
+            "Ce patch a nécessité des dizaines d'heures de travail et totalise des centaines de commits sur 3 repos différents !",
+            "Un patch pour rétablir les voix françaises sur Kingdom Hearts 2 a été créé par TieuLink sur le site Nexus Mods !",
+            "Une modification future de ce patch permettra peut-être de supprimer les sous-titres pour renforcer l'immersion.",
             "Saviez-vous que Mickey était censé être le protagoniste principal du jeu à la place de Sora ? Cela expliquerait pourquoi Donald et Dingo sont ses compagnons.",
             "Disney ne voulait pas que Mickey soit dans le jeu, ils ont finalement accepté, mais à la condition qu'il ne soit présent que dans une seule scène du jeu, Nomura à choisi de le mettre à la fin.",
-            "La compositrice du jeu, Yoko Shimomura a également composé les musiques de Street Fighter 2, Legend of Mana, Xenoblade Chronicles et Final Fantasy XV.",
+            "Yoko Shimomura, la compositrice du jeu, a également composé les musiques de Street Fighter 2, Legend of Mana, Xenoblade Chronicles et Final Fantasy XV.",
             "La musique One-Winged Angel présente dans le jeu vient de Final Fantasy VII et a été composée par Nobuo Uematsu.",
             "Disney a été très furieux quand ils ont vu que Ariel pouvait se battre. Pour s'excuser, Square Enix a été forcé d'en faire un monde musical dans Kingdom Hearts 2...",
             "Dans la Forteresse Oublié il y a une entrée pour un ascenseur près du sommet mais... pas d'ascenseur !",

From 2ddb04d68a1eab765e726882ba5467aa675b33b1 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 10:49:29 +0200
Subject: [PATCH 04/13] Update .NET version used by the project from .NET 5.0
 to .NET 8.0.

---
 KHFM-VF-Patch/KHFM-VF-Patch.csproj | 2 +-
 KHFM-VF-Patch/MainWindow.xaml.cs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/KHFM-VF-Patch/KHFM-VF-Patch.csproj b/KHFM-VF-Patch/KHFM-VF-Patch.csproj
index d3d61d39..a3036af2 100644
--- a/KHFM-VF-Patch/KHFM-VF-Patch.csproj
+++ b/KHFM-VF-Patch/KHFM-VF-Patch.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0-windows</TargetFramework>
+    <TargetFramework>net8.0-windows7.0</TargetFramework>
     <RootNamespace>KHFM_VF_Patch</RootNamespace>
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index b9faec0e..a21fd8df 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -122,7 +122,7 @@ public MainWindow()
             var assemblyPath = Assembly.GetEntryAssembly().Location;
             var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
 
-            if (assemblyDirectory.EndsWith("net5.0-windows"))
+            if (assemblyDirectory.Equals("net8.0-windows7.0"))
             {
                 PROJECT_DIRECTORY = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.Parent.FullName;
             }

From f4edfb592bebecb07fbec467077bc288b0ed6ac9 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 10:58:56 +0200
Subject: [PATCH 05/13] Update the CI.

---
 .github/workflows/dotnet-desktop.yml |  8 ++++----
 CI/CreateArtifact.cmd                | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 82c79998..543124ae 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -14,12 +14,12 @@ jobs:
         run: Install-Module 7Zip4PowerShell -Force -Verbose
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           lfs: 'true'
 
       - name: Get the version
-        uses: kzrnm/get-net-sdk-project-versions-action@v1
+        uses: kzrnm/get-net-sdk-project-versions-action@v2
         id: get-version
         with:
           proj-path: KHFM-VF-Patch/KHFM-VF-Patch.csproj
@@ -33,10 +33,10 @@ jobs:
         run: call .\CI\CreateArtifact.cmd
 
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: KHFM-VF-Patch
-          path: .\KHFM-VF-Patch\bin\x86\Release\net5.0-windows
+          path: .\KHFM-VF-Patch\bin\x86\Release\net8.0-windows7.0
 
       - name: Create Release
         id: create_release
diff --git a/CI/CreateArtifact.cmd b/CI/CreateArtifact.cmd
index 574a711a..93654ddc 100644
--- a/CI/CreateArtifact.cmd
+++ b/CI/CreateArtifact.cmd
@@ -4,18 +4,18 @@ pushd "%~dp0"
 cd ..\KHFM-VF-Patch
 
 @REM Create Patches directory
-powershell New-Item -Path "bin\x86\Release\net5.0-windows\Resources\Patches" -ItemType Directory
+powershell New-Item -Path "bin\x86\Release\net8.0-windows7.0\Resources\Patches" -ItemType Directory
 
 @REM Zip all sub-patches in the proper directory with the proper extension
-powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-EN" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Magic-EN.patch" -Format Zip
-powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-FR" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Magic-FR.patch" -Format Zip
-powershell Compress-7Zip "Resources\Patches\KH1FM-Stranger" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Stranger.patch" -Format Zip
-powershell Compress-7Zip "Resources\Patches\KH1FM-Textures" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Textures.patch" -Format Zip
-powershell Compress-7Zip "Resources\Patches\KH1FM-Voices" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Voices.patch" -Format Zip
-powershell Compress-7Zip "Resources\Patches\KH1FM-Videos" -ArchiveFileName "bin\x86\Release\net5.0-windows\Resources\Patches\KH1FM-Videos.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-EN" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Magic-EN.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Magic-FR" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Magic-FR.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Stranger" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Stranger.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Textures" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Textures.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Voices" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Voices.patch" -Format Zip
+powershell Compress-7Zip "Resources\Patches\KH1FM-Videos" -ArchiveFileName "bin\x86\Release\net8.0-windows7.0\Resources\Patches\KH1FM-Videos.patch" -Format Zip
 
 @REM Zip all patch files to upload them for release
-powershell Compress-7Zip "bin\x86\Release\net5.0-windows" -ArchiveFileName "KHFM-VF-Patch.zip" -Format Zip
+powershell Compress-7Zip "bin\x86\Release\net8.0-windows7.0" -ArchiveFileName "KHFM-VF-Patch.zip" -Format Zip
 
 :exit
 popd

From 5d1fa8c986aadf3a41dc55c9ebd0981c8ee6a4a2 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 11:02:21 +0200
Subject: [PATCH 06/13] Update the README.

---
 README.md | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 25090e07..a3d98e71 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="KHFM-VF-Patch/Resources/Images/logo.png" alt="logo" width="500"/></div>
 </p>
 
-# Kingdom Hearts Final Mix PC - Patch voix Française
+# Kingdom Hearts Final Mix PC - Patch voix Françaises
 
 Patch pour changer les voix anglaises de Kingdom Hearts 1 Final Mix PC par les voix françaises de la version PS2 de 2002.
 
@@ -14,12 +14,12 @@ https://user-images.githubusercontent.com/1321964/153475214-48c44bb3-9ba4-40d2-b
   </a>
 </div>
 
-### Installation de .NET 5.0
+### Installation de .NET 8.0
 
 Si vous avez ce message en lançant le patch:
 > To run this application, you must install .NET . Would you like to download it now?
 
-Vous devez installer .NET 5.0 (x86) trouvable sur le site de Microsoft: https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-5.0.14-windows-x86-installer
+Vous devez installer .NET 8.0 (x86) trouvable sur le site de Microsoft: https://dotnet.microsoft.com/en-us/download/dotnet/thank-you/runtime-desktop-8.0.6-windows-x86-installer
 
 ### Attention
 
@@ -39,11 +39,6 @@ Mais cela a également été possible grâce à une poignée de français déter
 - [Purple Hato](https://twitter.com/PurpleHato): qui s'est occupé de corriger certains anglicismes visuels et textuels.
 - [TieuLink](https://twitter.com/TieuLink), [Xeronkar](https://twitter.com/xeronkar), [Napstio](https://www.youtube.com/channel/UCR5O00P0r9BbKWb7X-Gfe-w): pour leurs connaissances sur les fichiers du jeu et leurs tests qui ont permis de déceler les problèmes.
 - [AntonioDePau](https://twitter.com/AntonioDePau): pour avoir corrigé les problèmes de l'outil permettant de patcher les fichiers du jeu
+- [DylanCa](https://github.com/DylanCa): pour avoir porté le patch pour la version Steam
 
-De mon côté ([Noxalus]("https://twitter.com/Noxalus")) j'ai initié ce projet 2 semaines avant la sortie du jeu et j'ai créé 2 outils au coeur de ce patch, le premier permet de remplacer certains fichiers du jeu et le second permet de convertir les voix françaises de la version PS2 au format PC.
-
-Si vous appréciez mon travail, vous pouvez toujours me remercier en m'offrant une pizza ! :p
-
-<p align="center">
-  <a href="https://www.paypal.com/donate/?business=QB2DD2YWXZ79E&currency_code=EUR"><img src="KHFM-VF-Patch/Resources/Images/donate.png" alt="logo" width="200"/></href>
-</p>
+De mon côté ([Noxalus]("https://twitter.com/Noxalus")) j'ai initié ce projet 2 semaines avant la sortie du jeu et j'ai créé 2 outils au coeur de ce patch, le premier permet de remplacer certains fichiers du jeu et le second permet de convertir les voix françaises de la version PS2 au format PC.
\ No newline at end of file

From 0a6cc2aafa90a3360ac8aa42f9b35a3ed106c1b0 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 11:04:48 +0200
Subject: [PATCH 07/13] Add the Github action status badge to the README.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a3d98e71..4d59c6de 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
   <img src="KHFM-VF-Patch/Resources/Images/logo.png" alt="logo" width="500"/></div>
 </p>
 
-# Kingdom Hearts Final Mix PC - Patch voix Françaises
+# Kingdom Hearts Final Mix PC - Patch voix Françaises [![GitHub Release](https://github.com/Noxalus/KHFM-VF-Patch/actions/workflows/dotnet-desktop.yml/badge.svg)](https://github.com/Noxalus/KHFM-VF-Patch/actions/workflows/dotnet-desktop.yml)
 
 Patch pour changer les voix anglaises de Kingdom Hearts 1 Final Mix PC par les voix françaises de la version PS2 de 2002.
 

From 14435da78ce5eb9341573fc70843c82ad9735f92 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 11:44:22 +0200
Subject: [PATCH 08/13] Try to fix CI warnings.

---
 .github/workflows/dotnet-desktop.yml | 30 +++++++---------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 543124ae..7d965b55 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -18,8 +18,8 @@ jobs:
         with:
           lfs: 'true'
 
-      - name: Get the version
-        uses: kzrnm/get-net-sdk-project-versions-action@v2
+      - name: Get the project's version
+        uses: kzrnm/get-net-sdk-project-versions-action@v2.0.0
         id: get-version
         with:
           proj-path: KHFM-VF-Patch/KHFM-VF-Patch.csproj
@@ -32,30 +32,14 @@ jobs:
         shell: cmd
         run: call .\CI\CreateArtifact.cmd
 
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: KHFM-VF-Patch
-          path: .\KHFM-VF-Patch\bin\x86\Release\net8.0-windows7.0
+      - name: Rename Artifact with project version
+        shell: cmd
+        run: mv ./KHFM-VF-Patch/KHFM-VF-Patch.zip ./KHFM-VF-Patch/KHFM-VF-Patch-${{ steps.get-version.outputs.version }}.zip
 
       - name: Create Release
         id: create_release
-        uses: actions/create-release@latest
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ steps.get-version.outputs.version }}
-          release_name: v${{ steps.get-version.outputs.version }}
+          files: ./KHFM-VF-Patch/KHFM-VF-Patch-${{ steps.get-version.outputs.version }}.zip
           draft: true
           prerelease: true
-
-      - name: Upload Release Asset
-        id: upload-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./KHFM-VF-Patch/KHFM-VF-Patch.zip
-          asset_name: KHFM-VF-Patch-${{ steps.get-version.outputs.version }}.zip
-          asset_content_type: application/zip

From a0aea95a817b24159b6b1413252ec375a4033372 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 20:26:20 +0200
Subject: [PATCH 09/13] Clean the code.

---
 KHFM-VF-Patch/MainWindow.xaml.cs | 247 ++++++++++++-------------------
 1 file changed, 98 insertions(+), 149 deletions(-)

diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index a21fd8df..ed732ebf 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -14,7 +14,6 @@
 using System.Windows.Media;
 using System.Windows.Navigation;
 using System.Windows.Threading;
-using Path = System.IO.Path;
 
 namespace KHFM_VF_Patch
 {
@@ -23,10 +22,9 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         private readonly string PROJECT_DIRECTORY;
         private const string PATCH_FOLDER_RELATIVE_PATH = "Resources/Patches";
         private static readonly string PATCH_FOLDER = Path.Combine(Path.GetDirectoryName(AppContext.BaseDirectory), PATCH_FOLDER_RELATIVE_PATH);
-
         private const int REQUIRED_RANDOM_QUOTES_COUNT = 3;
 
-        private List<string> RANDOM_QUOTES = new List<string>()
+        private static readonly List<string> RANDOM_QUOTES = new()
         {
             "Cela pourrait être un peu long, je vous conseille d'aller chercher un café...",
             "Sinon ça a été votre journée ?",
@@ -50,22 +48,20 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         };
 
         private const string DONATE_URL = "https://www.paypal.com/donate/?business=QB2DD2YWXZ79E&currency_code=EUR";
-
         private const string KH1_PATCH_VOICES_ZIP_NAME = "KH1FM-Voices.patch";
         private const string KH1_PATCH_VIDEOS_ZIP_NAME = "KH1FM-Videos.patch";
         private const string KH1_PATCH_TEXTURES_ZIP_NAME = "KH1FM-Textures.patch";
         private const string KH1_PATCH_MAGIC_ZIP_NAME = "KH1FM-Magic-{LANG}.patch";
         private const string KH1_PATCH_STRANGER_ZIP_NAME = "KH1FM-Stranger.patch";
-
         private const string KH1_PATCH_EXTRACTION_FOLDER_NAME = "KH1_PATCH";
         private const string KH1_OPENING_VIDEO_FILENAME = "OPN.mp4";
         private const string KH1_ENDING_VIDEO_FILENAME = "END.mp4";
-
         private const string DEFAULT_EPIC_GAMES_FOLDER = @"C:\Program Files\Epic Games\KH_1.5_2.5";
         private const string DEFAULT_STEAM_FOLDER = @"C:\Program Files (x86)\Steam\steamapps\common\KINGDOM HEARTS -HD 1.5+2.5 ReMIX-";
         private const string SAVE_FOLDER_NAME = "Patch/Saves";
         private const string PATCHED_FILES_FOLDER_NAME = "Patch/Temp";
-        private static readonly List<string> REQUIRED_FILE_NAMES = new List<string>()
+
+        private static readonly List<string> REQUIRED_FILE_NAMES = new()
         {
             "kh1_first.pkg", "kh1_first.hed",
             "kh1_third.pkg", "kh1_third.hed",
@@ -73,48 +69,50 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             "kh1_fifth.pkg", "kh1_fifth.hed",
         };
 
-        private Progress<List<object>> _progress;
-
+        private readonly Progress<List<object>> _progress;
         public event PropertyChangedEventHandler PropertyChanged;
-        private float _patchState = 0f;
+
+        private float _patchState;
         private string _selectedGameFolder;
-        private int _randomQuotesCounter = 0;
-        private bool isSteamInstall = false;
+        private int _randomQuotesCounter;
+        private bool isSteamInstall;
 
         public float PatchState
         {
-            get { return _patchState; }
+            get => _patchState;
             set
             {
                 _patchState = value;
-                if (PropertyChanged != null)
-                {
-                    PropertyChanged(this, new PropertyChangedEventArgs("PatchState"));
-                }
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(PatchState)));
             }
         }
 
         public bool ShouldPatchMagic
         {
-            get { return (bool)GetValue(ShouldPatchMagicProperty); }
-            set { SetValue(ShouldPatchMagicProperty, value); }
+            get => (bool)GetValue(ShouldPatchMagicProperty);
+            set => SetValue(ShouldPatchMagicProperty, value);
         }
 
         public bool ShouldPatchTexture
         {
-            get { return (bool)GetValue(ShouldPatchTextureProperty); }
-            set { SetValue(ShouldPatchTextureProperty, value); }
+            get => (bool)GetValue(ShouldPatchTextureProperty);
+            set => SetValue(ShouldPatchTextureProperty, value);
         }
 
         public bool ShouldSaveOriginalFiles
         {
-            get { return (bool)GetValue(ShouldSaveOriginalFilesProperty); }
-            set { SetValue(ShouldSaveOriginalFilesProperty, value); }
+            get => (bool)GetValue(ShouldSaveOriginalFilesProperty);
+            set => SetValue(ShouldSaveOriginalFilesProperty, value);
         }
 
-        public static readonly DependencyProperty ShouldPatchMagicProperty = DependencyProperty.Register("PatchMagicOption", typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
-        public static readonly DependencyProperty ShouldPatchTextureProperty = DependencyProperty.Register("PatchTextureOption", typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
-        public static readonly DependencyProperty ShouldSaveOriginalFilesProperty = DependencyProperty.Register("SaveOriginalFilesOption", typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
+        public static readonly DependencyProperty ShouldPatchMagicProperty =
+            DependencyProperty.Register(nameof(ShouldPatchMagic), typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
+
+        public static readonly DependencyProperty ShouldPatchTextureProperty =
+            DependencyProperty.Register(nameof(ShouldPatchTexture), typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
+
+        public static readonly DependencyProperty ShouldSaveOriginalFilesProperty =
+            DependencyProperty.Register(nameof(ShouldSaveOriginalFiles), typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
 
         public MainWindow()
         {
@@ -128,7 +126,6 @@ public MainWindow()
             }
 
             InitializeComponent();
-
             DataContext = this;
 
             SearchGameFolderState();
@@ -139,10 +136,7 @@ public MainWindow()
                 var totalFileSize = (long)value[1];
                 var filename = (string)value[2];
 
-                var progress = ((double)copiedSize / totalFileSize) * 100;
-
-                PatchState = (float)progress;
-                //Debug.WriteLine("{1} {0:N2}%", progress, filename);
+                PatchState = (float)((double)copiedSize / totalFileSize * 100);
             });
 
             if (CheckGameFolder(DEFAULT_EPIC_GAMES_FOLDER))
@@ -158,26 +152,12 @@ public MainWindow()
             else
             {
                 Debug.WriteLine("Default game folder not found.");
-                //GameNotFoundWarningMessage.Visibility = Visibility.Collapsed;
-                //GameNotFoundWarningMessage.Text =
-                //    "Le dossier d'installation de Kingdom Hearts HD 1.5 + 2.5 ReMIX n'a pas été trouvé automatiquement. " +
-                //    "Cliquez sur le bouton ci-dessous pour indiquer où vous avez installé le jeu sur votre machine.";
             }
-
-            //FinishedState();
         }
 
         private void SearchGameFolderState()
         {
-            GameNotFoundWarningMessage.Visibility = Visibility.Visible;
-            BrowseButton.Visibility = Visibility.Visible;
-            PatchButton.Visibility = Visibility.Collapsed;
-            GameFoundMessage.Visibility = Visibility.Collapsed;
-            PatchProgressionMessage.Visibility = Visibility.Collapsed;
-            PatchProgressBar.Visibility = Visibility.Collapsed;
-            Credits.Visibility = Visibility.Collapsed;
-            PatchOptions.Visibility = Visibility.Collapsed;
-            RandomQuotes.Visibility = Visibility.Collapsed;
+            SetUIVisibility(gameNotFound: true, browse: true);
         }
 
         private void ReadyToPatchState()
@@ -188,42 +168,22 @@ private void ReadyToPatchState()
 
             if (!ShouldSaveOriginalFiles || CheckRemainingSpace(_selectedGameFolder))
             {
-                GameNotFoundWarningMessage.Visibility = Visibility.Collapsed;
-                BrowseButton.Visibility = Visibility.Collapsed;
-                IgnoreSaveButton.Visibility = Visibility.Collapsed;
-                PatchButton.Visibility = Visibility.Visible;
-                GameFoundMessage.Visibility = Visibility.Visible;
-                Credits.Visibility = Visibility.Collapsed;
-                PatchOptions.Visibility = Visibility.Visible;
-                SaveOriginalFilesCheckbox.Visibility = ShouldSaveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
-                SaveOriginalFilesDescription.Visibility = ShouldSaveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
+                SetUIVisibility(patch: true, gameFound: true, patchOptions: true, saveOriginalFiles: ShouldSaveOriginalFiles);
                 ImageHeight.Height = new GridLength(75);
             }
             else
             {
-                var freeSpace = GetFreeSpace(_selectedGameFolder);
-                GameNotFoundWarningMessage.Visibility = Visibility.Visible;
                 GameNotFoundWarningMessage.Text = "Attention: ce patch s'assure de sauvegarder tous les fichiers originaux avant de les modifier afin que votre jeu ne soit pas cassé s'il y a un problème pendant le processus. " +
                     "Mais ces fichiers sont gros, 4 Go en tout et il semblerait que vous n'ayez pas suffisament d'espace pour pouvoir effectuer cette sauvegarde correctement." +
                     "Assurez-vous donc d'avoir suffisament d'espace libre avant de patcher votre jeu !";
-                BrowseButton.Visibility = Visibility.Collapsed;
-                IgnoreSaveButton.Visibility = Visibility.Visible;
+                SetUIVisibility(gameNotFound: true, ignoreSave: true);
             }
         }
 
         private void PatchingState()
         {
-            GameNotFoundWarningMessage.Visibility = Visibility.Collapsed;
-            GameFoundMessage.Visibility = Visibility.Collapsed;
-            PatchProgressionMessage.Visibility = Visibility.Visible;
-            PatchProgressBar.Visibility = Visibility.Visible;
-            PatchButton.Visibility = Visibility.Collapsed;
-            Credits.Visibility = Visibility.Collapsed;
-            PatchOptions.Visibility = Visibility.Collapsed;
+            SetUIVisibility(patchProgress: true, randomQuotes: true);
             ImageHeight.Height = new GridLength(250);
-
-            RandomQuotes.Visibility = Visibility.Visible;
-
             StartRandomQuotes();
         }
 
@@ -231,7 +191,7 @@ private void StartRandomQuotes()
         {
             UpdateRandomQuotes(null, null);
 
-            DispatcherTimer timer = new DispatcherTimer
+            DispatcherTimer timer = new()
             {
                 Interval = TimeSpan.FromSeconds(10)
             };
@@ -268,7 +228,7 @@ private void UpdateRandomQuotes(object sender, EventArgs e)
         private void FinishedState()
         {
             GameNotFoundWarningMessage.Visibility = Visibility.Collapsed;
-            PatchProgressionMessage.Text = $"Votre jeu a correctement été patché ! Profitez bien des voix françaises ;)";
+            PatchProgressionMessage.Text = "Votre jeu a correctement été patché ! Profitez bien des voix françaises ;)";
             PatchProgressionMessage.FontWeight = FontWeights.Bold;
             PatchProgressionMessage.Visibility = Visibility.Visible;
             PatchProgressBar.Visibility = Visibility.Collapsed;
@@ -281,31 +241,23 @@ private void FinishedState()
 
         private void BrowsFolderButtonClick(object sender, RoutedEventArgs e)
         {
-            using (var dialog = new FolderBrowserDialog())
+            using var dialog = new FolderBrowserDialog();
+            if (dialog.ShowDialog() == System.Windows.Forms.DialogResult.OK)
             {
-                DialogResult result = dialog.ShowDialog();
+                Debug.WriteLine($"Selected: {dialog.SelectedPath}");
 
-                if (result == System.Windows.Forms.DialogResult.OK)
+                if (CheckGameFolder(dialog.SelectedPath))
                 {
-                    Debug.WriteLine($"Selected: {dialog.SelectedPath}");
-
-                    if (CheckGameFolder(dialog.SelectedPath))
-                    {
-                        _selectedGameFolder = dialog.SelectedPath;
-                        ReadyToPatchState();
-                    }
-                    else
-                    {
-                        GameNotFoundWarningMessage.Visibility = Visibility.Visible;
-
-                        GameNotFoundWarningMessage.Text =
-                            "Le dossier d'installation de Kingdom Hearts HD 1.5 + 2.5 ReMIX que vous avez spécifié n'est pas valide.\n" +
-                            "Il doit s'agir du dossier dans lequel l'Epic Game Store ou Steam a téléchargé les fichiers du jeu.\n" +
-                            $"Le dossier que vous avez donné: ";
-                        GameNotFoundWarningMessage.Inlines.Add(new Italic(new Run($"\"{dialog.SelectedPath}\"")));
-
-                        Debug.WriteLine("The selected folder is not valid!");
-                    }
+                    _selectedGameFolder = dialog.SelectedPath;
+                    ReadyToPatchState();
+                }
+                else
+                {
+                    GameNotFoundWarningMessage.Text =
+                        "Le dossier d'installation de Kingdom Hearts HD 1.5 + 2.5 ReMIX que vous avez spécifié n'est pas valide.\n" +
+                        "Il doit s'agir du dossier dans lequel l'Epic Game Store ou Steam a téléchargé les fichiers du jeu.\n" +
+                        $"Le dossier que vous avez donné: ";
+                    GameNotFoundWarningMessage.Inlines.Add(new Italic(new Run($"\"{dialog.SelectedPath}\"")));
                 }
             }
         }
@@ -317,9 +269,9 @@ private List<string> GetRequiredFiles()
 
             foreach (var filename in REQUIRED_FILE_NAMES)
             {
-                filepaths.Add("Image/" + pathname + filename);
+                filepaths.Add($"Image/{pathname}{filename}");
             }
-         
+
             return filepaths;
         }
 
@@ -338,8 +290,7 @@ private void PatchGameButtonClick(object sender, RoutedEventArgs e)
         private bool CheckGameFolder(string folder)
         {
             // Check if install is a Steam install
-            var steamPath = Path.Combine(folder, "STEAM");
-            isSteamInstall = Directory.Exists(steamPath);
+            isSteamInstall = Directory.Exists(Path.Combine(folder, "STEAM"));
 
             // Check PKG/HED files
             foreach (var requiredFile in GetRequiredFiles())
@@ -375,11 +326,9 @@ private async Task Patch(string gameFolder)
             try
             {
                 var patchesExtractionFolder = Path.Combine(PATCH_FOLDER, KH1_PATCH_EXTRACTION_FOLDER_NAME);
-                //#if RELEASE
-                // Make sure to remove patches extraction folders at first
+
                 if (Directory.Exists(patchesExtractionFolder))
                     Directory.Delete(patchesExtractionFolder, true);
-                //#endif
 
                 // Update videos if the corresponding patch is found
                 await PatchVideos();
@@ -390,16 +339,9 @@ private async Task Patch(string gameFolder)
                 // Extract "Magic" to "Magie" fix patch
                 if (ShouldPatchMagic)
                 {
-                    var magicPatchName = KH1_PATCH_MAGIC_ZIP_NAME;
-
-                    if (ShouldPatchTexture)
-                    {
-                        magicPatchName = magicPatchName.Replace("{LANG}", "FR");
-                    }
-                    else
-                    {
-                        magicPatchName = magicPatchName.Replace("{LANG}", "EN");
-                    }
+                    var magicPatchName = ShouldPatchTexture
+                        ? KH1_PATCH_MAGIC_ZIP_NAME.Replace("{LANG}", "FR")
+                        : KH1_PATCH_MAGIC_ZIP_NAME.Replace("{LANG}", "EN");
 
                     await ExtractPatch(magicPatchName);
                 }
@@ -413,10 +355,8 @@ private async Task Patch(string gameFolder)
 
                 // Create temporary folder to store patched files before to copy them in the actual game folder
                 var patchedFilesBaseFolder = Path.Combine(gameFolder, PATCHED_FILES_FOLDER_NAME);
-
                 if (Directory.Exists(patchedFilesBaseFolder))
                     Directory.Delete(patchedFilesBaseFolder, true);
-
                 Directory.CreateDirectory(patchedFilesBaseFolder);
 
                 foreach (var requiredFile in GetRequiredFiles())
@@ -444,10 +384,7 @@ private async Task Patch(string gameFolder)
                         var totalFileSize = (long)value[1];
                         var filename = (string)value[2];
 
-                        var progress = ((double)copiedSize / totalFileSize) * 100;
-
-                        PatchState = (float)progress;
-                        //Debug.WriteLine("{1} {0:N2}%", progress, filename);
+                        PatchState = (float)((double)copiedSize / totalFileSize * 100);
                     });
 
                     var patchedHEDFile = Path.ChangeExtension(patchedPKGFile, ".hed");
@@ -455,7 +392,7 @@ private async Task Patch(string gameFolder)
 
                     PatchProgressionMessage.Text = $"Copie du fichier {Path.GetFileName(patchedHEDFile)} patché dans le dossier du jeu...";
 
-                    await CopyToAsync(patchedHEDFile, originalHEDFile, progress, default);
+                    await CopyToAsync(patchedHEDFile, originalHEDFile, progress);
 
                     PatchProgressionMessage.Text = $"Copie du fichier {Path.GetFileName(patchedPKGFile)} patché dans le dossier du jeu...";
 
@@ -470,7 +407,6 @@ private async Task Patch(string gameFolder)
             {
                 PatchProgressionMessage.Foreground = Brushes.Red;
                 PatchProgressionMessage.Text = $"Une erreur s'est produite: {e.Message}";
-
                 Debug.WriteLine(e.Message);
             }
         }
@@ -512,7 +448,7 @@ private void PatchProgress(object sender, PatchProgressEventArgs e)
         {
             if (e.EntriesTotal > 0)
             {
-                PatchState = Convert.ToInt32(100 * ((float)e.EntriesPatched / e.EntriesTotal));
+                PatchState = 100f * e.EntriesPatched / e.EntriesTotal;
             }
         }
 
@@ -574,31 +510,29 @@ private async Task ExtractPatch(string patchName)
             }
             else
             {
-                using (ZipFile zip = ZipFile.Read(patchFile))
-                {
-                    // Make sure to extract patch files only if necessary
-                    var alreadyExtractedFiles = Directory.GetFiles(extractionFolder, "*.*", SearchOption.AllDirectories);
-                    var alreadyExtractedFolders = Directory.GetDirectories(extractionFolder, "*.*", SearchOption.AllDirectories);
+                using var zip = ZipFile.Read(patchFile);
+                // Make sure to extract patch files only if necessary
+                var alreadyExtractedFiles = Directory.GetFiles(extractionFolder, "*.*", SearchOption.AllDirectories);
+                var alreadyExtractedFolders = Directory.GetDirectories(extractionFolder, "*.*", SearchOption.AllDirectories);
 
-                    if (alreadyExtractedFiles.Length + alreadyExtractedFolders.Length != zip.Count)
-                    {
-                        PatchProgressionMessage.Text = $"Extraction des fichiers de {patchName}...";
-                        zip.ExtractProgress += ZipExtractProgress;
-                        await Task.Run(() => zip.ExtractAll(extractionFolder, ExtractExistingFileAction.OverwriteSilently));
-                    }
+                if (alreadyExtractedFiles.Length + alreadyExtractedFolders.Length != zip.Count)
+                {
+                    PatchProgressionMessage.Text = $"Extraction des fichiers de {patchName}...";
+                    zip.ExtractProgress += ZipExtractProgress;
+                    await Task.Run(() => zip.ExtractAll(extractionFolder, ExtractExistingFileAction.OverwriteSilently));
                 }
             }
         }
 
-        void ZipExtractProgress(object sender, ExtractProgressEventArgs e)
+        private void ZipExtractProgress(object sender, ExtractProgressEventArgs eventData)
         {
-            if (e.EntriesTotal > 0)
+            if (eventData.EntriesTotal > 0)
             {
-                PatchState = Convert.ToInt32(100 * ((float)e.EntriesExtracted / e.EntriesTotal));
+                PatchState = 100f * eventData.EntriesExtracted / eventData.EntriesTotal;
             }
         }
 
-        public async Task CopyFolderContentToAsync(string sourceFolder, string destinationFolder, IProgress<List<object>> progress, CancellationToken cancellationToken = default(CancellationToken), int bufferSize = 0x1000)
+        public async Task CopyFolderContentToAsync(string sourceFolder, string destinationFolder, IProgress<List<object>> progress, CancellationToken cancellationToken = default, int bufferSize = 0x1000)
         {
             var source = new DirectoryInfo(sourceFolder);
             var destination = new DirectoryInfo(destinationFolder);
@@ -614,14 +548,14 @@ void ZipExtractProgress(object sender, ExtractProgressEventArgs e)
 
                 PatchProgressionMessage.Text = $"Copie du fichier {files[i].Name}...";
                 await CopyToAsync(files[i].FullName, Path.Combine(outputPath, files[i].Name), progress, cancellationToken, bufferSize, false);
-                progress.Report(new List<object>() { (long)i, (long)files.Length, files[i].Name });
+                progress.Report(new List<object> { (long)i, (long)files.Length, files[i].Name });
             }
         }
 
         public async Task CopyToAsync(string sourceFile, string destinationFile, IProgress<List<object>> progress, CancellationToken cancellationToken = default, int bufferSize = 0x1000, bool updateProgress = true)
         {
-            var sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read, 4096, FileOptions.Asynchronous | FileOptions.SequentialScan);
-            var destinationStream = new FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None, 4096, FileOptions.Asynchronous | FileOptions.SequentialScan);
+            using var sourceStream = new FileStream(sourceFile, FileMode.Open, FileAccess.Read, FileShare.Read, bufferSize, FileOptions.Asynchronous | FileOptions.SequentialScan);
+            using var destinationStream = new FileStream(destinationFile, FileMode.Create, FileAccess.Write, FileShare.None, bufferSize, FileOptions.Asynchronous | FileOptions.SequentialScan);
             var buffer = new byte[bufferSize];
             int bytesRead;
             long totalRead = 0;
@@ -629,17 +563,13 @@ public async Task CopyToAsync(string sourceFile, string destinationFile, IProgre
             while ((bytesRead = await sourceStream.ReadAsync(buffer, 0, buffer.Length, cancellationToken)) > 0)
             {
                 await destinationStream.WriteAsync(buffer, 0, bytesRead, cancellationToken);
-                cancellationToken.ThrowIfCancellationRequested();
                 totalRead += bytesRead;
 
                 if (updateProgress)
                 {
-                    progress.Report(new List<object>() { totalRead, sourceStream.Length, Path.GetFileName(sourceFile) });
+                    progress.Report(new List<object> { totalRead, sourceStream.Length, Path.GetFileName(sourceFile) });
                 }
             }
-
-            sourceStream.Close();
-            destinationStream.Close();
         }
 
         private void Hyperlink_RequestNavigate(object sender, RequestNavigateEventArgs e)
@@ -656,14 +586,33 @@ private void OnDonateClick(object sender, MouseButtonEventArgs e)
 
         private void OpenURL(string url)
         {
-            // for .NET Core you need to add UseShellExecute = true
-            // see https://docs.microsoft.com/dotnet/api/system.diagnostics.processstartinfo.useshellexecute#property-value
-            var process = new ProcessStartInfo(url)
-            {
-                UseShellExecute = true
-            };
+            Process.Start(new ProcessStartInfo(url) { UseShellExecute = true });
+        }
 
-            Process.Start(process);
+        private void SetUIVisibility(
+            bool gameNotFound = false, 
+            bool browse = false, 
+            bool patch = false, 
+            bool gameFound = false,
+            bool patchProgress = false, 
+            bool credits = false, 
+            bool patchOptions = false, 
+            bool randomQuotes = false,
+            bool ignoreSave = false, 
+            bool saveOriginalFiles = false)
+        {
+            GameNotFoundWarningMessage.Visibility = gameNotFound ? Visibility.Visible : Visibility.Collapsed;
+            BrowseButton.Visibility = browse ? Visibility.Visible : Visibility.Collapsed;
+            PatchButton.Visibility = patch ? Visibility.Visible : Visibility.Collapsed;
+            GameFoundMessage.Visibility = gameFound ? Visibility.Visible : Visibility.Collapsed;
+            PatchProgressionMessage.Visibility = patchProgress ? Visibility.Visible : Visibility.Collapsed;
+            PatchProgressBar.Visibility = patchProgress ? Visibility.Visible : Visibility.Collapsed;
+            Credits.Visibility = credits ? Visibility.Visible : Visibility.Collapsed;
+            PatchOptions.Visibility = patchOptions ? Visibility.Visible : Visibility.Collapsed;
+            RandomQuotes.Visibility = randomQuotes ? Visibility.Visible : Visibility.Collapsed;
+            IgnoreSaveButton.Visibility = ignoreSave ? Visibility.Visible : Visibility.Collapsed;
+            SaveOriginalFilesCheckbox.Visibility = saveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
+            SaveOriginalFilesDescription.Visibility = saveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
         }
     }
 }

From 30e175e09f1d97806c5cb488f811156c1ecbba4f Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 20:48:50 +0200
Subject: [PATCH 10/13] Continue to clean the code.

---
 KHFM-VF-Patch/MainWindow.xaml.cs | 316 ++++++++++++++++++-------------
 1 file changed, 181 insertions(+), 135 deletions(-)

diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index 7e2d86ff..d3a5ae58 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -8,6 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;
@@ -19,13 +20,21 @@ namespace KHFM_VF_Patch
 {
     public partial class MainWindow : Window, INotifyPropertyChanged
     {
+        #region Events
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+
+        #region Constants
+
         private readonly string PROJECT_DIRECTORY;
         private const string PATCH_FOLDER_RELATIVE_PATH = "Resources/Patches";
         private static readonly string PATCH_FOLDER = Path.Combine(Path.GetDirectoryName(AppContext.BaseDirectory), PATCH_FOLDER_RELATIVE_PATH);
         private const int REQUIRED_RANDOM_QUOTES_COUNT = 3;
 
-        private static readonly List<string> RANDOM_QUOTES = new()
-        {
+        private static readonly List<string> RANDOM_QUOTES =
+        [
             "Cela pourrait être un peu long, je vous conseille d'aller chercher un café...",
             "Sinon ça a été votre journée ?",
             "Vous êtes toujours là ? Alors attendez, je vous prépare de quoi vous occuper...",
@@ -45,7 +54,7 @@ public partial class MainWindow : Window, INotifyPropertyChanged
             "L'Île du Destin dans la fin des mondes s'appelle Île du Souvenir.",
             "Quand on détruit la maison de Bourriquet elle apparaît dans une autre page !",
             "Dans le monde des merveilles on peut voir le four allumé même après avoir grandit !",
-        };
+        ];
 
         private const string DONATE_URL = "https://www.paypal.com/donate/?business=QB2DD2YWXZ79E&currency_code=EUR";
         private const string KH1_PATCH_VOICES_ZIP_NAME = "KH1FM-Voices.patch";
@@ -62,22 +71,28 @@ public partial class MainWindow : Window, INotifyPropertyChanged
         private const string SAVE_FOLDER_NAME = "Patch/Saves";
         private const string PATCHED_FILES_FOLDER_NAME = "Patch/Temp";
 
-        private static readonly List<string> REQUIRED_FILE_NAMES = new()
-        {
+        private static readonly List<string> REQUIRED_FILE_NAMES =
+        [
             "kh1_first.pkg", "kh1_first.hed",
             "kh1_third.pkg", "kh1_third.hed",
             "kh1_fourth.pkg", "kh1_fourth.hed",
             "kh1_fifth.pkg", "kh1_fifth.hed",
-        };
+        ];
 
-        private readonly Progress<List<object>> _progress;
-        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion
 
+        #region Private fields
+
+        private readonly Progress<List<object>> _progress;
         private float _patchState;
         private string _selectedGameFolder;
         private int _randomQuotesCounter;
         private bool _isSteamInstall;
 
+        #endregion
+
+        #region Properties
+
         public float PatchState
         {
             get => _patchState;
@@ -115,15 +130,19 @@ public bool ShouldSaveOriginalFiles
         public static readonly DependencyProperty ShouldSaveOriginalFilesProperty =
             DependencyProperty.Register(nameof(ShouldSaveOriginalFiles), typeof(bool), typeof(MainWindow), new UIPropertyMetadata(true));
 
+        #endregion
+
+        #region Constructor
+
         public MainWindow()
         {
             // Determine if this program is executed from a build or from Visual Studio
             var assemblyPath = Assembly.GetEntryAssembly().Location;
             var assemblyDirectory = Path.GetDirectoryName(assemblyPath);
 
-            if (assemblyDirectory.Equals("net8.0-windows7.0"))
+            if (assemblyDirectory.EndsWith("net8.0-windows7.0"))
             {
-                PROJECT_DIRECTORY = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.Parent.FullName;
+                PROJECT_DIRECTORY = Directory.GetParent(Environment.CurrentDirectory).Parent.Parent.FullName;
             }
 
             InitializeComponent();
@@ -140,17 +159,20 @@ public MainWindow()
                 PatchState = (float)((double)copiedSize / totalFileSize * 100);
             });
 
-            if (CheckGameFolder(DEFAULT_EPIC_GAMES_FOLDER))
+            // Check default installation folder for Epic Games
+            if (CheckGameFolder(DEFAULT_EPIC_GAMES_FOLDER, false))
             {
                 _selectedGameFolder = DEFAULT_EPIC_GAMES_FOLDER;
                 ReadyToPatchState();
             }
-            else if (CheckGameFolder(DEFAULT_STEAM_FOLDER))
+            // Check default installation folder for Steam
+            else if (CheckGameFolder(DEFAULT_STEAM_FOLDER, true))
             {
                 _selectedGameFolder = DEFAULT_STEAM_FOLDER;
                 ReadyToPatchState();
             }
-            else if (CheckGameFolder(DEFAULT_STEAM_DECK_FOLDER))
+            // Check default installation folder for the Steam Deck
+            else if (CheckGameFolder(DEFAULT_STEAM_DECK_FOLDER, true))
             {
                 _selectedGameFolder = DEFAULT_STEAM_DECK_FOLDER;
                 ReadyToPatchState();
@@ -161,37 +183,9 @@ public MainWindow()
             }
         }
 
-        private void SearchGameFolderState()
-        {
-            SetUIVisibility(gameNotFound: true, browse: true);
-        }
-
-        private void ReadyToPatchState()
-        {
-            // TODO(bth): Show a button to unpatch the game
-
-            RandomQuotes.Visibility = Visibility.Collapsed;
-
-            if (!ShouldSaveOriginalFiles || CheckRemainingSpace(_selectedGameFolder))
-            {
-                SetUIVisibility(patch: true, gameFound: true, patchOptions: true, saveOriginalFiles: ShouldSaveOriginalFiles);
-                ImageHeight.Height = new GridLength(75);
-            }
-            else
-            {
-                GameNotFoundWarningMessage.Text = "Attention: ce patch s'assure de sauvegarder tous les fichiers originaux avant de les modifier afin que votre jeu ne soit pas cassé s'il y a un problème pendant le processus. " +
-                    "Mais ces fichiers sont gros, 4 Go en tout et il semblerait que vous n'ayez pas suffisament d'espace pour pouvoir effectuer cette sauvegarde correctement." +
-                    "Assurez-vous donc d'avoir suffisament d'espace libre avant de patcher votre jeu !";
-                SetUIVisibility(gameNotFound: true, ignoreSave: true);
-            }
-        }
+        #endregion
 
-        private void PatchingState()
-        {
-            SetUIVisibility(patchProgress: true, randomQuotes: true);
-            ImageHeight.Height = new GridLength(250);
-            StartRandomQuotes();
-        }
+        #region Random Quotes
 
         private void StartRandomQuotes()
         {
@@ -231,20 +225,57 @@ private void UpdateRandomQuotes(object sender, EventArgs e)
             _randomQuotesCounter++;
         }
 
+        #endregion
+
+        #region States
+
+        private void SearchGameFolderState()
+        {
+            SetUIVisibility(gameNotFound: true, browse: true);
+        }
+
+        private void ReadyToPatchState()
+        {
+            // TODO(bth): Show a button to unpatch the game
+
+            if (!ShouldSaveOriginalFiles || CheckRemainingSpace(_selectedGameFolder))
+            {
+                _isSteamInstall = true;
+
+                SetUIVisibility(patch: true, gameFound: true, patchOptions: true, saveOriginalFiles: ShouldSaveOriginalFiles);
+                ImageHeight.Height = new GridLength(75);
+            }
+            else
+            {
+                GameNotFoundWarningMessage.Text = "Attention: ce patch s'assure de sauvegarder tous les fichiers originaux avant de les modifier afin que votre jeu ne soit pas cassé s'il y a un problème pendant le processus. " +
+                    "Mais ces fichiers sont gros, 4 Go en tout et il semblerait que vous n'ayez pas suffisament d'espace pour pouvoir effectuer cette sauvegarde correctement." +
+                    "Assurez-vous donc d'avoir suffisament d'espace libre avant de patcher votre jeu !";
+
+                SetUIVisibility(gameNotFound: true, ignoreSave: true);
+            }
+        }
+
+        private void PatchingState()
+        {
+            SetUIVisibility(patchProgress: true, patchProgressBar: true, randomQuotes: true);
+            ImageHeight.Height = new GridLength(250);
+            StartRandomQuotes();
+        }
+
         private void FinishedState()
         {
-            GameNotFoundWarningMessage.Visibility = Visibility.Collapsed;
             PatchProgressionMessage.Text = "Votre jeu a correctement été patché ! Profitez bien des voix françaises ;)";
             PatchProgressionMessage.FontWeight = FontWeights.Bold;
-            PatchProgressionMessage.Visibility = Visibility.Visible;
-            PatchProgressBar.Visibility = Visibility.Collapsed;
-            Credits.Visibility = Visibility.Visible;
+
+            SetUIVisibility(patchProgress: true, credits: true);
+
             ImageHeight.Height = new GridLength(0);
-            BrowseButton.Visibility = Visibility.Collapsed;
-            PatchOptions.Visibility = Visibility.Collapsed;
-            RandomQuotes.Visibility = Visibility.Collapsed;
         }
 
+        #endregion
+
+        #region Buttons
+
         private void BrowseFolderButtonClick(object sender, RoutedEventArgs e)
         {
             using var dialog = new FolderBrowserDialog();
@@ -252,9 +283,13 @@ private void BrowseFolderButtonClick(object sender, RoutedEventArgs e)
             {
                 Debug.WriteLine($"Selected: {dialog.SelectedPath}");
 
-                if (CheckGameFolder(dialog.SelectedPath))
+                // Check if install is a Steam install
+                var isSteamInstall = Directory.Exists(Path.Combine(dialog.SelectedPath, "STEAM"));
+
+                if (CheckGameFolder(dialog.SelectedPath, isSteamInstall))
                 {
                     _selectedGameFolder = dialog.SelectedPath;
+                    _isSteamInstall = isSteamInstall;
                     ReadyToPatchState();
                 }
                 else
@@ -262,23 +297,16 @@ private void BrowseFolderButtonClick(object sender, RoutedEventArgs e)
                     GameNotFoundWarningMessage.Text =
                         "Le dossier d'installation de Kingdom Hearts HD 1.5 + 2.5 ReMIX que vous avez spécifié n'est pas valide.\n" +
                         "Il doit s'agir du dossier dans lequel l'Epic Game Store ou Steam a téléchargé les fichiers du jeu.\n" +
-                        $"Le dossier que vous avez donné: ";
+                        "Le dossier que vous avez donné: ";
                     GameNotFoundWarningMessage.Inlines.Add(new Italic(new Run($"\"{dialog.SelectedPath}\"")));
                 }
             }
         }
 
-        private List<string> GetRequiredFiles()
+        private void PatchGameButtonClick(object sender, RoutedEventArgs e)
         {
-            var pathname = _isSteamInstall ? "dt/" : "en/";
-            var filepaths = new List<string>();
-
-            foreach (var filename in REQUIRED_FILE_NAMES)
-            {
-                filepaths.Add($"Image/{pathname}{filename}");
-            }
-
-            return filepaths;
+            PatchingState();
+            _ = Patch(_selectedGameFolder);
         }
 
         private void IgnoreSaveButtonClick(object sender, RoutedEventArgs e)
@@ -287,44 +315,42 @@ private void IgnoreSaveButtonClick(object sender, RoutedEventArgs e)
             ReadyToPatchState();
         }
 
-        private void PatchGameButtonClick(object sender, RoutedEventArgs e)
-        {
-            PatchingState();
-            _ = Patch(_selectedGameFolder);
-        }
+        #endregion
+
+        #region Patch
 
-        private bool CheckGameFolder(string folder)
+        private async Task ExtractPatch(string patchName)
         {
-            // Check if install is a Steam install
-            _isSteamInstall = Directory.Exists(Path.Combine(folder, "STEAM"));
+            var patchFile = Path.Combine(PATCH_FOLDER, patchName);
+            var extractionFolder = Path.Combine(PATCH_FOLDER, KH1_PATCH_EXTRACTION_FOLDER_NAME);
 
-            // Check PKG/HED files
-            foreach (var requiredFile in GetRequiredFiles())
-            {
-                var completePath = Path.Combine(folder, requiredFile);
+            if (!Directory.Exists(extractionFolder))
+                Directory.CreateDirectory(extractionFolder);
 
-                if (!File.Exists(completePath))
+            // The .patch file is not found, it could already be decompressed (if we are launching this program from VS for example)
+            if (!File.Exists(patchFile))
+            {
+                // If we are in Visual Studio, we want to copy the patch files to the destination folder
+                if (!string.IsNullOrEmpty(PROJECT_DIRECTORY))
                 {
-                    return false;
+                    var patchFolder = Path.Combine(PROJECT_DIRECTORY, PATCH_FOLDER_RELATIVE_PATH, Path.GetFileNameWithoutExtension(patchName));
+                    await CopyFolderContentToAsync(patchFolder, extractionFolder, _progress, default, 0x100000);
                 }
             }
+            else
+            {
+                using var zip = ZipFile.Read(patchFile);
+                // Make sure to extract patch files only if necessary
+                var alreadyExtractedFiles = Directory.GetFiles(extractionFolder, "*.*", SearchOption.AllDirectories);
+                var alreadyExtractedFolders = Directory.GetDirectories(extractionFolder, "*.*", SearchOption.AllDirectories);
 
-            return true;
-        }
-
-        private bool CheckRemainingSpace(string folder)
-        {
-            // Required at least 4GB to save original files
-            return GetFreeSpace(folder) > 4e+9;
-        }
-
-        private long GetFreeSpace(string folder)
-        {
-            var folderInfo = new FileInfo(folder);
-            DriveInfo drive = new DriveInfo(folderInfo.Directory.Root.FullName);
-
-            // Required at least 4GB to save original files
-            return drive.AvailableFreeSpace;
+                if (alreadyExtractedFiles.Length + alreadyExtractedFolders.Length != zip.Count)
+                {
+                    PatchProgressionMessage.Text = $"Extraction des fichiers de {patchName}...";
+                    zip.ExtractProgress += ZipExtractProgress;
+                    await Task.Run(() => zip.ExtractAll(extractionFolder, ExtractExistingFileAction.OverwriteSilently));
+                }
+            }
         }
 
         private async Task Patch(string gameFolder)
@@ -365,7 +391,7 @@ private async Task Patch(string gameFolder)
                     Directory.Delete(patchedFilesBaseFolder, true);
                 Directory.CreateDirectory(patchedFilesBaseFolder);
 
-                foreach (var requiredFile in GetRequiredFiles())
+                foreach (var requiredFile in GetRequiredFiles(_isSteamInstall))
                 {
                     var pkgFile = Path.Combine(gameFolder, requiredFile);
                     var patchFolder = Path.Combine(patchesExtractionFolder, Path.GetFileNameWithoutExtension(pkgFile));
@@ -413,6 +439,9 @@ private async Task Patch(string gameFolder)
             {
                 PatchProgressionMessage.Foreground = Brushes.Red;
                 PatchProgressionMessage.Text = $"Une erreur s'est produite: {e.Message}";
+
+                SetUIVisibility(patchProgress: true);
+
                 Debug.WriteLine(e.Message);
             }
         }
@@ -458,6 +487,54 @@ private void PatchProgress(object sender, PatchProgressEventArgs e)
             }
         }
 
+        #endregion
+
+        #region Utils
+
+        private List<string> GetRequiredFiles(bool isSteamInstall)
+        {
+            var pathname = isSteamInstall ? "dt/" : "en/";
+            var filepaths = new List<string>();
+
+            foreach (var filename in REQUIRED_FILE_NAMES)
+            {
+                filepaths.Add($"Image/{pathname}{filename}");
+            }
+
+            return filepaths;
+        }
+
+        private bool CheckGameFolder(string folder, bool isSteamInstall)
+        {
+            // Check PKG/HED files
+            foreach (var requiredFile in GetRequiredFiles(isSteamInstall))
+            {
+                var completePath = Path.Combine(folder, requiredFile);
+
+                if (!File.Exists(completePath))
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private bool CheckRemainingSpace(string folder)
+        {
+            // Required at least 4GB to save original files
+            return GetFreeSpace(folder) > 4e+9;
+        }
+
+        private long GetFreeSpace(string folder)
+        {
+            var folderInfo = new FileInfo(folder);
+            var drive = new DriveInfo(folderInfo.Directory.Root.FullName);
+
+            // Required at least 4GB to save original files
+            return drive.AvailableFreeSpace;
+        }
+
         // fileToSaveOrRestore folder should be relative to game folder
         private async Task SaveOrRestore(string gameFolder, string fileToSaveOrRestore)
         {
@@ -496,40 +573,6 @@ private async Task SaveOrRestore(string gameFolder, string fileToSaveOrRestore)
             await CopyToAsync(source, destination, _progress, default, 0x100000);
         }
 
-        private async Task ExtractPatch(string patchName)
-        {
-            var patchFile = Path.Combine(PATCH_FOLDER, patchName);
-            var extractionFolder = Path.Combine(PATCH_FOLDER, KH1_PATCH_EXTRACTION_FOLDER_NAME);
-
-            if (!Directory.Exists(extractionFolder))
-                Directory.CreateDirectory(extractionFolder);
-
-            // The .patch file is not found, it could already be decompressed (if we are launching this program from VS for example)
-            if (!File.Exists(patchFile))
-            {
-                // If we are in Visual Studio, we want to copy the patch files to the destination folder
-                if (!string.IsNullOrEmpty(PROJECT_DIRECTORY))
-                {
-                    var patchFolder = Path.Combine(PROJECT_DIRECTORY, PATCH_FOLDER_RELATIVE_PATH, Path.GetFileNameWithoutExtension(patchName));
-                    await CopyFolderContentToAsync(patchFolder, extractionFolder, _progress, default, 0x100000);
-                }
-            }
-            else
-            {
-                using var zip = ZipFile.Read(patchFile);
-                // Make sure to extract patch files only if necessary
-                var alreadyExtractedFiles = Directory.GetFiles(extractionFolder, "*.*", SearchOption.AllDirectories);
-                var alreadyExtractedFolders = Directory.GetDirectories(extractionFolder, "*.*", SearchOption.AllDirectories);
-
-                if (alreadyExtractedFiles.Length + alreadyExtractedFolders.Length != zip.Count)
-                {
-                    PatchProgressionMessage.Text = $"Extraction des fichiers de {patchName}...";
-                    zip.ExtractProgress += ZipExtractProgress;
-                    await Task.Run(() => zip.ExtractAll(extractionFolder, ExtractExistingFileAction.OverwriteSilently));
-                }
-            }
-        }
-
         private void ZipExtractProgress(object sender, ExtractProgressEventArgs eventData)
         {
             if (eventData.EntriesTotal > 0)
@@ -596,15 +639,16 @@ private void OpenURL(string url)
         }
 
         private void SetUIVisibility(
-            bool gameNotFound = false, 
-            bool browse = false, 
-            bool patch = false, 
+            bool gameNotFound = false,
+            bool browse = false,
+            bool patch = false,
             bool gameFound = false,
-            bool patchProgress = false, 
-            bool credits = false, 
-            bool patchOptions = false, 
+            bool patchProgress = false,
+            bool patchProgressBar = false,
+            bool credits = false,
+            bool patchOptions = false,
             bool randomQuotes = false,
-            bool ignoreSave = false, 
+            bool ignoreSave = false,
             bool saveOriginalFiles = false)
         {
             GameNotFoundWarningMessage.Visibility = gameNotFound ? Visibility.Visible : Visibility.Collapsed;
@@ -612,7 +656,7 @@ private void SetUIVisibility(
             PatchButton.Visibility = patch ? Visibility.Visible : Visibility.Collapsed;
             GameFoundMessage.Visibility = gameFound ? Visibility.Visible : Visibility.Collapsed;
             PatchProgressionMessage.Visibility = patchProgress ? Visibility.Visible : Visibility.Collapsed;
-            PatchProgressBar.Visibility = patchProgress ? Visibility.Visible : Visibility.Collapsed;
+            PatchProgressBar.Visibility = patchProgressBar ? Visibility.Visible : Visibility.Collapsed;
             Credits.Visibility = credits ? Visibility.Visible : Visibility.Collapsed;
             PatchOptions.Visibility = patchOptions ? Visibility.Visible : Visibility.Collapsed;
             RandomQuotes.Visibility = randomQuotes ? Visibility.Visible : Visibility.Collapsed;
@@ -620,5 +664,7 @@ private void SetUIVisibility(
             SaveOriginalFilesCheckbox.Visibility = saveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
             SaveOriginalFilesDescription.Visibility = saveOriginalFiles ? Visibility.Visible : Visibility.Collapsed;
         }
+
+        #endregion
     }
 }

From 365cba6a21ae52f87c124a969234cab7e45c1231 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Sat, 22 Jun 2024 22:36:30 +0200
Subject: [PATCH 11/13] Update README to add the link to the Steam Deck page of
 the wiki.

---
 README.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4d59c6de..0076a767 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,10 @@ https://user-images.githubusercontent.com/1321964/153475214-48c44bb3-9ba4-40d2-b
   </a>
 </div>
 
+### Est-ce que le patch est compatible Steam Deck ?
+
+Oui, vous pouvez jouer avec les voix françaises sur le Steam Deck, vous trouverez la marche à suivre [ici](https://github.com/Noxalus/KHFM-VF-Patch/wiki/Installation-du-patch-sur-Steam-Deck).
+
 ### Installation de .NET 8.0
 
 Si vous avez ce message en lançant le patch:
@@ -41,4 +45,10 @@ Mais cela a également été possible grâce à une poignée de français déter
 - [AntonioDePau](https://twitter.com/AntonioDePau): pour avoir corrigé les problèmes de l'outil permettant de patcher les fichiers du jeu
 - [DylanCa](https://github.com/DylanCa): pour avoir porté le patch pour la version Steam
 
-De mon côté ([Noxalus]("https://twitter.com/Noxalus")) j'ai initié ce projet 2 semaines avant la sortie du jeu et j'ai créé 2 outils au coeur de ce patch, le premier permet de remplacer certains fichiers du jeu et le second permet de convertir les voix françaises de la version PS2 au format PC.
\ No newline at end of file
+De mon côté ([Noxalus]("https://twitter.com/Noxalus")) j'ai initié ce projet 2 semaines avant la sortie du jeu et j'ai créé 2 outils au coeur de ce patch, le premier permet de remplacer certains fichiers du jeu et le second permet de convertir les voix françaises de la version PS2 au format PC.
+
+Si vous appréciez mon travail, vous pouvez toujours me remercier en m'offrant une pizza ! :p
+
+<p align="center">
+  <a href="https://www.paypal.com/donate/?business=QB2DD2YWXZ79E&currency_code=EUR"><img src="KHFM-VF-Patch/Resources/Images/donate.png" alt="logo" width="200"/></href>
+</p>
\ No newline at end of file

From 84b86da3adf5d5fa394b6449ca452df23c8f9213 Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Wed, 26 Jun 2024 18:10:11 +0200
Subject: [PATCH 12/13] Remove useless using.

---
 KHFM-VF-Patch/MainWindow.xaml.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/KHFM-VF-Patch/MainWindow.xaml.cs b/KHFM-VF-Patch/MainWindow.xaml.cs
index d3a5ae58..a229f9b7 100644
--- a/KHFM-VF-Patch/MainWindow.xaml.cs
+++ b/KHFM-VF-Patch/MainWindow.xaml.cs
@@ -8,7 +8,6 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Forms;
 using System.Windows.Input;

From db1cb4ffffabcd84a22945a5a3d91facc6475e3b Mon Sep 17 00:00:00 2001
From: Noxalus <noxalus@gmail.com>
Date: Wed, 26 Jun 2024 18:11:46 +0200
Subject: [PATCH 13/13] Bump version from 1.2.2 to 1.3.0.

---
 KHFM-VF-Patch/KHFM-VF-Patch.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/KHFM-VF-Patch/KHFM-VF-Patch.csproj b/KHFM-VF-Patch/KHFM-VF-Patch.csproj
index a3036af2..16a8dd35 100644
--- a/KHFM-VF-Patch/KHFM-VF-Patch.csproj
+++ b/KHFM-VF-Patch/KHFM-VF-Patch.csproj
@@ -18,7 +18,7 @@
     <AssemblyVersion>1.2.2.0</AssemblyVersion>
     <FileVersion>1.2.2.0</FileVersion>
     <Platforms>AnyCPU;x86;x64</Platforms>
-    <Version>1.2.2</Version>
+    <Version>1.3.0</Version>
   </PropertyGroup>
 
   <ItemGroup>