From 857de890e90e12a283e31fb7b4290ec43390d876 Mon Sep 17 00:00:00 2001
From: 4sval <asval.contactme@gmail.com>
Date: Wed, 21 Dec 2022 22:53:17 +0100
Subject: [PATCH] whoops

---
 FModel/MainWindow.xaml                   | 93 ++++++++++++------------
 FModel/MainWindow.xaml.cs                |  1 +
 FModel/ViewModels/Commands/TabCommand.cs | 10 +--
 FModel/Views/Resources/Resources.xaml    | 10 +--
 4 files changed, 59 insertions(+), 55 deletions(-)

diff --git a/FModel/MainWindow.xaml b/FModel/MainWindow.xaml
index 0bfc4d25..9f32042d 100644
--- a/FModel/MainWindow.xaml
+++ b/FModel/MainWindow.xaml
@@ -94,51 +94,6 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator />
-                <MenuItem Header="Export Raw Data (.uasset)" Command="{Binding RightClickMenuCommand}">
-                    <MenuItem.CommandParameter>
-                        <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
-                            <Binding Source="Assets_Export_Data" />
-                            <Binding Path="SelectedItems" ElementName="AssetsListName" />
-                        </MultiBinding>
-                    </MenuItem.CommandParameter>
-                    <MenuItem.Icon>
-                        <Viewbox Width="16" Height="16">
-                            <Canvas Width="24" Height="24">
-                                <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource ExportIcon}" />
-                            </Canvas>
-                        </Viewbox>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Save Property (.json)" Command="{Binding RightClickMenuCommand}">
-                    <MenuItem.CommandParameter>
-                        <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
-                            <Binding Source="Assets_Save_Properties" />
-                            <Binding Path="SelectedItems" ElementName="AssetsListName" />
-                        </MultiBinding>
-                    </MenuItem.CommandParameter>
-                    <MenuItem.Icon>
-                        <Viewbox Width="16" Height="16">
-                            <Canvas Width="24" Height="24">
-                                <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource SaveIcon}" />
-                            </Canvas>
-                        </Viewbox>
-                    </MenuItem.Icon>
-                </MenuItem>
-                <MenuItem Header="Save Texture (.png)" Command="{Binding RightClickMenuCommand}">
-                    <MenuItem.CommandParameter>
-                        <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
-                            <Binding Source="Assets_Save_Textures" />
-                            <Binding Path="SelectedItems" ElementName="AssetsListName" />
-                        </MultiBinding>
-                    </MenuItem.CommandParameter>
-                    <MenuItem.Icon>
-                        <Viewbox Width="16" Height="16">
-                            <Canvas Width="24" Height="24">
-                                <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource TextureIcon}" />
-                            </Canvas>
-                        </Viewbox>
-                    </MenuItem.Icon>
-                </MenuItem>
                 <MenuItem Header="Auto Open Sounds" IsCheckable="True" StaysOpenOnClick="True"
                           IsChecked="{Binding IsAutoOpenSounds, Source={x:Static local:Settings.UserSettings.Default}}" />
             </MenuItem>
@@ -411,6 +366,24 @@
                                                 </Viewbox>
                                             </MenuItem.Icon>
                                         </MenuItem>
+                                        <MenuItem Header="Save Folder's Packages Models (.psk)" Click="OnFolderModelClick">
+                                            <MenuItem.Icon>
+                                                <Viewbox Width="16" Height="16">
+                                                    <Canvas Width="24" Height="24">
+                                                        <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource ModelIcon}" />
+                                                    </Canvas>
+                                                </Viewbox>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
+                                        <MenuItem Header="Save Folder's Packages Animations (.psa)" Click="OnFolderAnimationClick">
+                                            <MenuItem.Icon>
+                                                <Viewbox Width="16" Height="16">
+                                                    <Canvas Width="24" Height="24">
+                                                        <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource AnimationIcon}" />
+                                                    </Canvas>
+                                                </Viewbox>
+                                            </MenuItem.Icon>
+                                        </MenuItem>
                                         <Separator />
                                         <MenuItem Header="Save Directory" Click="OnSaveDirectoryClick">
                                             <MenuItem.Icon>
@@ -566,6 +539,36 @@
                                                     </Viewbox>
                                                 </MenuItem.Icon>
                                             </MenuItem>
+                                            <MenuItem Header="Save Model (.psk)" Command="{Binding DataContext.RightClickMenuCommand}">
+                                                <MenuItem.CommandParameter>
+                                                    <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
+                                                        <Binding Source="Assets_Save_Models" />
+                                                        <Binding Path="SelectedItems" />
+                                                    </MultiBinding>
+                                                </MenuItem.CommandParameter>
+                                                <MenuItem.Icon>
+                                                    <Viewbox Width="16" Height="16">
+                                                        <Canvas Width="24" Height="24">
+                                                            <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource ModelIcon}" />
+                                                        </Canvas>
+                                                    </Viewbox>
+                                                </MenuItem.Icon>
+                                            </MenuItem>
+                                            <MenuItem Header="Save Animation (.psa)" Command="{Binding DataContext.RightClickMenuCommand}">
+                                                <MenuItem.CommandParameter>
+                                                    <MultiBinding Converter="{x:Static converters:MultiParameterConverter.Instance}">
+                                                        <Binding Source="Assets_Save_Animations" />
+                                                        <Binding Path="SelectedItems" />
+                                                    </MultiBinding>
+                                                </MenuItem.CommandParameter>
+                                                <MenuItem.Icon>
+                                                    <Viewbox Width="16" Height="16">
+                                                        <Canvas Width="24" Height="24">
+                                                            <Path Fill="{DynamicResource {x:Static adonisUi:Brushes.ForegroundBrush}}" Data="{StaticResource AnimationIcon}" />
+                                                        </Canvas>
+                                                    </Viewbox>
+                                                </MenuItem.Icon>
+                                            </MenuItem>
                                             <Separator />
                                             <MenuItem Header="Copy">
                                                 <MenuItem.Icon>
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
index abc4468f..5074460d 100644
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -69,6 +69,7 @@ public partial class MainWindow
         await _applicationView.CUE4Parse.InitMappings();
         await _applicationView.InitImGuiSettings();
         await _applicationView.InitVgmStream();
