2.13.1.0

2026-08-02 01:00:16 +08:00
parent c7ccdd65dc
commit 7fb6e5d68e
61 changed files with 3291 additions and 1165 deletions
@@ -368,7 +368,7 @@ pause"
        '添加 Java Wrapper 作为主 Jar
        Dim Arguments As String
        If UseJavaWrapper AndAlso Not Settings.Get(Of Boolean)("LaunchAdvanceDisableJLW") Then
-            Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.TrimEnd("\")}"" -Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" -jar ""{ExtractPatch("JavaWrapper")}"" optifine.Installer"
+            Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.Value.TrimEnd("\")}"" -Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" -jar ""{LaunchUtils.ExtractPatch("Launch\JavaWrapper.jar", PathPure.Value)}"" optifine.Installer"
        Else
            Arguments = $"-Duser.home=""{BaseMcFolderHome.TrimEnd("\")}"" -cp ""{Target}"" optifine.Installer"
        End If
@@ -939,7 +939,7 @@ Retry:
        '添加 Java Wrapper 作为主 Jar
        Dim Arguments As String
        If UseJavaWrapper AndAlso Not Settings.Get(Of Boolean)("LaunchAdvanceDisableJLW") Then
-            Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.TrimEnd("\")}"" -cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" -jar ""{ExtractPatch("JavaWrapper")}"" com.bangbang93.ForgeInstaller ""{McFolder}"
+            Arguments = $"-Doolloo.jlw.tmpdir=""{PathPure.Value.TrimEnd("\")}"" -cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" -jar ""{LaunchUtils.ExtractPatch("Launch\JavaWrapper.jar", PathPure.Value)}"" com.bangbang93.ForgeInstaller ""{McFolder}"
        Else
            Arguments = $"-cp ""{PathTemp}Cache\forge_installer.jar;{Target}"" com.bangbang93.ForgeInstaller ""{McFolder}"
        End If
@@ -2160,39 +2160,4 @@ Retry:
    ''' </summary>
    Private VanillaSyncLock As New Object

-    ''' <summary>
-    ''' 释放补丁文件并返回完整文件路径。
-    ''' </summary>
-    ''' <param name="Patch">"LUA" 或 "JavaWrapper"。</param>
-    Public Function ExtractPatch(Patch As String) As String
-        Dim PatchPath As String = $"{PathPure}{Patch}.jar"
-        Logger.Info($"选定的 {Patch} 路径：{PatchPath}")
-        Static Lock As New Object
-        SyncLock Lock '避免 OptiFine 和 Forge 安装时同时释放导致冲突
-            Try
-                ExtractResources(PatchPath, Patch)
-            Catch ex As Exception
-                If FileUtils.Exists(PatchPath) Then
-                    '因为未知原因可能变为只读文件（#4243）
-                    Logger.Warn(ex, $"{Patch} 文件释放失败，但文件已存在，将在删除后尝试重新生成")
-                    Try
-                        FileUtils.Delete(PatchPath)
-                        ExtractResources(PatchPath, Patch)
-                    Catch ex2 As Exception
-                        Logger.Warn(ex2, $"{Patch} 文件重新释放失败，将尝试更换文件名重新生成")
-                        PatchPath = $"{PathPure}{Patch}2.jar"
-                        Try
-                            ExtractResources(PatchPath, Patch)
-                        Catch ex3 As Exception
-                            Throw New FileNotFoundException($"释放 {Patch} 最终尝试失败", ex3)
-                        End Try
-                    End Try
-                Else
-                    Throw New FileNotFoundException($"释放 {Patch} 失败", ex)
-                End If
-            End Try
-        End SyncLock
-        Return PatchPath
-    End Function
-
 End Module
@@ -1120,7 +1120,7 @@ Public Class PageDownloadInstall
 #Region "安装"

    Private Sub TextSelectName_KeyDown(sender As Object, e As KeyEventArgs) Handles TextSelectName.KeyDown
-        If e.Key = Key.Enter AndAlso BtnStart.IsEnabled Then BtnStart_Click()
+        If e.Key = Key.Enter AndAlso IsInSelectPage AndAlso BtnStart.IsEnabled Then BtnStart_Click()
    End Sub
    Private Sub BtnStart_Click() Handles BtnStart.Click
        '确认版本隔离
@@ -175,10 +175,7 @@ GroupDone:
                If Project.ModLoaders.Flags.Count > 1 AndAlso '工程至少有两个加载器
                    Version.ResourceType = ResourceTypes.Mod AndAlso '是 Mod
                    McVersion.IsFormatFit(VerName) Then '不是 “快照版本” 之类的
-                    For Each Loader In Version.ModLoaders.Flags
-                        If Loader = ModLoaders.Quilt AndAlso Settings.Get(Of Boolean)("ToolDownloadIgnoreQuilt") Then Continue For
-                        Loaders.Add(Loader.ToString & " ")
-                    Next
+                    Loaders.AddRange(Version.ModLoaders.Flags.Select(Function(f) f.ToString & " "))
                End If
                If Not Loaders.Any() Then Loaders.Add("") '保底加一个空的，确保它在一张卡片里
                '实际添加
@@ -329,7 +326,7 @@ GroupDone:
            Loader.Start(McFolderSelected & "versions\" & InstanceName & "\")
            LoaderTaskbarAdd(Loader)
            FrmMain.BtnExtraDownload.ShowRefresh()
-            FrmMain.BtnExtraDownload.Ribble()
+            FrmMain.PageChange(FormMain.PageType.TaskManager)

        Catch ex As Exception
            Logger.Error(ex, "下载资源整合包失败")
@@ -34,6 +34,7 @@
                    <TextBlock VerticalAlignment="Center" Grid.Row="2" HorizontalAlignment="Left" Text="版本" Margin="0,0,18,0" />
                    <local:MyComboBox x:Name="TextSearchVersion" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="2" IsEditable="True" IsTextSearchEnabled="False">
                        <local:MyComboBoxItem Content="全部 (也可自行输入)" IsSelected="True" />
+                        <local:MyComboBoxItem Content="26.2" />
                        <local:MyComboBoxItem Content="26.1" />
                        <local:MyComboBoxItem Content="1.21.11" />
                        <local:MyComboBoxItem Content="1.21.8" />
@@ -51,7 +52,6 @@
                        <local:MyComboBoxItem Content="Forge" Tag="1" />
                        <local:MyComboBoxItem Content="NeoForge" Tag="16" />
                        <local:MyComboBoxItem Content="Fabric" Tag="4" />
-                        <local:MyComboBoxItem Content="Quilt" Tag="8" />
                        <local:MyComboBoxItem Content="LiteLoader" Tag="2" />
                    </local:MyComboBox>
                    <TextBlock VerticalAlignment="Center" Grid.Column="4" Grid.Row="2" HorizontalAlignment="Left" Text="类型" Margin="0,0,18,0" />