Skip to content

Commit be67c4c

Browse files
committed
2.12.3
1 parent 2bffafc commit be67c4c

27 files changed

Lines changed: 3089 additions & 1721 deletions

Plain Craft Launcher 2/FormMain.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@
9595
<RowDefinition Height="Auto" />
9696
<RowDefinition />
9797
</Grid.RowDefinitions>
98-
<Canvas x:Name="ImgBack" IsHitTestVisible="False" Grid.Row="1" RenderOptions.BitmapScalingMode="LowQuality" />
98+
<Canvas x:Name="ImgBack" IsHitTestVisible="False" Grid.Row="1" RenderOptions.BitmapScalingMode="LowQuality"
99+
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
99100
<Grid x:Name="PanTitle" Height="48">
100101
<Grid.Background>
101102
<LinearGradientBrush EndPoint="1,0" StartPoint="0,0">

Plain Craft Launcher 2/FormMain.xaml.vb

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ Public Class FormMain
1111
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
1212
'统计更新日志条目
1313
#If BETA Then
14+
If LastVersion < 381 Then 'Release 2.12.2
15+
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复:无法搜索 CurseForge 上的社区资源"))
16+
FeatureCount += 3
17+
BugCount += 13
18+
End If
1419
If LastVersion < 379 Then 'Release 2.12.1
1520
If LastVersion >= 376 Then
1621
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "删除:暂时隐藏联机入口……不过只是暂时关闭,它还会回来的!"))
@@ -128,8 +133,15 @@ Public Class FormMain
128133
'3:BUG+ IMP* FEAT-
129134
'2:BUG* IMP-
130135
'1:BUG-
136+
If LastVersion < 382 Then 'Snapshot 2.12.3
137+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复:部分关键词搜不到资源,特别是中文 Mod 搜索经常没有结果"))
138+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复:下载可能完全卡住,或是下载进度反复回退"))
139+
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "新增:内存管理设置,可以选择 G1GC、ZGC 或分代 ZGC"))
140+
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "优化:来自 Modrinth 的文件下载速度"))
141+
FeatureCount += 15
142+
BugCount += 16
143+
End If
131144
If LastVersion < 380 Then 'Snapshot 2.12.2
132-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复:无法搜索 CurseForge 上的社区资源"))
133145
FeatureCount += 3
134146
BugCount += 13
135147
End If
@@ -606,6 +618,12 @@ Public Class FormMain
606618
Setup.Set("ToolDownloadTranslateV2", Setup.Get("ToolDownloadTranslate") + 1)
607619
Log("[Start] 已从老版本迁移 Mod 命名设置")
608620
End If
621+
'重置 JVM 参数设置
622+
If LastVersionCode <= 381 AndAlso Not Setup.IsUnset("LaunchAdvanceJvm") AndAlso
623+
Setup.Get("LaunchAdvanceJvm").ToString.Replace("-XX:+UseG1GC ", "").Replace("-XX:-UseAdaptiveSizePolicy ", "").Trim = Setup.GetDefault("LaunchAdvanceJvm") Then
624+
Setup.Reset("LaunchAdvanceJvm")
625+
Log("[Start] 已重置 JVM 参数设置")
626+
End If
609627
'输出更新日志
610628
If LastVersionCode <= 0 Then Return
611629
If LowerVersionCode >= VersionCode Then Return
@@ -819,12 +837,12 @@ Public Class FormMain
819837
Log(ex, "切回窗口时出错", LogLevel.Feedback)
820838
End Try
821839
'读取剪贴板,自动加入联机房间
840+
Return 'UNDONE: 联机复活赛
822841
If PageLinkMain.LinkState <> PageLinkMain.LinkStates.Waiting Then Return '已启动联机
823842
If PageCurrent = PageType.Link Then Return '已在联机界面
824843
Dim Code = ClipboardGetText() : If Code Is Nothing Then Return '剪贴板无文本
825-
If Setup.Get("LinkLastAutoJoinInviteCode") = Code Then Return
826-
' If PageLinkMain.ValidateCodeFormat(Code) IsNot Nothing Then Return '不是邀请码
827-
Return '联机关闭 直接return
844+
If Setup.Get("LinkLastAutoJoinInviteCode") = Code Then Return
845+
If PageLinkMain.ValidateCodeFormat(Code) IsNot Nothing Then Return '不是邀请码
828846
Setup.Set("LinkLastAutoJoinInviteCode", Code)
829847
RunInThread(
830848
Sub()

0 commit comments

Comments
 (0)