2.4.1

Hex-Dragon · Nov 3, 2022 · ef32179 · ef32179
1 parent e9b34ad
commit ef32179
Show file tree

Hide file tree

Showing 42 changed files with 4,212 additions and 187 deletions.
diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml
@@ -15,9 +15,9 @@
             <my:MyTextBox x:Name="TextCaption" UseLayoutRounding="False" MaxLength="1000" Width="450" Margin="1" />
         </Border>
         <StackPanel Name="PanBtn" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="150,0,22,20" Orientation="Horizontal">
-            <my:MyButton ColorType="Normal" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
-            <my:MyButton ColorType="Normal" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
-            <my:MyButton ColorType="Normal" Text="测试按钮3" x:Name="Btn3" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+            <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+            <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+            <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮3" x:Name="Btn3" Margin="15,0,0,0" TextPadding="7" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
         </StackPanel>
     </StackPanel>
 </Grid>
diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgInput.xaml.vb
@@ -109,13 +109,13 @@
         MyConverter.Result = TextCaption.Text
         Close()
     End Sub
-    Private Sub Btn2_Click() Handles Btn2.Click
+    Public Sub Btn2_Click() Handles Btn2.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = Nothing
         Close()
     End Sub
-    Private Sub Btn3_Click() Handles Btn3.Click
+    Public Sub Btn3_Click() Handles Btn3.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = Nothing

diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml
@@ -20,8 +20,8 @@
         <StackPanel x:Name="PanSelection" Orientation="Vertical" />
     </my:MyScrollViewer>
     <StackPanel Name="PanBtn" Grid.Row="3" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="150,0,22,20" Orientation="Horizontal">
-        <my:MyButton ColorType="Normal" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7"  SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" IsEnabled="False" />
-        <my:MyButton ColorType="Normal" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
-        <my:MyButton ColorType="Normal" Text="测试按钮3" x:Name="Btn3" TextPadding="7" Margin="15,0,0,0" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7"  SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" IsEnabled="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮3" x:Name="Btn3" TextPadding="7" Margin="15,0,0,0" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
     </StackPanel>
 </Grid>
diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml.vb b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgSelect.xaml.vb
@@ -112,13 +112,13 @@
         MyConverter.Result = SelectedIndex
         Close()
     End Sub
-    Private Sub Btn2_Click() Handles Btn2.Click
+    Public Sub Btn2_Click() Handles Btn2.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = Nothing
         Close()
     End Sub
-    Private Sub Btn3_Click() Handles Btn3.Click
+    Public Sub Btn3_Click() Handles Btn3.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = Nothing

diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml
@@ -20,8 +20,8 @@
         <TextBlock VerticalAlignment="Top" TextTrimming="None" TextWrapping="Wrap" Name="LabCaption" FontSize="15" Foreground="#FF5C5C5C" FontWeight="Normal" Padding="1" />
     </my:MyScrollViewer>
     <StackPanel Name="PanBtn" Grid.Row="3" VerticalAlignment="Top" HorizontalAlignment="Right" Margin="150,0,22,20" Orientation="Horizontal">
-        <my:MyButton ColorType="Normal" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7"  SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
-        <my:MyButton ColorType="Normal" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
-        <my:MyButton ColorType="Normal" Text="测试按钮3" x:Name="Btn3" TextPadding="7" Margin="15,0,0,0" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮1" x:Name="Btn1" Margin="15,0,0,0" TextPadding="7"  SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮2" x:Name="Btn2" Margin="15,0,0,0" TextPadding="7" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
+        <my:MyButton ColorType="Normal" x:FieldModifier="public" Text="测试按钮3" x:Name="Btn3" TextPadding="7" Margin="15,0,0,0" Visibility="Visible" SnapsToDevicePixels="False" Padding="5,0" Opacity="0" UseLayoutRounding="False" />
     </StackPanel>
 </Grid>
diff --git a/Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml.vb b/Plain Craft Launcher 2/Controls/MyMsg/MyMsgText.xaml.vb
@@ -104,13 +104,13 @@
         MyConverter.Result = 1
         Close()
     End Sub
-    Private Sub Btn2_Click() Handles Btn2.Click
+    Public Sub Btn2_Click() Handles Btn2.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = 2
         Close()
     End Sub
-    Private Sub Btn3_Click() Handles Btn3.Click
+    Public Sub Btn3_Click() Handles Btn3.Click
         If MyConverter.IsExited Then Exit Sub
         MyConverter.IsExited = True
         MyConverter.Result = 3

diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb
@@ -10,6 +10,16 @@ Public Class FormMain
         Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
         '统计更新日志条目
 #If BETA Then
+        If LastVersion < 268 Then 'Release 2.4.1
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "追加新的联机方式（HiPer 联机模块）"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "游戏崩溃的弹窗添加了直接查看日志的选项"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "在更多分类下添加了新功能投票选项"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "自动安装时支持检查 OptiFine 对 Forge 的具体版本需求"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化自动 Java 选择的准确度"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化 Mod 中文名的显示"))
+            FeatureCount += 12
+            BugCount += 30
+        End If
         If LastVersion < 265 Then 'Release 2.3.5
             FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分情况下无法启动路径带有中文的游戏的 Bug"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复多个可能导致 OptiFine、Forge 安装失败的 Bug"))
@@ -90,6 +100,14 @@ Public Class FormMain
         '3：BUG+ IMP* FEAT-
         '2：BUG* IMP-
         '1：BUG-
+        If LastVersion < 267 Then 'Snapshot 2.4.1
+            If LastVersion = 266 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化 HiPer 联机模块的使用体验"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "自动安装时支持检查 OptiFine 对 Forge 的具体版本需求"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化自动 Java 选择的准确度"))
+            FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化 Mod 中文名的显示"))
+            FeatureCount += 12
+            BugCount += 22
+        End If
         If LastVersion < 266 Then 'Snapshot 2.4.0
             FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "追加新的联机方式（HiPer 联机模块）"))
             FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "游戏崩溃的弹窗添加了直接查看日志的选项"))
@@ -575,11 +593,25 @@ Reopen:
     '按键事件
     Private Sub FormMain_KeyDown(sender As Object, e As KeyEventArgs) Handles Me.KeyDown
         If e.IsRepeat Then Exit Sub
-        '调用弹窗回车
-        If e.Key = Key.Enter AndAlso PanMsg.Children.Count > 0 Then
-            CType(PanMsg.Children(0), Object).Btn1_Click()
-            Exit Sub
+        '调用弹窗：回车选择第一个，Esc 选择最后一个
+        If PanMsg.Children.Count > 0 Then
+            If e.Key = Key.Enter Then
+                CType(PanMsg.Children(0), Object).Btn1_Click()
+                Exit Sub
+            ElseIf e.Key = Key.Escape Then
+                Dim Msg As Object = PanMsg.Children(0)
+                If Msg.Btn3.Visibility = Visibility.Visible Then
+                    Msg.Btn3_Click()
+                ElseIf Msg.Btn2.Visibility = Visibility.Visible Then
+                    Msg.Btn2_Click()
+                Else
+                    Msg.Btn1_Click()
+                End If
+                Exit Sub
+            End If
         End If
+        '按 ESC 返回上一级
+        If e.Key = Key.Escape Then TriggerPageBack()
         '更改隐藏版本可见性
         If e.Key = Key.F11 AndAlso PageCurrent = FormMain.PageType.VersionSelect Then
             FrmSelectRight.ShowHidden = Not FrmSelectRight.ShowHidden
@@ -607,8 +639,6 @@ Reopen:
         End If
         '修复按下 Alt 后误认为弹出系统菜单导致的冻结
         If e.SystemKey = Key.LeftAlt OrElse e.SystemKey = Key.RightAlt Then e.Handled = True
-        '按 ESC 返回上一级
-        If e.Key = Key.Escape Then TriggerPageBack()
     End Sub
     Private Sub FormMain_MouseDown(sender As Object, e As MouseButtonEventArgs) Handles Me.MouseDown
         '鼠标侧键返回上一级

diff --git a/Plain Craft Launcher 2/Images/Skins/Alex.png b/Plain Craft Launcher 2/Images/Skins/Alex.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Ari.png b/Plain Craft Launcher 2/Images/Skins/Ari.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Efe.png b/Plain Craft Launcher 2/Images/Skins/Efe.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Kai.png b/Plain Craft Launcher 2/Images/Skins/Kai.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Makena.png b/Plain Craft Launcher 2/Images/Skins/Makena.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Noor.png b/Plain Craft Launcher 2/Images/Skins/Noor.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Steve.png b/Plain Craft Launcher 2/Images/Skins/Steve.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Sunny.png b/Plain Craft Launcher 2/Images/Skins/Sunny.png
diff --git a/Plain Craft Launcher 2/Images/Skins/Zuri.png b/Plain Craft Launcher 2/Images/Skins/Zuri.png
diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb
@@ -10,12 +10,12 @@ Public Module ModBase
 #Region "声明"
 
     '下列版本信息由更新器自动修改
