修复 Legacy Forge 的安装和启动问题

Xcube-Studio · Sep 14, 2024 · ce78c9b · ce78c9b
1 parent 9769b5f
commit ce78c9b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 13 deletions.
diff --git a/Natsurainko.FluentCore b/Natsurainko.FluentCore
diff --git a/Natsurainko.FluentLauncher/Dictionaries/TaskViewStyleDictionary.xaml b/Natsurainko.FluentLauncher/Dictionaries/TaskViewStyleDictionary.xaml
@@ -1,8 +1,10 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:behaviors="using:Natsurainko.FluentLauncher.XamlHelpers.Behaviors"
     xmlns:controls="using:CommunityToolkit.WinUI.Controls"
-    xmlns:converters="using:Natsurainko.FluentLauncher.XamlHelpers.Converters">
+    xmlns:converters="using:Natsurainko.FluentLauncher.XamlHelpers.Converters"
+    xmlns:i="using:Microsoft.Xaml.Interactivity">
 
     <converters:BoolToVisibilityConverter x:Key="InvertedBoolToVisibilityConverter" Inverted="True" />
     <converters:TaskStateConverter x:Key="TaskStateConverter" />
@@ -195,6 +197,13 @@
                             Style="{ThemeResource AccentButtonStyle}"
                             Visibility="{Binding CanLaunch, Converter={ThemeResource BoolToVisibilityConverter}}">
                             <TextBlock x:Uid="Buttons_Launch" Text="Launch" />
+
+                            <i:Interaction.Behaviors>
+                                <behaviors:AncestorBindingBehavior
+                                    AncestorType="ScrollViewer"
+                                    Binding="{Binding DataContext.NavigationService}"
+                                    TargetPropertyName="CommandParameter" />
+                            </i:Interaction.Behaviors>
                         </Button>
                     </StackPanel>
                 </Grid>
@@ -400,9 +409,9 @@
 
                 <Grid Visibility="{Binding ShowException, Converter={ThemeResource BoolToVisibilityConverter}}">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="20" />
                         <ColumnDefinition Width="1*" />
+                        <ColumnDefinition Width="20" />
+                        <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
 
                     <TextBlock

diff --git a/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs b/Natsurainko.FluentLauncher/Services/Launch/LaunchService.cs
@@ -360,7 +360,10 @@ async Task ResolveDependencies(
         // Natives decompression
         if (!CanSkipNativesDecompression(instance))
         {
-            var (_, nativeLibs) = instance.GetRequiredLibraries();
+            var (_, nativeLibs) = instance is ModifiedMinecraftInstance { HasInheritance: true } modifiedMinecraftInstance
+                ? modifiedMinecraftInstance.InheritedMinecraftInstance.GetRequiredLibraries()
+                : instance.GetRequiredLibraries();
+
             UnzipUtils.BatchUnzip(
                 Path.Combine(instance.MinecraftFolderPath, "versions", instance.InstanceId, "natives"),
                 nativeLibs.Select(x => x.FullPath));

diff --git a/Natsurainko.FluentLauncher/ViewModels/Common/TaskViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Common/TaskViewModel.cs
@@ -1,5 +1,6 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using FluentLauncher.Infra.UI.Navigation;
 using Microsoft.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Media;
@@ -455,7 +456,12 @@ void NotifyException()
     }
 
     [RelayCommand(CanExecute = nameof(CanLaunch))]
-    void Launch() => App.GetService<LaunchService>().LaunchFromUI(_minecraftInstance);
+    void Launch(INavigationService navigationService)
+    {
+        navigationService.NavigateTo("Tasks/Launch");
+        App.GetService<LaunchService>().LaunchFromUI(_minecraftInstance);
+
+    }
 }
 
 #endregion

diff --git a/Natsurainko.FluentLauncher/ViewModels/Tasks/DownloadViewModel.cs b/Natsurainko.FluentLauncher/ViewModels/Tasks/DownloadViewModel.cs
@@ -9,19 +9,17 @@ namespace Natsurainko.FluentLauncher.ViewModels.Tasks;
 
 internal partial class DownloadViewModel : ObservableObject, INavigationAware
 {
-    private readonly DownloadService _downloadService;
-    private readonly INavigationService _navigationService;
-
     public ReadOnlyObservableCollection<TaskViewModel> Tasks { get; }
 
+    public INavigationService NavigationService { get; init; }
+
+
     public DownloadViewModel(DownloadService downloadService, INavigationService navigationService)
     {
-        _downloadService = downloadService;
-        _navigationService = navigationService;
-
+        NavigationService = navigationService;
         Tasks = new(downloadService.DownloadTasks);
     }
 
     [RelayCommand]
-    void GoToDownload() => _navigationService.NavigateTo("Download/Navigation");
+    void GoToDownload() => NavigationService.NavigateTo("Download/Navigation");
 }