Skip to content

Commit 00fd9eb

Browse files
SilvertealSilverteal
committed
2 parents ed408b6 + 5fec98c commit 00fd9eb

File tree

8 files changed

+58
-194
lines changed

8 files changed

+58
-194
lines changed

‎Plain Craft Launcher 2/Controls/MyHint.xaml.vb

+10-10
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@
108108
If Type = HintType.Note Then
109109
If IsWarn Then
110110
BorderBrush = New MyColor("#CCFF4444")
111-
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
112-
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
113-
Path.Fill = New MyColor("#BF0000")
114-
LabText.Foreground = New MyColor("#BF0000")
115-
BtnClose.Foreground = New MyColor("#BF0000")
111+
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFF9999"), String))
112+
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF7777"), String))
113+
Path.Fill = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
114+
LabText.Foreground = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
115+
BtnClose.Foreground = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
116116
Path.Data = (New GeometryConverter).ConvertFromString("F1 M 58.5832,55.4172L 17.4169,55.4171C 15.5619,53.5621 15.5619,50.5546 17.4168,48.6996L 35.201,15.8402C 37.056,13.9852 40.0635,13.9852 41.9185,15.8402L 58.5832,48.6997C 60.4382,50.5546 60.4382,53.5622 58.5832,55.4172 Z M 34.0417,25.7292L 36.0208,41.9584L 39.9791,41.9583L 41.9583,25.7292L 34.0417,25.7292 Z M 38,44.3333C 36.2511,44.3333 34.8333,45.7511 34.8333,47.5C 34.8333,49.2489 36.2511,50.6667 38,50.6667C 39.7489,50.6667 41.1666,49.2489 41.1666,47.5C 41.1666,45.7511 39.7489,44.3333 38,44.3333 Z ")
117117
Return
118118
Else
@@ -139,11 +139,11 @@
139139
Return
140140
Case HintType.Caution
141141
BorderBrush = New MyColor("#CCFF4444")
142-
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFFBBBB"), String))
143-
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF8888"), String))
144-
Path.Fill = New MyColor("#BF0000")
145-
LabText.Foreground = New MyColor("#BF0000")
146-
BtnClose.Foreground = New MyColor("#BF0000")
142+
Gradient1.Color = New MyColor(CType(If(IsDarkMode, "#BBFF8888", "#BBFF9999"), String))
143+
Gradient2.Color = New MyColor(CType(If(IsDarkMode, "#BBFF6666", "#BBFF7777"), String))
144+
Path.Fill = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
145+
LabText.Foreground = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
146+
BtnClose.Foreground = New MyColor(CType(If(IsDarkMode, "#BB980606", "#BBFF0000"), String))
147147
Path.Data = (New GeometryConverter).ConvertFromString("F1 M1024,1024z M0,0z M512,0C229.23,0 0,229.23 0,512 0,794.77 229.23,1024 512,1024 794.768,1024 1024,794.77 1024,512 1024,229.23 794.77,0 512,0z M746.76,656.252C754.568,664.06,754.566,676.724,746.762,684.536L684.534,746.76C676.726,754.568,664.064,754.574,656.248,746.762L512,602.51 367.75,746.76C359.94,754.572,347.276,754.568,339.466,746.76L277.24,684.536C269.43,676.728,269.428,664.064,277.24,656.252L421.492,512 277.242,367.75C269.432,359.942,269.432,347.276,277.242,339.466L339.468,277.242C347.278,269.43,359.942,269.432,367.752,277.242L512,421.49 656.252,277.24C664.058,269.428,676.722,269.43,684.534,277.24L746.76,339.464C754.566,347.276,754.568,359.938,746.76,367.748L602.51,512 746.76,656.252z")
148148
Return
149149
Case Else

‎Plain Craft Launcher 2/FormMain.xaml.vb