-    Public Const VersionBaseName As String = "2.4.0" '不含分支前缀的显示用版本名
-    Public Const VersionStandardCode As String = "2.4.0." & VersionBranchCode '标准格式的四段式版本号
+    Public Const VersionBaseName As String = "2.4.1" '不含分支前缀的显示用版本名
+    Public Const VersionStandardCode As String = "2.4.1." & VersionBranchCode '标准格式的四段式版本号
 #If BETA Then
-    Public Const VersionCode As Integer = 265 'Release
+    Public Const VersionCode As Integer = 268 'Release
 #Else
-    Public Const VersionCode As Integer = 266 'Snapshot
+    Public Const VersionCode As Integer = 267 'Snapshot
 #End If
     '自动生成的版本信息
     Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -1236,7 +1236,7 @@ Re:
             Directory.CreateDirectory(DestDirectory)
             If CompressFilePath.EndsWith(".zip") OrElse CompressFilePath.EndsWith(".jar") Then
                 '以 zip 方式解压
-                ZipFile.ExtractToDirectory(CompressFilePath, DestDirectory, If(Encode, Encoding.Default))
+                ZipFile.ExtractToDirectory(CompressFilePath, DestDirectory, If(Encode, Encoding.GetEncoding("GB18030")))
                 Return True
             ElseIf CompressFilePath.EndsWith(".gz") Then
                 '以 gz 方式解压
