Skip to content

Commit ebc9f5e

Browse files
LTCattLTCatt
committed
2.10.2
1 parent 4585f31 commit ebc9f5e

14 files changed

Lines changed: 310 additions & 344 deletions

File tree

‎Plain Craft Launcher 2/FormMain.xaml.vb‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ Public Class FormMain
1010
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
1111
'统计更新日志条目
1212
#If BETA Then
13+
If LastVersion < 359 Then 'Release 2.10.2
14+
If LastVersion >= 357 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：下载资源包、光影包时能自动跳转到对应的文件夹"))
15+
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：调整界面样式与动画，让整体视觉更干净，操作体验更顺滑"))
16+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：无法从 CurseForge 下载 Mod 等资源，或是安装整合包"))
17+
FeatureCount += 28
18+
BugCount += 28
19+
End If
1320
If LastVersion < 357 Then 'Release 2.10.0
1421
FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "新增：下载资源包、光影包、数据包"))
1522
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "新增：允许设置文件下载源"))
@@ -72,6 +79,12 @@ Public Class FormMain
7279
'3：BUG+ IMP* FEAT-
7380
'2：BUG* IMP-
7481
'1：BUG-
82+
If LastVersion < 360 Then 'Snapshot 2.10.2
83+
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "修复：无法从 CurseForge 下载 Mod 等资源，或是安装整合包"))
84+
If LastVersion >= 358 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复：无法加载正版皮肤的头像"))
85+
FeatureCount += 3
86+
BugCount += 5
87+
End If
7588
If LastVersion < 358 Then 'Snapshot 2.10.1
7689
If LastVersion >= 356 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：下载资源包、光影包时能自动跳转到对应的文件夹"))
7790
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "优化：调整界面样式与动画，让整体视觉更干净，操作体验更顺滑"))

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ Public Module ModBase
1313
#Region "声明"
1414

1515
'下列版本信息由更新器自动修改
16-
Public Const VersionBaseName As String = "2.10.1" '不含分支前缀的显示用版本名
17-
Public Const VersionStandardCode As String = "2.10.1." & VersionBranchCode '标准格式的四段式版本号
16+
Public Const VersionBaseName As String = "2.10.2" '不含分支前缀的显示用版本名
17+
Public Const VersionStandardCode As String = "2.10.2." & VersionBranchCode '标准格式的四段式版本号
1818
Public Const CommitHash As String = "" 'Commit Hash，由 GitHub Workflow 自动替换
1919
#If BETA Then
20-
Public Const VersionCode As Integer = 357 'Release
20+
Public Const VersionCode As Integer = 359 'Release
2121
#Else
22-
Public Const VersionCode As Integer = 358 'Snapshot
22+
Public Const VersionCode As Integer = 360 'Snapshot
2323
#End If
2424
'自动生成的版本信息
2525
Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName

‎Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
Entry.ChineseName = SplitedLine(1)
8080
If Entry.ChineseName.Contains("*") Then '处理 *
8181
Entry.ChineseName = Entry.ChineseName.Replace("*",
82-
$"({If(Entry.CurseForgeSlug, Entry.ModrinthSlug).Replace("-"," ").Capitalize})")
82+
$" ({If(Entry.CurseForgeSlug, Entry.ModrinthSlug).Replace("-", " ").Capitalize})")
8383
End If
8484
End If
8585
_CompDatabase.Add(Entry)
@@ -1490,13 +1490,12 @@ Retry:
14901490
''' </summary>
14911491
Public Shared Function HandleCurseForgeDownloadUrls(Url As String) As List(Of String)
14921492
Return {
1493-
Url.Replace("-service.overwolf.wtf", ".forgecdn.net").Replace("://edge", "://media"),
1493+
Url.Replace("-service.overwolf.wtf", ".forgecdn.net").Replace("://edge.", "://mediafilez.").Replace("://media.", "://mediafilez."),
1494+
Url.Replace("://edge.", "://mediafilez.").Replace("://media.", "://mediafilez."),
1495+
Url,
1496+
Url.Replace("-service.overwolf.wtf", ".forgecdn.net").Replace("://edge.", "://media."),
14941497
Url.Replace("-service.overwolf.wtf", ".forgecdn.net"),
1495-
Url.Replace("://edge", "://media"),
1496-
Url.Replace("-service.overwolf.wtf", ".forgecdn.net").Replace("://edge", "://mediafilez"),
1497-
Url.Replace("-service.overwolf.wtf", ".forgecdn.net"),
1498-
Url.Replace("://edge", "://mediafilez"),
1499-
Url
1498+
Url.Replace("://edge.", "://media.")
15001499
}.Distinct.ToList
15011500
End Function
15021501

‎Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -708,11 +708,12 @@ NextStack:
708708
If Word.Length <= 2 OrElse Word.StartsWithF("func_") Then Continue For
709709
If {"com", "org", "net", "asm", "fml", "mod", "jar", "sun", "lib", "map", "gui", "dev", "nio", "api", "dsi", "top", "mcp",
710710
"core", "init", "mods", "main", "file", "game", "load", "read", "done", "util", "tile", "item", "base", "oshi", "impl", "data", "pool", "task",
711-
"forge", "setup", "block", "model", "mixin", "event", "unimi", "netty", "world",
711+
"forge", "setup", "block", "model", "mixin", "event", "unimi", "netty", "world", "lwjgl",
712712
"gitlab", "common", "server", "config", "mixins", "compat", "loader", "launch", "entity", "assist", "client", "plugin", "modapi", "mojang", "shader", "events", "github", "recipe", "render", "packet", "events",
713713
"preinit", "preload", "machine", "reflect", "channel", "general", "handler", "content", "systems", "modules", "service",
714714
"fastutil", "optifine", "internal", "platform", "override", "fabricmc", "neoforge",
715-
"injection", "listeners", "scheduler", "minecraft", "transformer", "transformers", "neoforged", "universal", "multipart", "minecraftforge", "blockentity", "spongepowered", "electronwill"
715+
"injection", "listeners", "scheduler", "minecraft", "universal", "multipart", "neoforged", "microsoft",
716+
"transformer", "transformers", "minecraftforge", "blockentity", "spongepowered", "electronwill"
716717
}.Contains(Word.ToLower) Then Continue For
717718
PossibleWords.Add(Word.Trim)
718719
Next

‎Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1949,6 +1949,7 @@ NextVersion:
19491949

19501950
'离线皮肤资源包
19511951
Try
1952+
Directory.CreateDirectory(McVersionCurrent.PathIndie & "resourcepacks\")
19521953
Dim ZipFileAddress As String = McVersionCurrent.PathIndie & "resourcepacks\PCL2 Skin.zip"
19531954
Dim NewTypeSetup As Boolean = McVersionCurrent.Version.McCodeMain >= 13 OrElse McVersionCurrent.Version.McCodeMain < 6
19541955
If McLoginLoader.Input.Type = McLoginType.Legacy AndAlso Setup.Get("LaunchSkinType") = 4 AndAlso File.Exists(PathAppdata & "CustomSkin.png") Then

‎Plain Craft Launcher 2/Modules/Minecraft/ModWatcher.vb‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,8 @@
292292
End Sub, "MinecraftWindowMaximize")
293293
End If
294294
ElseIf Not IsWindowAppeared Then
295-
If (MinecraftWindowName.StartsWithF("FML")) Then '已找到 FML 窗口
296-
WatcherLog("FML 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）")
297-
Else '已找到 Quilt Loader 窗口
298-
WatcherLog("Quilt Loader 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）")
299-
End If
295+
'已找到 FML 窗口
296+
WatcherLog("FML 窗口已加载：" & MinecraftWindowName & "（" & MinecraftWindowHandle.ToInt64 & "）")
300297
End If
301298
IsWindowAppeared = True
302299
Catch ex As Exception

‎Plain Craft Launcher 2/Modules/ModSecret.vb‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -225,31 +225,11 @@ Friend Module ModSecret
225225
If Not FrmMain.IsLoaded Then Return
226226
'顶部条背景
227227
Dim Brush = New LinearGradientBrush With {.EndPoint = New Point(1, 0), .StartPoint = New Point(0, 0)}
228-
If ThemeNow = 5 Then
229-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0, .Color = New MyColor().FromHSL2(ColorHue, ColorSat, 25)})
230-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.5, .Color = New MyColor().FromHSL2(ColorHue, ColorSat, 15)})
231-
Brush.GradientStops.Add(New GradientStop With {.Offset = 1, .Color = New MyColor().FromHSL2(ColorHue, ColorSat, 25)})
232-
FrmMain.PanTitle.Background = Brush
233-
FrmMain.PanTitle.Background.Freeze()
234-
ElseIf Not (ThemeNow = 12 OrElse ThemeDontClick = 2) Then
235-
If TypeOf ColorHueTopbarDelta Is Integer Then
236-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0, .Color = New MyColor().FromHSL2(ColorHue - ColorHueTopbarDelta, ColorSat, 48 + ColorLightAdjust)})
237-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.5, .Color = New MyColor().FromHSL2(ColorHue, ColorSat, 54 + ColorLightAdjust)})
238-
Brush.GradientStops.Add(New GradientStop With {.Offset = 1, .Color = New MyColor().FromHSL2(ColorHue + ColorHueTopbarDelta, ColorSat, 48 + ColorLightAdjust)})
239-
Else
240-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0, .Color = New MyColor().FromHSL2(ColorHue + ColorHueTopbarDelta(0), ColorSat, 48 + ColorLightAdjust)})
241-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.5, .Color = New MyColor().FromHSL2(ColorHue + ColorHueTopbarDelta(1), ColorSat, 54 + ColorLightAdjust)})
242-
Brush.GradientStops.Add(New GradientStop With {.Offset = 1, .Color = New MyColor().FromHSL2(ColorHue + ColorHueTopbarDelta(2), ColorSat, 48 + ColorLightAdjust)})
243-
End If
244-
FrmMain.PanTitle.Background = Brush
245-
FrmMain.PanTitle.Background.Freeze()
246-
Else
247-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0, .Color = New MyColor().FromHSL2(ColorHue - 21, ColorSat, 53 + ColorLightAdjust)})
248-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.33, .Color = New MyColor().FromHSL2(ColorHue - 7, ColorSat, 47 + ColorLightAdjust)})
249-
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.67, .Color = New MyColor().FromHSL2(ColorHue + 7, ColorSat, 47 + ColorLightAdjust)})
250-
Brush.GradientStops.Add(New GradientStop With {.Offset = 1, .Color = New MyColor().FromHSL2(ColorHue + 21, ColorSat, 53 + ColorLightAdjust)})
251-
FrmMain.PanTitle.Background = Brush
252-
End If
228+
Brush.GradientStops.Add(New GradientStop With {.Offset = 0, .Color = New MyColor().FromHSL2(ColorHue - 21, ColorSat, 53 + ColorLightAdjust)})
229+
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.33, .Color = New MyColor().FromHSL2(ColorHue - 7, ColorSat, 47 + ColorLightAdjust)})
230+
Brush.GradientStops.Add(New GradientStop With {.Offset = 0.67, .Color = New MyColor().FromHSL2(ColorHue + 7, ColorSat, 47 + ColorLightAdjust)})
231+
Brush.GradientStops.Add(New GradientStop With {.Offset = 1, .Color = New MyColor().FromHSL2(ColorHue + 21, ColorSat, 53 + ColorLightAdjust)})
232+
FrmMain.PanTitle.Background = Brush
253233
'主页面背景
254234
If Setup.Get("UiBackgroundColorful") Then
255235
Brush = New LinearGradientBrush With {.EndPoint = New Point(0.1, 1), .StartPoint = New Point(0.9, 0)}

‎Plain Craft Launcher 2/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
5151
' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
5252
' 方法是按如下所示使用“*”
5353

54-
<Assembly: AssemblyVersion("2.10.1.0")>
55-
<Assembly: AssemblyFileVersion("2.10.1.0")>
54+
<Assembly: AssemblyVersion("2.10.2.0")>
55+
<Assembly: AssemblyFileVersion("2.10.2.0")>
5656
<Assembly: NeutralResourcesLanguage("")>

‎Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,16 +2163,17 @@ Retry:
21632163
'迁移文件
21642164
If Directory.Exists(TempMcFolder & "libraries") Then CopyDirectory(TempMcFolder & "libraries", PathMcFolder & "libraries")
21652165
Task.Progress = 0.8
2166+
'创建 Mod 和资源包文件夹
21662167
Dim ModsFolder = New McVersion(VersionFolder).PathIndie & "mods\" '版本隔离信息在此时被决定
2167-
Dim ResourcepacksFolder = New McVersion(VersionFolder).PathIndie & "resourcepacks\"
21682168
If Directory.Exists(ModsTempFolder) Then
21692169
CopyDirectory(ModsTempFolder, ModsFolder)
21702170
ElseIf Modable Then
21712171
Directory.CreateDirectory(ModsFolder)
2172-
Log("[Download] 自动创建 mods 文件夹：" & ModsFolder)
2172+
Log("[Download] 自动创建 Mod 文件夹：" & ModsFolder)
21732173
End If
2174+
Dim ResourcepacksFolder = New McVersion(VersionFolder).PathIndie & "resourcepacks\"
21742175
Directory.CreateDirectory(ResourcepacksFolder)
2175-
Log("[Download] 自动创建 resourcepacks 文件夹：" & ResourcepacksFolder)
2176+
Log("[Download] 自动创建资源包文件夹：" & ResourcepacksFolder)
21762177
End Sub) With {.ProgressWeight = 2, .Block = True})
21772178
'补全文件
21782179
If Request.OptiFineEntry IsNot Nothing OrElse (Request.ForgeVersion IsNot Nothing AndAlso Request.ForgeVersion.BeforeFirst(".") >= 20) OrElse Request.NeoForgeVersion IsNot Nothing OrElse Request.FabricVersion IsNot Nothing OrElse Request.LiteLoaderEntry IsNot Nothing Then

‎Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ Download:
127127
Log("[Page] 主页预设：杂志主页")
128128
Url = "https://pclhomeplazaoss.lingyunawa.top:26994/d/Homepages/Ext1nguisher/Custom.xaml"
129129
GoTo Download
130+
Case 12
131+
Log("[Page] 主页预设：PCL GitHub 仪表盘")
132+
Url = "https://raw.gitcode.com/Deep-Dark-Forest/PCL2-GitHub-Dashboard-Homepage/raw/main/custom.xaml"
133+
GoTo Download
130134
End Select
131135
End Select
132136
RunInUi(Sub() LoadContent(Content))

0 commit comments

Comments
 (0)