+        await _applicationView.InitOodle();
 
         if (UserSettings.Default.DiscordRpc == EDiscordRpc.Always)
             _discordHandler.Initialize(_applicationView.CUE4Parse.Game);
diff --git a/FModel/ViewModels/Commands/TabCommand.cs b/FModel/ViewModels/Commands/TabCommand.cs
index c0237c8c..5a62a2f2 100644
--- a/FModel/ViewModels/Commands/TabCommand.cs
+++ b/FModel/ViewModels/Commands/TabCommand.cs
@@ -32,30 +32,30 @@ public class TabCommand : ViewModelCommand<TabItem>
             case "Close_Other_Tabs":
                 _applicationView.CUE4Parse.TabControl.RemoveOtherTabs(contextViewModel);
                 break;
-            case "Assets_Export_Data":
+            case "Asset_Export_Data":
                 await _threadWorkerView.Begin(_ => _applicationView.CUE4Parse.ExportData(fullPath));
                 break;
-            case "Assets_Save_Properties":
+            case "Asset_Save_Properties":
                 await _threadWorkerView.Begin(cancellationToken =>
                 {
                     _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Properties);
                     _applicationView.CUE4Parse.TabControl.SelectedTab.SaveProperty(false);
                 });
                 break;
-            case "Assets_Save_Textures":
+            case "Asset_Save_Textures":
                 await _threadWorkerView.Begin(cancellationToken =>
                 {
                     _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Textures);
                     _applicationView.CUE4Parse.TabControl.SelectedTab.SaveImages(false);
                 });
                 break;
-            case "Assets_Save_Models":
+            case "Asset_Save_Models":
                 await _threadWorkerView.Begin(cancellationToken =>
                 {
                     _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Meshes);
                 });
                 break;
-            case "Assets_Save_Animations":
+            case "Asset_Save_Animations":
                 await _threadWorkerView.Begin(cancellationToken =>
                 {
                     _applicationView.CUE4Parse.Extract(cancellationToken, fullPath, false, EBulkType.Animations);
diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
index ac301836..fefe46ae 100644
--- a/FModel/Views/Resources/Resources.xaml
+++ b/FModel/Views/Resources/Resources.xaml
@@ -853,7 +853,7 @@
                                     </MenuItem.Icon>
                                 </MenuItem>
                                 <Separator />
-                                <MenuItem Header="Export Raw Data (.uasset)" Command="{Binding TabCommand}" CommandParameter="Assets_Export_Data">
+                                <MenuItem Header="Export Raw Data (.uasset)" Command="{Binding TabCommand}" CommandParameter="Asset_Export_Data">
                                     <MenuItem.Icon>
                                         <Viewbox Width="16" Height="16">
                                             <Canvas Width="24" Height="24">
@@ -862,7 +862,7 @@
                                         </Viewbox>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Save Properties (.json)" Command="{Binding TabCommand}" CommandParameter="Assets_Save_Properties">
+                                <MenuItem Header="Save Properties (.json)" Command="{Binding TabCommand}" CommandParameter="Asset_Save_Properties">
                                     <MenuItem.Icon>
                                         <Viewbox Width="16" Height="16">
                                             <Canvas Width="24" Height="24">
@@ -871,7 +871,7 @@
                                         </Viewbox>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Save Texture (.png)" Command="{Binding TabCommand}" CommandParameter="Assets_Save_Textures">
+                                <MenuItem Header="Save Texture (.png)" Command="{Binding TabCommand}" CommandParameter="Asset_Save_Textures">
                                     <MenuItem.Icon>
                                         <Viewbox Width="16" Height="16">
                                             <Canvas Width="24" Height="24">
@@ -880,7 +880,7 @@
                                         </Viewbox>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Save Model (.psk)" Command="{Binding TabCommand}" CommandParameter="Assets_Save_Models">
+                                <MenuItem Header="Save Model (.psk)" Command="{Binding TabCommand}" CommandParameter="Asset_Save_Models">
                                     <MenuItem.Icon>
                                         <Viewbox Width="16" Height="16">
                                             <Canvas Width="24" Height="24">
@@ -889,7 +889,7 @@
                                         </Viewbox>
                                     </MenuItem.Icon>
                                 </MenuItem>
-                                <MenuItem Header="Save Animation (.psa)" Command="{Binding TabCommand}" CommandParameter="Assets_Save_Animations">
+                                <MenuItem Header="Save Animation (.psa)" Command="{Binding TabCommand}" CommandParameter="Asset_Save_Animations">
                                     <MenuItem.Icon>
                                         <Viewbox Width="16" Height="16">
                                             <Canvas Width="24" Height="24">