@@ -2301,7 +2301,7 @@ Retry:
         RunInNewThread(Sub()
                            Dim IsInitSuccess As Boolean = True
                            Try
-                               For i = 4 To 1
+                               For i = 4 To 1 Step -1
                                    If File.Exists(Path & "PCL\Log" & i & ".txt") Then
                                        If File.Exists(Path & "PCL\Log" & (i + 1) & ".txt") Then File.Delete(Path & "PCL\Log" & (i + 1) & ".txt")
                                        CopyFile(Path & "PCL\Log" & i & ".txt", Path & "PCL\Log" & (i + 1) & ".txt")

diff --git a/Plain Craft Launcher 2/Modules/Base/ModNet.vb b/Plain Craft Launcher 2/Modules/Base/ModNet.vb
@@ -96,7 +96,9 @@ Retry:
     ''' </summary>
     ''' <param name="Url">网页的 Url。</param>
     ''' <param name="Encode">网页的编码，通常为 UTF-8。</param>
-    Public Function NetGetCodeByRequestRetry(Url As String, Optional Encode As Encoding = Nothing, Optional Accept As String = "", Optional IsJson As Boolean = False)
+    ''' <param name="BackupUrl">如果第一次尝试失败，换用的备用 URL。</param>
+    Public Function NetGetCodeByRequestRetry(Url As String, Optional Encode As Encoding = Nothing, Optional Accept As String = "",
+                                             Optional IsJson As Boolean = False, Optional BackupUrl As String = Nothing)
         Dim RetryCount As Integer = 0
         Dim RetryException As Exception = Nothing
         Dim StartTime As Long = GetTimeTick()
@@ -107,12 +109,12 @@ Retry:
                     Return NetGetCodeRequest(Url, Encode, 10000, IsJson, Accept)
                 Case 1 '慢速重试
                     Thread.Sleep(500)
-                    Return NetGetCodeRequest(Url, Encode, 30000, IsJson, Accept)
+                    Return NetGetCodeRequest(If(BackupUrl, Url), Encode, 30000, IsJson, Accept)
                 Case Else '快速重试
                     If GetTimeTick() - StartTime > 5500 Then
                         '若前两次加载耗费 5 秒以上，才进行重试
                         Thread.Sleep(500)
-                        Return NetGetCodeRequest(Url, Encode, 4000, IsJson, Accept)
+                        Return NetGetCodeRequest(If(BackupUrl, Url), Encode, 4000, IsJson, Accept)
                     Else
                         Throw RetryException
                     End If

diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb
@@ -458,7 +458,9 @@ Done:
             If LogMc.Contains("Cannot read field ""ofTelemetry"" because ""net.optifine.Config.gameSettings"" is null") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("TRANSFORMER/net.optifine/net.optifine.reflect.Reflector.<clinit>(Reflector.java") Then AppendReason(CrashReason.OptiFine与Forge不兼容)
             If LogMc.Contains("Open J9 is not supported") OrElse LogMc.Contains("OpenJ9 is incompatible") OrElse LogMc.Contains(".J9VMInternals.") Then AppendReason(CrashReason.使用OpenJ9)
+            If LogMc.Contains("Unsupported class file major version") Then AppendReason(CrashReason.Java版本过高)
             If LogMc.Contains("because module java.base does not export") Then AppendReason(CrashReason.Java版本过高)
+            If LogMc.Contains("java.lang.ClassNotFoundException: jdk.nashorn.api.scripting.NashornScriptEngineFactory") Then AppendReason(CrashReason.Java版本过高)
             If LogMc.Contains("java.lang.ClassNotFoundException: java.lang.invoke.LambdaMetafactory") Then AppendReason(CrashReason.Java版本过高)
             If LogMc.Contains("The directories below appear to be extracted jar files. Fix this before you continue.") Then AppendReason(CrashReason.Mod文件被解压)
             If LogMc.Contains("Extracted mod jars found, loading will NOT continue") Then AppendReason(CrashReason.Mod文件被解压)
@@ -468,7 +470,7 @@ Done:
             If LogMc.Contains("1282: Invalid operation") Then AppendReason(CrashReason.光影或资源包导致OpenGL1282错误)
             If LogMc.Contains("signer information does not match signer information of other classes in the same package") Then AppendReason(CrashReason.文件或内容校验失败, If(RegexSeek(LogMc, "(?<=class "")[^']+(?=""'s signer information)"), "").TrimEnd(vbCrLf))
             If LogMc.Contains("An exception was thrown, the game will display an error screen and halt.") Then AppendReason(CrashReason.Forge报错, If(RegexSeek(LogMc, "(?<=the game will display an error screen and halt[\s\S]+?Exception: )[\s\S]+?(?=\n\tat)"), "").TrimEnd(vbCrLf))
-            If LogMc.Contains("A potential solution has been determined:") Then AppendReason(CrashReason.Fabric报错并给出解决方案, Join(RegexSearch(If(RegexSeek(LogMc, "(?<=A potential solution has been determined:\n)(\t - [^\n]+\n)+"), ""), "(?<=\t)[^\n]+"), vbLf))
+            If LogMc.Contains("A potential solution has been determined:") Then AppendReason(CrashReason.Fabric报错并给出解决方案, Join(RegexSearch(If(RegexSeek(LogMc, "(?<=A potential solution has been determined:\n)((\t)+ - [^\n]+\n)+"), ""), "(?<=(\t)+)[^\n]+"), vbLf))
             If LogMc.Contains("Maybe try a lower resolution resourcepack?") Then AppendReason(CrashReason.材质过大或显卡配置不足)
             If LogMc.Contains("java.lang.NoSuchMethodError: net.minecraft.world.server.ChunkManager$ProxyTicketManager.shouldForceTicks(J)Z") AndAlso LogMc.Contains("OptiFine") Then AppendReason(CrashReason.OptiFine导致无法加载世界)
             If LogMc.Contains("Could not reserve enough space") Then
@@ -773,7 +775,7 @@ Redo:
             Case CrashReason.使用JDK
                 ResultString = "游戏似乎因为使用 JDK，或 Java 版本过高而崩溃了。\n请在启动设置的 Java 选择一项中改用 JRE 8（Java 8），然后再启动游戏。\n如果你没有安装 JRE 8，你可以从网络中下载、安装一个。"
             Case CrashReason.Java版本过高
-                ResultString = "游戏似乎因为你所使用的 Java 版本过高而崩溃了。\n请在启动设置的 Java 选择一项中改用 JRE 8（Java 8），然后再启动游戏。\n如果你没有安装 JRE 8，你可以从网络中下载、安装一个。"
+                ResultString = "游戏似乎因为你所使用的 Java 版本过高而崩溃了。\n请在启动设置的 Java 选择一项中改用较低版本的 Java，然后再启动游戏。\n如果没有，可以从网络中下载、安装一个。"
             Case CrashReason.使用32位Java导致JVM无法分配足够多的内存
                 If Environment.Is64BitOperatingSystem Then
                     ResultString = "你似乎正在使用 32 位 Java，这会导致 Minecraft 无法使用 1GB 以上的内存，进而造成崩溃。\n\n请在启动设置的 Java 选择一项中改用 64 位的 Java 再启动游戏，然后再启动游戏。\n如果你没有安装 64 位的 Java，你可以从网络中下载、安装一个。"