+30-171
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,20 @@ Public Class FormMain
1212
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
1313
'统计更新日志条目
1414
#If RELEASE Then
15+
If LastVersion < 356 Then
16+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "修复正版验证无法正常进行的问题"))
17+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "深色模式优化"))
18+
End If
19+
If LastVersion < 355 Then
20+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "同步官方版 2.8.13 代码，详情查阅龙猫专栏"))
21+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "已有版本支持自动安装修改"))
22+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持深色模式"))
23+
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "播放音乐接入 SMTC，允许使用键盘等控制"))
24+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持下载更多远古版本 MC"))
25+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优先使用高性能显卡启动游戏"))
26+
FeatureCount += 5
27+
BugCount += 9
28+
End If
1529
If LastVersion < 354 Then
1630
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持识别剪贴板资源链接并提示跳转"))
1731
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "允许禁用 Java Wrapper"))
@@ -54,78 +68,28 @@ Public Class FormMain
5468
FeatureCount += 43
5569
BugCount += 37
5670
End If
57-
If LastVersion < 342 Then 'Release 2.8.9
58-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持下载原版服务端"))
59-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "本地 Mod 的标题支持选择显示 Mod 原始文件名"))
60-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复搜索后启用/禁用 Mod 时出错的 Bug"))
61-
FeatureCount += 17
62-
BugCount += 13
63-
End If
64-
If LastVersion < 340 Then 'Release 2.8.8
65-
If LastVersion = 338 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复数个与新正版登录相关的严重 Bug"))
66-
FeatureCount += 3
67-
BugCount += 7
68-
End If
69-
If LastVersion < 338 Then 'Release 2.8.7
70-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "使用新的正版登录方式，以提高安全性"))
71-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化安装整合包、检索 Mod 的稳定性"))
72-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法加载部分 Mod 的图标的 Bug"))
73-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复在 Mod 管理页面删除 Mod 导致报错的 Bug"))
74-
FeatureCount += 11
75-
BugCount += 21
76-
End If
77-
If LastVersion < 336 Then 'Release 2.8.6
78-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "下载 Mod 时会使用 MCIM 国内镜像源"))
79-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面允许筛选可更新/启用/禁用的 Mod"))
80-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "打开 PCL 时会自动安装同目录下的 modpack.zip"))
81-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "爱发电域名迁移至 afdian.com"))
82-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复 1.20.1+ 离线登录使用正版皮肤时无法保存游戏的 Bug"))
83-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装的 1.14~1.15 Forge+OptiFine 无法进入世界的 Bug"))
84-
FeatureCount += 19
85-
BugCount += 24
86-
End If
87-
If LastVersion < 332 Then 'Release 2.8.3
88-
If LastVersion = 330 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
89-
End If
90-
If LastVersion < 330 Then 'Release 2.8.2
91-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
92-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
93-
FeatureCount += 15
94-
BugCount += 22
95-
End If
96-
If LastVersion < 326 Then 'Release 2.7.4
97-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
98-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
99-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复正版登录时弹出脚本错误提示的 Bug"))
100-
FeatureCount += 17
101-
BugCount += 19
102-
End If
103-
If LastVersion < 323 Then 'Release 2.7.3
104-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 启动游戏前进行内存优化 设置"))
105-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化 MC 性能"))
106-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装 OptiFine 有概率失败的 Bug"))
107-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动 Fabric 1.20.5+ 时无法正确选择 Java 的 Bug"))
108-
FeatureCount += 22
109-
BugCount += 21
110-
End If
111-
If LastVersion < 321 Then 'Release 2.7.1
112-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动部分整合包导致设置丢失的 Bug"))
113-
BugCount += 1
114-
End If
115-
If LastVersion < 319 Then 'Release 2.7.0
116-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持更新 Mod"))
117-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持查看可更新的 Mod 的更新日志"))
118-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持滑动鼠标快速选中、取消选中多个 Mod"))
119-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法启动 MC 24w14a+ 的 Bug"))
120-
FeatureCount += 10
121-
BugCount += 10
122-
End If
12371
#Else
12472
'5： FEAT+
12573
'4： IMP+ FEAT*
12674
'3：BUG+ IMP* FEAT-
12775
'2：BUG* IMP-
12876
'1：BUG-
77+
If LastVersion < 356 Then
78+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "修复正版验证无法正常进行的问题"))
79+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "深色模式优化"))
80+
FeatureCount += 1
81+
BugCount += 1
82+
End If
83+
If LastVersion < 355 Then
84+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "同步官方版 2.8.13 代码，详情查阅龙猫专栏"))
85+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "已有版本支持自动安装修改"))
86+
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持深色模式"))
87+
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "播放音乐接入 SMTC，允许使用键盘等控制"))
88+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持下载更多远古版本 MC"))
89+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优先使用高性能显卡启动游戏"))
90+
FeatureCount += 5
91+
BugCount += 9
92+
End If
12993
If LastVersion < 354 Then
13094
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持识别剪贴板资源链接并提示跳转"))
13195
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "允许禁用 Java Wrapper"))
@@ -163,111 +127,6 @@ Public Class FormMain
163127
If LastVersion < 346 Then 'Snapshot 2.8.12
164128
If LastVersion = 345 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复帮助页面报错的 Bug"))
165129
End If
166-
If LastVersion < 345 Then 'Snapshot 2.8.11
167-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面添加下载 Mod、安装 Mod 选项"))
168-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 详情页面支持按加载器、游戏版本进行分类和筛选"))
169-
FeatureCount += 23
170-
BugCount += 21
171-
End If
172-
If LastVersion < 343 Then 'Snapshot 2.8.10
173-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持安装同时包含 modpack 文件和启动器的懒人包"))
174-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "优化整合包导入流程"))
175-
FeatureCount += 20
176-
BugCount += 16
177-
End If
178-
If LastVersion < 341 Then 'Snapshot 2.8.9
179-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "支持下载原版服务端"))
180-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "本地 Mod 的标题支持选择显示 Mod 原始文件名"))
181-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复搜索后启用/禁用 Mod 时出错的 Bug"))
182-
FeatureCount += 17
183-
BugCount += 13
184-
End If
185-
If LastVersion < 339 Then 'Snapshot 2.8.8
186-
If LastVersion = 337 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复数个与新正版登录相关的严重 Bug"))
187-
FeatureCount += 3
188-
BugCount += 7
189-
End If
190-
If LastVersion < 337 Then 'Snapshot 2.8.7
191-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "使用新的正版登录方式，以提高安全性"))
192-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化安装整合包、检索 Mod 的稳定性"))
193-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法加载部分 Mod 的图标的 Bug"))
194-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复在 Mod 管理页面删除 Mod 导致报错的 Bug"))
195-
FeatureCount += 11
196-
BugCount += 21
197-
End If
198-
If LastVersion < 335 Then 'Snapshot 2.8.6
199-
BugCount += 2
200-
End If
201-
If LastVersion < 334 Then 'Snapshot 2.8.5
202-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "Mod 管理页面允许筛选可更新/启用/禁用的 Mod"))
203-
If LastVersion = 333 Then
204-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装愚人节和预发布版本的 Bug"))
205-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法导出错误报告的 Bug"))
206-
End If
207-
FeatureCount += 6
208-
BugCount += 7
209-
End If
210-
If LastVersion < 333 Then 'Snapshot 2.8.4
211-
FeatureList.Add(New KeyValuePair(Of Integer, String)(4, "下载 Mod 时会使用 MCIM 国内镜像源"))
212-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "打开 PCL 时会自动安装同目录下的 modpack.zip"))
213-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "爱发电域名迁移至 afdian.com"))
214-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复 1.20.1+ 离线登录使用正版皮肤时无法保存游戏的 Bug"))
215-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装的 1.14~1.15 Forge+OptiFine 无法进入世界的 Bug"))
216-
FeatureCount += 13
217-
BugCount += 17
218-
End If
219-
If LastVersion < 331 Then 'Snapshot 2.8.3
220-
If LastVersion = 329 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复部分玩家无法启动 MC 的 Bug"))
221-
End If
222-
If LastVersion < 329 Then 'Snapshot 2.8.2
223-
If LastVersion >= 327 Then
224-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Beta 版 NeoForge 的整合包的 Bug"))
225-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复自动安装无法选择部分 OptiFine 的 Bug"))
226-
End If
227-
FeatureCount += 4
228-
BugCount += 8
229-
End If
230-
If LastVersion < 328 Then 'Snapshot 2.8.1
231-
If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Forge 1.12.2- 的 Bug"))
232-
If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法输入解锁码的 Bug"))
233-
If LastVersion = 327 Then BugCount += 1
234-
End If
235-
If LastVersion < 327 Then 'Snapshot 2.8.0
236-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
237-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
238-
FeatureCount += 11
239-
BugCount += 14
240-
End If
241-
If LastVersion < 325 Then 'Snapshot 2.7.4
242-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
243-
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
244-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复正版登录时弹出脚本错误提示的 Bug"))
245-
FeatureCount += 17
246-
BugCount += 19
247-
End If
248-
If LastVersion < 324 Then 'Snapshot 2.7.3
249-
FeatureCount += 4
250-
BugCount += 3
251-
End If
252-
If LastVersion < 322 Then 'Snapshot 2.7.2
253-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 启动游戏前进行内存优化 设置"))
254-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复安装 OptiFine 有概率失败的 Bug"))
255-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动 Fabric 1.20.5+ 时无法正确选择 Java 的 Bug"))
256-
FeatureCount += 18
257-
BugCount += 18
258-
End If
259-
If LastVersion < 320 Then 'Snapshot 2.7.1
260-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复启动部分整合包导致设置丢失的 Bug"))
261-
BugCount += 1
262-
End If
263-
If LastVersion < 318 Then 'Snapshot 2.7.0
264-
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "支持更新 Mod"))
265-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持查看可更新的 Mod 的更新日志"))
266-
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持滑动鼠标快速选中、取消选中多个 Mod"))
267-
FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法启动 MC 24w14a+ 的 Bug"))
268-
FeatureCount += 10
269-
BugCount += 10
270-
End If
271130
#End If
272131
'整理更新日志文本
273132
Dim ContentList As New List(Of String)

‎Plain Craft Launcher 2/Modules/Base/ModBase.vb

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ Public Module ModBase
1212
#Region "声明"
1313

1414
'下列版本信息由更新器自动修改
15-
Public Const VersionBaseName As String = "2.9.5" '不含分支前缀的显示用版本名
16-
Public Const VersionStandardCode As String = "2.9.5." & VersionBranchCode '标准格式的四段式版本号
15+
Public Const VersionBaseName As String = "2.10.1" '不含分支前缀的显示用版本名
16+
Public Const VersionStandardCode As String = "2.10.1." & VersionBranchCode '标准格式的四段式版本号
1717
Public Const CommitHash As String = "native" 'Commit Hash，由 GitHub Workflow 自动替换
1818
Public CommitHashShort As String = If(CommitHash = "native", "native", CommitHash.Substring(0, 7)) 'Commit Hash，取前 7 位
19-
Public Const UpstreamVersion As String = "2.8.12" '上游版本
19+
Public Const UpstreamVersion As String = "2.8.13" '上游版本
2020
#If RELEASE Then
21-
Public Const VersionCode As Integer = 354 'Release
21+
Public Const VersionCode As Integer = 356 'Release
2222
#Else
23-
Public Const VersionCode As Integer = 354 'Snapshot
23+
Public Const VersionCode As Integer = 356 'Snapshot
2424
#End If
2525
'自动生成的版本信息
2626
Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName

0 commit comments

Comments
 (0)