diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0b81da..f2c4927 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,6 +9,7 @@ on:
paths:
- 'Plain Craft Launcher 2/**'
- '.github/workflows/**'
+ workflow_dispatch:
jobs:
@@ -29,7 +30,7 @@ jobs:
- name: Set Describe
shell: bash
run: |
- Describe=`git describe --tags`
+ Describe=`git describe --tags --always`
echo "Describe=$Describe" >> $GITHUB_ENV
- name: Setup MSBuild.exe
diff --git a/LICENCE b/LICENCE
index 5825c79..9bd5dbe 100644
--- a/LICENCE
+++ b/LICENCE
@@ -3,7 +3,7 @@
一、承诺与声明。
开发者承诺，在您遵守本指南的情况下，不会追究您的法律责任，但最终裁量权仍由开发者保留。
- 开发者仍保留所有权利（All Rights Reserved），且可能随时修改本指南，本指南并不是永久性保证。
+ 法律上，开发者仍保留所有权利（All Rights Reserved），且可能随时修改本指南，本指南并不是永久性保证。
二、少量使用情形。
@@ -16,9 +16,9 @@
如果您基于该存储库进行衍生创作，或合理使用了本存储库中的较大量内容，您必须：
（一）给出适当的署名，且提供指向本存储库的链接。
（二）不得以任何方式暗示开发者为您或您的使用作担保。
- （三）给出适当的说明，表示这是第三方内容。
+ （三）给出适当的说明，表示这是第三方内容。在 GitHub 上直接进行 Fork 是允许的。
（四）使用本指南文件作为协议，不得附加额外条款。
- （五）不得分发编译后的可执行文件。
+ （五）不得分发编译后的可执行文件。唯一的例外是，你可以在明确禁止再次分发的前提下，在小于 100 人的 QQ 群内分发编译后的可执行文件。
————————————
@@ -27,9 +27,5 @@
因为没有法律专业人士检查，所以这不敢作为正式的法律协议，如果有专业人士愿意帮忙改一改我也很乐意……
这些规则主要是为了阻止恶意的使用和 “山寨版” 的出现，常规、善意的使用都没啥问题的，放心吧！
-如果你只是想参考一下，或者用了一小部分代码：
- 署名就行啦。
-如果你整了个魔改版，或者用了一大堆代码：
- 你不能把编译后的文件发给其他人，但可以私下使用。
-如果你修改了代码，并且打算公开：
- 请仔细参考上面的第三条。
+如果你只是想参考一下，或者用了一小部分代码，署个名就行啦。
+如果你整了个魔改版，或者用了一大堆代码，请仔细参考上面的第三条。
diff --git a/Plain Craft Launcher 2/Controls/MyCard.vb b/Plain Craft Launcher 2/Controls/MyCard.vb
index 11b7669..8ae95ef 100644
--- a/Plain Craft Launcher 2/Controls/MyCard.vb
+++ b/Plain Craft Launcher 2/Controls/MyCard.vb
@@ -98,21 +98,13 @@
'排序
Select Case Type
Case 3
- Stack.Tag = Sort(CType(Stack.Tag, List(Of DlOptiFineListEntry)), Function(Left As DlOptiFineListEntry, Right As DlOptiFineListEntry) As Boolean
- Return VersionSortBoolean(Left.NameDisplay, Right.NameDisplay)
- End Function)
+ Stack.Tag = Sort(CType(Stack.Tag, List(Of DlOptiFineListEntry)), Function(a, b) VersionSortBoolean(a.NameDisplay, b.NameDisplay))
Case 4, 10
- Stack.Tag = Sort(CType(Stack.Tag, List(Of DlLiteLoaderListEntry)), Function(Left As DlLiteLoaderListEntry, Right As DlLiteLoaderListEntry) As Boolean
- Return VersionSortBoolean(Left.Inherit, Right.Inherit)
- End Function)
+ Stack.Tag = Sort(CType(Stack.Tag, List(Of DlLiteLoaderListEntry)), Function(a, b) VersionSortBoolean(a.Inherit, b.Inherit))
Case 6
- Stack.Tag = Sort(CType(Stack.Tag, List(Of DlForgeVersionEntry)), Function(Left As DlForgeVersionEntry, Right As DlForgeVersionEntry) As Boolean
- Return VersionSortBoolean(Left.Version, Right.Version)
- End Function)
+ Stack.Tag = Sort(CType(Stack.Tag, List(Of DlForgeVersionEntry)), Function(a, b) a.Version > b.Version)
Case 8, 9
- Stack.Tag = Sort(CType(Stack.Tag, List(Of CompFile)), Function(Left As CompFile, Right As CompFile) As Boolean
- Return Left.ReleaseDate > Right.ReleaseDate
- End Function)
+ Stack.Tag = Sort(CType(Stack.Tag, List(Of CompFile)), Function(a, b) a.ReleaseDate > b.ReleaseDate)
End Select
'控件转换
Select Case Type
@@ -144,9 +136,8 @@
Case 6
Stack.Children.Add(ForgeDownloadListItem(Data, AddressOf ForgeSave_Click, True))
Case 7
- Stack.Children.Add(McDownloadListItem(Data, Sub(sender, e) '不能使用 AddressOf，这导致了 #535，原因完全不明，疑似是编译器 Bug
- FrmDownloadInstall.MinecraftSelected(sender, e)
- End Sub, False))
+ '不能使用 AddressOf，这导致了 #535，原因完全不明，疑似是编译器 Bug
+ Stack.Children.Add(McDownloadListItem(Data, Sub(sender, e) FrmDownloadInstall.MinecraftSelected(sender, e), False))
Case 8
If CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <>
CType(Stack.Tag, List(Of CompFile)).Count Then
@@ -171,6 +162,8 @@
Stack.Children.Add(CType(Data, HelpEntry).ToListItem)
Case 12
Stack.Children.Add(FabricDownloadListItem(CType(Data, JObject), AddressOf FrmDownloadInstall.Fabric_Selected))
+ Case 13
+ Stack.Children.Add(NeoForgeDownloadListItem(Data, AddressOf NeoForgeSave_Click, True))
Case Else
Log("未知的虚拟化种类：" & Type, LogLevel.Feedback)
End Select
diff --git a/Plain Craft Launcher 2/Controls/MyPageRight.vb b/Plain Craft Launcher 2/Controls/MyPageRight.vb
index 9d1db6e..4fafd60 100644
--- a/Plain Craft Launcher 2/Controls/MyPageRight.vb
+++ b/Plain Craft Launcher 2/Controls/MyPageRight.vb
@@ -74,13 +74,13 @@
'添加结束 Invoke
If FinishedInvoke IsNot Nothing Then
AddHandler RealLoader.PreviewFinish,
- Sub()
- Do While PageState = MyPageRight.PageStates.PageExit OrElse PageState = MyPageRight.PageStates.ContentExit
- Thread.Sleep(10) '不在退出动画时执行 UI 线程操作，避免退出动画被重置
- Loop
- RunInUiWait(Sub() FinishedInvoke(RealLoader))
- Thread.Sleep(20) '由于大量初始化控件会导致掉帧，延迟触发 State 改变事件
- End Sub
+ Sub()
+ Do While PageState = MyPageRight.PageStates.PageExit OrElse PageState = MyPageRight.PageStates.ContentExit
+ Thread.Sleep(10) '不在退出动画时执行 UI 线程操作，避免退出动画被重置
+ Loop
+ RunInUiWait(Sub() FinishedInvoke(RealLoader))
+ Thread.Sleep(20) '由于大量初始化控件会导致掉帧，延迟触发 State 改变事件
+ End Sub
End If
AddHandler RealLoader.OnStateChangedUi, Sub(Loader As LoaderBase, NewState As LoadState, OldState As LoadState) RunInUi(Sub() PageLoaderState(Loader, NewState, OldState))
'隐藏 UI
diff --git a/Plain Craft Launcher 2/FormMain.xaml.vb b/Plain Craft Launcher 2/FormMain.xaml.vb
index 3c7f0ce..30edc9f 100644
--- a/Plain Craft Launcher 2/FormMain.xaml.vb
+++ b/Plain Craft Launcher 2/FormMain.xaml.vb
@@ -10,6 +10,19 @@ Public Class FormMain
Dim FeatureList As New List(Of KeyValuePair(Of Integer, String))
'统计更新日志条目
#If BETA Then
+ If LastVersion < 330 Then 'Release 2.8.2
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
+ FeatureCount += 15
+ BugCount += 22
+ End If
+ If LastVersion < 326 Then 'Release 2.7.4
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复正版登录时弹出脚本错误提示的 Bug"))
+ FeatureCount += 17
+ BugCount += 19
+ End If
If LastVersion < 323 Then 'Release 2.7.3
FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "添加 启动游戏前进行内存优化 设置"))
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化 MC 性能"))
@@ -108,6 +121,25 @@ Public Class FormMain
'3：BUG+ IMP* FEAT-
'2：BUG* IMP-
'1：BUG-
+ If LastVersion < 329 Then 'Snapshot 2.8.2
+ If LastVersion >= 327 Then
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Beta 版 NeoForge 的整合包的 Bug"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复自动安装无法选择部分 OptiFine 的 Bug"))
+ End If
+ FeatureCount += 4
+ BugCount += 8
+ End If
+ If LastVersion < 328 Then 'Snapshot 2.8.1
+ If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法安装 Forge 1.12.2- 的 Bug"))
+ If LastVersion = 327 Then FeatureList.Add(New KeyValuePair(Of Integer, String)(1, "修复无法输入解锁码的 Bug"))
+ If LastVersion = 327 Then BugCount += 1
+ End If
+ If LastVersion < 327 Then 'Snapshot 2.8.0
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(5, "NeoForge 兼容与自动安装"))
+ FeatureList.Add(New KeyValuePair(Of Integer, String)(3, "支持编译、运行 PCL 开源代码"))
+ FeatureCount += 11
+ BugCount += 14
+ End If
If LastVersion < 325 Then 'Snapshot 2.7.4
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "会自动隐藏明显不可用的自动安装选项"))
FeatureList.Add(New KeyValuePair(Of Integer, String)(2, "优化正版登录流程和 MC 性能"))
@@ -1019,11 +1051,12 @@ Install:
DownloadClient = 4
DownloadOptiFine = 5
DownloadForge = 6
- DownloadFabric = 7
- DownloadLiteLoader = 8
- DownloadMod = 10
- DownloadPack = 11
- DownloadResourcePack = 12
+ DownloadNeoForge = 7
+ DownloadFabric = 8
+ DownloadLiteLoader = 9
+ DownloadMod = 11
+ DownloadPack = 12
+ DownloadResourcePack = 13
SetupLaunch = 0
SetupUI = 1
SetupSystem = 2
diff --git a/Plain Craft Launcher 2/Images/Blocks/NeoForge.png b/Plain Craft Launcher 2/Images/Blocks/NeoForge.png
new file mode 100644
index 0000000..7d46d39
Binary files /dev/null and b/Plain Craft Launcher 2/Images/Blocks/NeoForge.png differ
diff --git a/Plain Craft Launcher 2/Modules/Base/ModBase.vb b/Plain Craft Launcher 2/Modules/Base/ModBase.vb
index 57a27cd..30cb7bd 100644
--- a/Plain Craft Launcher 2/Modules/Base/ModBase.vb
+++ b/Plain Craft Launcher 2/Modules/Base/ModBase.vb
@@ -11,12 +11,12 @@ Public Module ModBase
#Region "声明"
'下列版本信息由更新器自动修改
- Public Const VersionBaseName As String = "2.7.4" '不含分支前缀的显示用版本名
- Public Const VersionStandardCode As String = "2.7.4." & VersionBranchCode '标准格式的四段式版本号
+ Public Const VersionBaseName As String = "2.8.2" '不含分支前缀的显示用版本名
+ Public Const VersionStandardCode As String = "2.8.2." & VersionBranchCode '标准格式的四段式版本号
#If BETA Then
- Public Const VersionCode As Integer = 323 'Release
+ Public Const VersionCode As Integer = 330 'Release
#Else
- Public Const VersionCode As Integer = 325 'Snapshot
+ Public Const VersionCode As Integer = 329 'Snapshot
#End If
'自动生成的版本信息
Public Const VersionDisplayName As String = VersionBranchName & " " & VersionBaseName
@@ -86,7 +86,7 @@ Public Module ModBase
'''
''' 系统盘盘符，以 \ 结尾。例如 “C:\”。
'''
- Public OsDrive As String = Environment.GetLogicalDrives().First.ToUpper.First & ":\"
+ Public OsDrive As String = Environment.GetLogicalDrives().Where(Function(p) Directory.Exists(p)).First.ToUpper.First & ":\" '#3799
'''
''' 程序的缓存文件夹路径，以 \ 结尾。
'''
@@ -1257,12 +1257,19 @@ Re:
Dim DeletedCount As Integer = 0
Dim Temp As String()
Temp = Directory.GetFiles(Path)
- For Each str As String In Temp
+ For Each FilePath As String In Temp
+ Dim RetriedFile As Boolean = False
+RetryFile:
Try
- File.Delete(str)
+ File.Delete(FilePath)
DeletedCount += 1
Catch ex As Exception
- If IgnoreIssue Then
+ If Not RetriedFile Then
+ RetriedFile = True
+ Log(ex, $"删除文件失败，将在 0.3s 后重试（{FilePath}）")
+ Thread.Sleep(300)
+ GoTo RetryFile
+ ElseIf IgnoreIssue Then
Log(ex, "删除单个文件可忽略地失败")
Else
Throw
@@ -1273,10 +1280,17 @@ Re:
For Each str As String In Temp
DeleteDirectory(str, IgnoreIssue)
Next
+ Dim RetriedDir As Boolean = False
+RetryDir:
Try
Directory.Delete(Path, True)
Catch ex As Exception
- If IgnoreIssue Then
+ If Not RetriedDir Then
+ RetriedDir = True
+ Log(ex, $"删除文件夹失败，将在 0.3s 后重试（{Path}）")
+ Thread.Sleep(300)
+ GoTo RetryDir
+ ElseIf IgnoreIssue Then
Log(ex, "删除单个文件夹可忽略地失败")
Else
Throw
@@ -1652,7 +1666,10 @@ Re:
''' 为字符串进行 XML 转义。
'''
Public Function EscapeXML(Str As String) As String
- Return Str.Replace("&", "&").Replace("<", "<").Replace(">", ">").Replace("'", "'").Replace("""", """).Replace(vbCrLf, "
")
+ If Str.StartsWithF("{") Then Str = "{}" & Str '#4187
+ Return Str.
+ Replace("&", "&").Replace("<", "<").Replace(">", ">").Replace("'", "'").
+ Replace("""", """).Replace(vbCrLf, "
")
End Function
'正则
@@ -2065,15 +2082,16 @@ NextElement:
''' 在新的工作线程中执行代码。
'''
Public Function RunInNewThread(Action As Action, Name As String, Optional Priority As ThreadPriority = ThreadPriority.Normal) As Thread
- Dim th As New Thread(Sub()
- Try
- Action()
- Catch ex As ThreadInterruptedException
- Log(Name & "：线程已中止")
- Catch ex As Exception
- Log(ex, Name & "：线程执行失败", LogLevel.Feedback)
- End Try
- End Sub) With {.Name = Name, .Priority = Priority}
+ Dim th As New Thread(
+ Sub()
+ Try
+ Action()
+ Catch ex As ThreadInterruptedException
+ Log(Name & "：线程已中止")
+ Catch ex As Exception
+ Log(ex, Name & "：线程执行失败", LogLevel.Feedback)
+ End Try
+ End Sub) With {.Name = Name, .Priority = Priority}
th.Start()
Return th
End Function
@@ -2186,7 +2204,9 @@ NextElement:
'''
Public Sub OpenWebsite(Url As String)
Try
- If Not Url.StartsWithF("http", True) Then Throw New Exception(Url & " 不是一个有效的网址，它必须以 http 开头！")
+ If Not Url.StartsWithF("http", True) AndAlso Not Url.StartsWithF("minecraft://", True) Then
+ Throw New Exception(Url & " 不是一个有效的网址，它必须以 http 开头！")
+ End If
Log("[System] 正在打开网页：" & Url)
Process.Start(Url)
Catch ex As Exception
@@ -2211,25 +2231,27 @@ NextElement:
''' 设置剪贴板。将在另一线程运行，且不会抛出异常。
'''
Public Sub ClipboardSet(Text As String, Optional ShowSuccessHint As Boolean = True)
- RunInThread(Sub()
- Dim RetryCount As Integer = 0
+ RunInThread(
+ Sub()
+ Dim RetryCount As Integer = 0
Retry:
- Try
- RunInUi(Sub()
- My.Computer.Clipboard.Clear()
- My.Computer.Clipboard.SetText(Text)
- End Sub)
- Catch ex As Exception
- RetryCount += 1
- If RetryCount <= 5 Then
- Thread.Sleep(20)
- GoTo Retry
- Else
- Log(ex, "可能由于剪贴板被其他程序占用，文本复制失败", LogLevel.Hint)
- End If
- End Try
- If ShowSuccessHint Then Hint("已成功复制！", HintType.Finish)
- End Sub)
+ Try
+ RunInUi(
+ Sub()
+ My.Computer.Clipboard.Clear()
+ My.Computer.Clipboard.SetText(Text)
+ End Sub)
+ Catch ex As Exception
+ RetryCount += 1
+ If RetryCount <= 5 Then
+ Thread.Sleep(20)
+ GoTo Retry
+ Else
+ Log(ex, "可能由于剪贴板被其他程序占用，文本复制失败", LogLevel.Hint)
+ End If
+ End Try
+ If ShowSuccessHint Then Hint("已成功复制！", HintType.Finish)
+ End Sub)
End Sub
'''
@@ -2448,39 +2470,40 @@ Retry:
Private LogList As New StringBuilder
Private LogWritter As StreamWriter
Public Sub LogStart()
- RunInNewThread(Sub()
- Dim IsInitSuccess As Boolean = True
- Try
- 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")
- End If
- Next
- File.Create(Path & "PCL\Log1.txt").Dispose()
- Catch ex As IOException
- IsInitSuccess = False
- Hint("可能同时开启了多个 PCL，程序可能会出现未知问题！", HintType.Critical)
- Log(ex, "日志初始化失败（疑似文件占用问题）")
- Catch ex As Exception
- IsInitSuccess = False
- Log(ex, "日志初始化失败", LogLevel.Hint)
- End Try
- Try
- LogWritter = New StreamWriter(Path & "PCL\Log1.txt", True) With {.AutoFlush = True}
- Catch ex As Exception
- LogWritter = Nothing
- Log(ex, "日志写入失败", LogLevel.Hint)
- End Try
- While True
- If IsInitSuccess Then
- LogFlush()
- Else
- LogList = New StringBuilder '清空 LogList 避免内存爆炸
- End If
- Thread.Sleep(50)
- End While
- End Sub, "Log Writer", ThreadPriority.Lowest)
+ RunInNewThread(
+ Sub()
+ Dim IsInitSuccess As Boolean = True
+ Try
+ 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")
+ End If
+ Next
+ File.Create(Path & "PCL\Log1.txt").Dispose()
+ Catch ex As IOException
+ IsInitSuccess = False
+ Hint("可能同时开启了多个 PCL，程序可能会出现未知问题！", HintType.Critical)
+ Log(ex, "日志初始化失败（疑似文件占用问题）")
+ Catch ex As Exception
+ IsInitSuccess = False
+ Log(ex, "日志初始化失败", LogLevel.Hint)
+ End Try
+ Try
+ LogWritter = New StreamWriter(Path & "PCL\Log1.txt", True) With {.AutoFlush = True}
+ Catch ex As Exception
+ LogWritter = Nothing
+ Log(ex, "日志写入失败", LogLevel.Hint)
+ End Try
+ While True
+ If IsInitSuccess Then
+ LogFlush()
+ Else
+ LogList = New StringBuilder '清空 LogList 避免内存爆炸
+ End If
+ Thread.Sleep(50)
+ End While
+ End Sub, "Log Writer", ThreadPriority.Lowest)
End Sub
Private ReadOnly LogFlushLock As New Object '防止外部调用 LogFlush 时同时输出多次日志
Public Sub LogFlush()
diff --git a/Plain Craft Launcher 2/Modules/Base/ModNet.vb b/Plain Craft Launcher 2/Modules/Base/ModNet.vb
index de97191..8929ea2 100644
--- a/Plain Craft Launcher 2/Modules/Base/ModNet.vb
+++ b/Plain Craft Launcher 2/Modules/Base/ModNet.vb
@@ -341,14 +341,15 @@ Retry:
Dim RequestEx As Exception = Nothing
Dim FailCount As Integer = 0
For i = 1 To RequestCount
- Dim th As New Thread(Sub()
- Try
- RequestResult = NetRequestOnce(Url, Method, Data, ContentType, 30000, Headers)
- Catch ex As Exception
- FailCount += 1
- RequestEx = ex
- End Try
- End Sub)
+ Dim th As New Thread(
+ Sub()
+ Try
+ RequestResult = NetRequestOnce(Url, Method, Data, ContentType, 30000, Headers)
+ Catch ex As Exception
+ FailCount += 1
+ RequestEx = ex
+ End Try
+ End Sub)
th.Start()
Threads.Add(th)
Thread.Sleep(i * 250)
@@ -382,7 +383,7 @@ RequestFinished:
Dim Resp As WebResponse = Nothing
Dim Req As HttpWebRequest
Try
- Req = WebRequest.Create(New Uri(Url))
+ Req = WebRequest.Create(Url)
Req.Method = Method
Dim SendData As Byte()
If TypeOf Data Is Byte() Then
@@ -1859,15 +1860,10 @@ Retry:
Try
While True
Thread.Sleep(20)
- '若已完成，则清空
- If Id = 0 AndAlso FileRemain = 0 AndAlso Files.Any() Then
- SyncLock LockFiles
- Files.Clear()
- End SyncLock
- End If
'获取文件列表
Dim AllFiles As List(Of NetFile)
SyncLock LockFiles
+ If Id = 0 AndAlso FileRemain = 0 AndAlso Files.Any() Then Files.Clear() '若已完成，则清空
AllFiles = Files.Values.ToList()
End SyncLock
Dim WaitingFiles As New List(Of NetFile)
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb
index c0f7125..113ae8b 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModComp.vb
@@ -372,12 +372,12 @@
ModLoaders = New List(Of CompModLoaderType)
For Each Category In Data("categories").Select(Function(t) t.ToString)
Select Case Category
- '加载器
+ '加载器
Case "forge" : ModLoaders.Add(CompModLoaderType.Forge)
Case "fabric" : ModLoaders.Add(CompModLoaderType.Fabric)
Case "quilt" : ModLoaders.Add(CompModLoaderType.Quilt)
Case "neoforge" : ModLoaders.Add(CompModLoaderType.NeoForge)
- 'Mod
+ 'Mod
Case "worldgen" : Tags.Add("世界元素")
Case "technology" : Tags.Add("科技")
Case "food" : Tags.Add("食物/烹饪")
@@ -393,7 +393,7 @@
Case "social" : Tags.Add("服务器")
Case "utility" : Tags.Add("改良")
Case "library" : Tags.Add("支持库")
- '整合包
+ '整合包
Case "multiplayer" : Tags.Add("多人")
Case "optimization" : Tags.Add("性能优化")
Case "challenging" : Tags.Add("硬核")
@@ -404,7 +404,7 @@
Case "adventure" : Tags.Add("冒险")
Case "kitchen-sink" : Tags.Add("烹饪")
Case "lightweight" : Tags.Add("轻量")
- '资源包
+ '资源包
Case "8x-" : Tags.Add("8x-")
Case "16x" : Tags.Add("16x")
Case "32x" : Tags.Add("32x")
@@ -676,19 +676,19 @@ NoSubtitle:
If Id = Project.Id Then Return True '相同实例
'提取字符串中的字母和数字
Dim GetRaw =
- Function(Data As String) As String
- Dim Result As New StringBuilder()
- For Each r As Char In Data.Where(Function(c) Char.IsLetterOrDigit(c))
- Result.Append(r)
- Next
- Return Result.ToString.ToLower
- End Function
+ Function(Data As String) As String
+ Dim Result As New StringBuilder()
+ For Each r As Char In Data.Where(Function(c) Char.IsLetterOrDigit(c))
+ Result.Append(r)
+ Next
+ Return Result.ToString.ToLower
+ End Function
'来自不同的网站
If FromCurseForge = Project.FromCurseForge Then Return False
'Mod 加载器一致
- If ModLoaders.Count <> Project.ModLoaders.Count OrElse ModLoaders.Except(Project.ModLoaders).Count > 0 Then Return False
+ If ModLoaders.Count <> Project.ModLoaders.Count OrElse ModLoaders.Except(Project.ModLoaders).Any() Then Return False
'MC 版本一致
- If GameVersions.Count <> Project.GameVersions.Count OrElse GameVersions.Except(Project.GameVersions).Count > 0 Then Return False
+ If GameVersions.Count <> Project.GameVersions.Count OrElse GameVersions.Except(Project.GameVersions).Any() Then Return False
'MCMOD 翻译名 / 原名 / 描述文本 / Slug 的英文部分相同
If TranslatedName = Project.TranslatedName OrElse
RawName = Project.RawName OrElse Description = Project.Description OrElse
@@ -1367,6 +1367,7 @@ Retry:
Dim RawLoaders As List(Of String) = Data("loaders").Select(Function(v) v.ToString).ToList
ModLoaders = New List(Of CompModLoaderType)
If RawLoaders.Contains("forge") Then ModLoaders.Add(CompModLoaderType.Forge)
+ If RawLoaders.Contains("neoforge") Then ModLoaders.Add(CompModLoaderType.NeoForge)
If RawLoaders.Contains("fabric") Then ModLoaders.Add(CompModLoaderType.Fabric)
If RawLoaders.Contains("quilt") Then ModLoaders.Add(CompModLoaderType.Quilt)
#End Region
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb
index ef52547..3f9aab0 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModCrash.vb
@@ -697,8 +697,8 @@ NextStack:
"forge", "setup", "block", "model", "mixin", "event", "unimi", "netty", "world",
"gitlab", "common", "server", "config", "loader", "launch", "entity", "assist", "client", "plugin", "modapi", "mojang", "shader", "events", "github", "recipe", "render", "packet", "events",
"preinit", "preload", "machine", "reflect", "channel", "general", "handler", "content", "systems", "modules", "service",
- "fastutil", "optifine", "internal", "platform", "override", "fabricmc",
- "injection", "listeners", "scheduler", "minecraft", "transformer", "transformers", "universal", "multipart", "minecraftforge", "blockentity", "spongepowered", "electronwill"
+ "fastutil", "optifine", "internal", "platform", "override", "fabricmc", "neoforge",
+ "injection", "listeners", "scheduler", "minecraft", "transformer", "transformers", "neoforged", "universal", "multipart", "minecraftforge", "blockentity", "spongepowered", "electronwill"
}.Contains(Word.ToLower) Then Continue For
PossibleWords.Add(Word.Trim)
Next
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb
index 10cfdbb..2398e57 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModDownload.vb
@@ -8,9 +8,13 @@
'''
Public Function DlClientJarGet(Version As McVersion, ReturnNothingOnFileUseable As Boolean) As NetFile
'获取底层继承版本
- Do While Not String.IsNullOrEmpty(Version.InheritVersion)
- Version = New McVersion(Version.InheritVersion)
- Loop
+ Try
+ Do While Not String.IsNullOrEmpty(Version.InheritVersion)
+ Version = New McVersion(Version.InheritVersion)
+ Loop
+ Catch ex As Exception
+ Log(ex, "获取底层继承版本失败")
+ End Try
'检查 Json 是否标准
If Version.JsonObject("downloads") Is Nothing OrElse Version.JsonObject("downloads")("client") Is Nothing OrElse Version.JsonObject("downloads")("client")("url") Is Nothing Then
Throw New Exception("底层版本 " & Version.Name & " 中无 jar 文件下载信息")
@@ -220,7 +224,7 @@
End If
Setup.Set("ToolUpdateSnapshotLast", If(Version, "Nothing"))
Catch ex As Exception
- Throw New Exception("版本列表解析失败", ex)
+ Throw New Exception("Minecraft 官方源版本列表解析失败", ex)
End Try
End Sub
'''
@@ -237,7 +241,7 @@
'返回
Loader.Output = New DlClientListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Json}
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Json.ToString & "）", ex)
+ Throw New Exception("Minecraft BMCLAPI 版本列表解析失败（" & Json.ToString & "）", ex)
End Try
End Sub
@@ -288,6 +292,7 @@
'''
Public Value As List(Of DlOptiFineListEntry)
End Structure
+
Public Class DlOptiFineListEntry
'''
''' 显示名称，已去除 HD_U 字样，如“1.12.2 C8”。
@@ -359,29 +364,33 @@
Private Sub DlOptiFineListOfficialMain(Loader As LoaderTask(Of Integer, DlOptiFineListResult))
Dim Result As String = NetGetCodeByClient("https://optifine.net/downloads", Encoding.Default)
If Result.Length < 200 Then Throw New Exception("获取到的版本列表长度不足（" & Result & "）")
- '获取所有版本信息
- Dim Forge As List(Of String) = RegexSearch(Result, "(?<=colForge'>)[^<]*")
- Dim ReleaseTime As List(Of String) = RegexSearch(Result, "(?<=colDate'>)[^<]+")
- Dim Name As List(Of String) = RegexSearch(Result, "(?<=OptiFine_)[0-9A-Za-z_.]+(?=.jar"")")
- If Not ReleaseTime.Count = Name.Count Then Throw New Exception("版本与发布时间数据无法对应")
- If Not Forge.Count = Name.Count Then Throw New Exception("版本与 Forge 兼容数据无法对应")
- If ReleaseTime.Count < 10 Then Throw New Exception("获取到的版本数量不足（" & Result & "）")
- '转化为列表输出
- Dim Versions As New List(Of DlOptiFineListEntry)
- For i = 0 To ReleaseTime.Count - 1
- Name(i) = Name(i).Replace("_", " ")
- Dim Entry As New DlOptiFineListEntry With {
- .NameDisplay = Name(i).Replace("HD U ", "").Replace(".0 ", " "),
- .ReleaseTime = Join({ReleaseTime(i).Split(".")(2), ReleaseTime(i).Split(".")(1), ReleaseTime(i).Split(".")(0)}, "/"),
- .IsPreview = Name(i).ContainsF("pre", True),
- .Inherit = Name(i).ToString.Split(" ")(0),
- .NameFile = If(Name(i).ContainsF("pre", True), "preview_", "") & "OptiFine_" & Name(i).Replace(" ", "_") & ".jar",
- .RequiredForgeVersion = Forge(i).Replace("Forge ", "").Replace("#", "")}
- If Entry.RequiredForgeVersion.Contains("N/A") Then Entry.RequiredForgeVersion = Nothing
- Entry.NameVersion = Entry.Inherit & "-OptiFine_" & Name(i).ToString.Replace(" ", "_").Replace(Entry.Inherit & "_", "")
- Versions.Add(Entry)
- Next
- Loader.Output = New DlOptiFineListResult With {.IsOfficial = True, .SourceName = "OptiFine 官方源", .Value = Versions}
+ Try
+ '获取所有版本信息
+ Dim Forge As List(Of String) = RegexSearch(Result, "(?<=colForge'>)[^<]*")
+ Dim ReleaseTime As List(Of String) = RegexSearch(Result, "(?<=colDate'>)[^<]+")
+ Dim Name As List(Of String) = RegexSearch(Result, "(?<=OptiFine_)[0-9A-Za-z_.]+(?=.jar"")")
+ If Not ReleaseTime.Count = Name.Count Then Throw New Exception("版本与发布时间数据无法对应")
+ If Not Forge.Count = Name.Count Then Throw New Exception("版本与 Forge 兼容数据无法对应")
+ If ReleaseTime.Count < 10 Then Throw New Exception("获取到的版本数量不足（" & Result & "）")
+ '转化为列表输出
+ Dim Versions As New List(Of DlOptiFineListEntry)
+ For i = 0 To ReleaseTime.Count - 1
+ Name(i) = Name(i).Replace("_", " ")
+ Dim Entry As New DlOptiFineListEntry With {
+ .NameDisplay = Name(i).Replace("HD U ", "").Replace(".0 ", " "),
+ .ReleaseTime = Join({ReleaseTime(i).Split(".")(2), ReleaseTime(i).Split(".")(1), ReleaseTime(i).Split(".")(0)}, "/"),
+ .IsPreview = Name(i).ContainsF("pre", True),
+ .Inherit = Name(i).ToString.Split(" ")(0),
+ .NameFile = If(Name(i).ContainsF("pre", True), "preview_", "") & "OptiFine_" & Name(i).Replace(" ", "_") & ".jar",
+ .RequiredForgeVersion = Forge(i).Replace("Forge ", "").Replace("#", "")}
+ If Entry.RequiredForgeVersion.Contains("N/A") Then Entry.RequiredForgeVersion = Nothing
+ Entry.NameVersion = Entry.Inherit & "-OptiFine_" & Name(i).ToString.Replace(" ", "_").Replace(Entry.Inherit & "_", "")
+ Versions.Add(Entry)
+ Next
+ Loader.Output = New DlOptiFineListResult With {.IsOfficial = True, .SourceName = "OptiFine 官方源", .Value = Versions}
+ Catch ex As Exception
+ Throw New Exception("OptiFine 官方源版本列表解析失败（" & Result & "）", ex)
+ End Try
End Sub
'''
@@ -407,7 +416,7 @@
Next
Loader.Output = New DlOptiFineListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Versions}
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Json.ToString & "）", ex)
+ Throw New Exception("OptiFine BMCLAPI 版本列表解析失败（" & Json.ToString & "）", ex)
End Try
End Sub
@@ -485,15 +494,61 @@
#Region "DlForgeVersion | Forge 版本列表"
- Public Class DlForgeVersionEntry
+ Public MustInherit Class DlForgelikeEntry
+ Public IsNeoForge As Boolean
'''
- ''' 完整的版本名，如 “14.22.1.2478”。
+ ''' 加载器名称。Forge 或 NeoForge。
'''
- Public Version As String
+ Public ReadOnly Property LoaderName As String
+ Get
+ Return If(IsNeoForge, "NeoForge", "Forge")
+ End Get
+ End Property
+ '''
+ ''' 文件扩展名。不以小数点开头。
+ '''
+ Public ReadOnly Property FileExtension As String
+ Get
+ If IsNeoForge Then
+ Return "jar"
+ Else
+ Return If(CType(Me, DlForgeVersionEntry).Category = "installer", "jar", "zip")
+ End If
+ End Get
+ End Property
+ '''
+ ''' Forge：MC 版本是否小于 1.13。
+ ''' NeoForge：MC 版本是否为 1.20.1。
+ '''
+ Public ReadOnly Property IsLegacy As Boolean
+ Get
+ '虽然很抽象，但确实可以这样判断
+ 'Forge：1.13+ 的版本号首位都大于 20
+ 'NeoForge：1.20.1 的版本号首位人为规定为 19 开头
+ Return Version.Major < 20
+ End Get
+ End Property
+ '''
+ ''' 标准化后的版本号，仅可用于比较与排序。
+ ''' 格式：Major.Minor.Build.Revision
+ ''' Forge：如 “50.1.9.0”（最后一位固定为 0）、“14.22.1.2478”（Legacy）。
+ ''' NeoForge：如 “20.4.30.0”（最后一位固定为 0）、“19.47.1.99”（Legacy：第一位固定为 19）。
+ '''
+ Public Version As Version
+ '''
+ ''' 可对玩家显示的非格式化版本名。
+ ''' Forge：如 “50.1.9”、“14.22.1.2478”（Legacy）。
+ ''' NeoForge：如 “20.4.30-beta”、“47.1.99”（Legacy）。
+ '''
+ Public VersionName As String
'''
''' 对应的 Minecraft 版本，如“1.12.2”。
'''
Public Inherit As String
+ End Class
+
+ Public Class DlForgeVersionEntry
+ Inherits DlForgelikeEntry
'''
''' 发布时间，格式为“yyyy/MM/dd HH:mm”。
'''
@@ -511,58 +566,21 @@
'''
Public Category As String
'''
- ''' 版本分支。若无分支则为 Nothing。
- '''
- Public Branch As String = Nothing
- '''
- ''' 是否为新版 Forge。（即为 Minecraft 1.13+）
- '''
- Public ReadOnly Property IsNewType As Boolean
- Get
- Return Version.Split(".")(0) >= 20
- End Get
- End Property
- '''
- ''' 构建数。
- '''
- Public ReadOnly Property Build As Integer
- Get
- Dim Version = Me.Version.Split(".")
- If Version(0) < 15 Then
- Return Version(Version.Count - 1)
- Else
- Return Version(Version.Count - 1) + 10000
- End If
- End Get
- End Property
- '''
''' 用于下载的文件版本名。可能在 Version 的基础上添加了分支。
'''
- Public ReadOnly Property FileVersion As String
- Get
- Return Version & If(Branch Is Nothing, ""， "-" & Branch)
- End Get
- End Property
- '''
- ''' 即将下载的文件全名。
- '''
- Public ReadOnly Property FileName As String
- Get
- Return "forge-" & Inherit & "-" & FileVersion & "-" & Category & "." & FileSuffix
- End Get
- End Property
- '''
- ''' 文件扩展名。
- '''
- Public ReadOnly Property FileSuffix As String
- Get
- If Category = "installer" Then
- Return "jar"
- Else
- Return "zip"
- End If
- End Get
- End Property
+ Public FileVersion As String
+
+ Public Sub New(Version As String, Branch As String, Inherit As String)
+ '司马版本的特殊处理
+ If Version = "11.15.1.2318" OrElse Version = "11.15.1.1902" OrElse Version = "11.15.1.1890" Then Branch = "1.8.9"
+ If Branch Is Nothing AndAlso Inherit = "1.7.10" AndAlso Version.Split(".")(3) >= 1300 Then Branch = "1.7.10"
+ '为 DlForgelikeEntry 提供所有信息
+ IsNeoForge = False
+ VersionName = Version
+ Me.Version = New Version(Version)
+ Me.Inherit = Inherit
+ FileVersion = Version & If(Branch Is Nothing, ""， "-" & Branch)
+ End Sub
End Class
'''
@@ -596,7 +614,9 @@
Public Sub DlForgeVersionOfficialMain(Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)))
Dim Result As String
Try
- Result = NetGetCodeByDownload("https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_" & Loader.Input & ".html", UseBrowserUserAgent:=True)
+ Result = NetGetCodeByDownload("https://files.minecraftforge.net/maven/net/minecraftforge/forge/index_" &
+ Loader.Input.Replace("-", "_") & '兼容 Forge 1.7.10-pre4，#4057
+ ".html", UseBrowserUserAgent:=True)
Catch ex As Exception
If GetExceptionSummary(ex).Contains("(404)") Then
Throw New Exception("没有可用版本")
@@ -620,8 +640,6 @@
'分支获取
Dim Branch As String = RegexSeek(VersionCode, $"(?<=-{Name}-)[^-""]+(?=-[a-z]+.[a-z]{{3}})")
If String.IsNullOrWhiteSpace(Branch) Then Branch = Nothing
- If Name = "11.15.1.2318" OrElse Name = "11.15.1.1902" OrElse Name = "11.15.1.1890" Then Branch = "1.8.9"
- If Branch Is Nothing AndAlso Inherit = "1.7.10" AndAlso Name.Split(".")(3) >= 1300 Then Branch = "1.7.10"
'发布时间获取
Dim ReleaseTimeOriginal = RegexSeek(VersionCode, "(?<=""download-time"" title="")[^""]+")
Dim ReleaseTimeSplit = ReleaseTimeOriginal.Split(" -:".ToCharArray) '原格式："2021-02-15 03:24:02"
@@ -651,13 +669,13 @@
Continue For
End If
'添加进列表
- Versions.Add(New DlForgeVersionEntry With {.Category = Category, .Version = Name, .IsRecommended = IsRecommended, .Hash = MD5.Trim(vbCr, vbLf), .Inherit = Inherit, .ReleaseTime = ReleaseTime, .Branch = Branch})
+ Versions.Add(New DlForgeVersionEntry(Name, Branch, Inherit) With {.Category = Category, .IsRecommended = IsRecommended, .Hash = MD5.Trim(vbCr, vbLf), .ReleaseTime = ReleaseTime})
Catch ex As Exception
- Throw New Exception("版本信息提取失败（" & VersionCode & "）", ex)
+ Throw New Exception("Forge 官方源版本信息提取失败（" & VersionCode & "）", ex)
End Try
Next
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Result & "）", ex)
+ Throw New Exception("Forge 官方源版本列表解析失败（" & Result & "）", ex)
End Try
If Not Versions.Any() Then Throw New Exception("没有可用版本")
Loader.Output = Versions
@@ -667,7 +685,9 @@
''' Forge 版本列表，BMCLAPI。
'''
Public Sub DlForgeVersionBmclapiMain(Loader As LoaderTask(Of String, List(Of DlForgeVersionEntry)))
- Dim Json As JArray = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" & Loader.Input, IsJson:=True)
+ Dim Json As JArray = NetGetCodeByRequestRetry("https://bmclapi2.bangbang93.com/forge/minecraft/" &
+ Loader.Input.Replace("-", "_"), '兼容 Forge 1.7.10-pre4，#4057
+ IsJson:=True)
Dim Versions As New List(Of DlForgeVersionEntry)
Try
Dim Recommended As String = McDownloadForgeRecommendedGet(Loader.Input)
@@ -700,20 +720,17 @@
End Select
Next
'获取 Entry
- Dim Inherit As String = Loader.Input
Dim Branch As String = Token("branch")
Dim Name As String = Token("version")
- If Name = "11.15.1.2318" OrElse Name = "11.15.1.1902" OrElse Name = "11.15.1.1890" Then Branch = "1.8.9"
- If Branch Is Nothing AndAlso Inherit = "1.7.10" AndAlso Name.Split(".")(3) >= 1300 Then Branch = "1.7.10"
'基础信息获取
- Dim Entry = New DlForgeVersionEntry With {.Hash = Hash, .Category = Category, .Version = Name, .Branch = Branch, .Inherit = Inherit, .IsRecommended = Recommended = Name}
+ Dim Entry = New DlForgeVersionEntry(Name, Branch, Loader.Input) With {.Hash = Hash, .Category = Category, .IsRecommended = Recommended = Name}
Dim TimeSplit = Token("modified").ToString.Split("-"c, "T"c, ":"c, "."c, " "c, "/"c)
Entry.ReleaseTime = Token("modified").ToObject(Of Date).ToLocalTime.ToString("yyyy'/'MM'/'dd HH':'mm")
'添加项
Versions.Add(Entry)
Next
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Json.ToString & "）", ex)
+ Throw New Exception("Forge BMCLAPI 版本列表解析失败（" & Json.ToString & "）", ex)
End Try
If Not Versions.Any() Then Throw New Exception("没有可用版本")
Loader.Output = Versions
@@ -721,6 +738,132 @@
#End Region
+#Region "DlNeoForgeList | NeoForge 版本列表"
+
+ Public Structure DlNeoForgeListResult
+ '''
+ ''' 数据来源名称，如“Official”，“BMCLAPI”。
+ '''
+ Public SourceName As String
+ '''
+ ''' 是否为官方的实时数据。
+ '''
+ Public IsOfficial As Boolean
+ '''
+ ''' 所有版本的列表。已经按从新到老排序。
+ '''
+ Public Value As List(Of DlNeoForgeListEntry)
+ End Structure
+
+ Public Class DlNeoForgeListEntry
+ Inherits DlForgelikeEntry
+ '''
+ ''' 是否是 Beta 版。
+ '''
+ Public IsBeta As Boolean
+ '''
+ ''' API 使用的原始版本字符串，如 “20.4.30-beta”、“1.20.1-47.1.99”（Legacy）。
+ '''
+ Public ApiName As String
+ '''
+ ''' 文件在官网的基础地址，不包含后缀。
+ '''
+ Public ReadOnly Property UrlBase As String
+ Get
+ Dim PackageName As String = If(IsLegacy, "forge", "neoforge")
+ Return $"https://maven.neoforged.net/releases/net/neoforged/{PackageName}/{ApiName}/{PackageName}-{ApiName}"
+ End Get
+ End Property
+
+ Public Sub New(ApiName As String)
+ IsNeoForge = True
+ Me.ApiName = ApiName
+ IsBeta = ApiName.Contains("beta")
+ If ApiName.Contains("1.20.1") Then '1.20.1-47.1.99
+ VersionName = ApiName.Replace("1.20.1-", "")
+ Version = New Version("19." & VersionName)
+ Inherit = "1.20.1"
+ Else '20.4.30-beta
+ VersionName = ApiName
+ Version = New Version(ApiName.Before("-"))
+ Inherit = $"1.{Version.Major}" & If(Version.Minor = 0, "", "." & Version.Minor)
+ End If
+ End Sub
+ End Class
+
+ '''
+ ''' NeoForge 版本列表，主加载器。
+ '''
+ Public DlNeoForgeListLoader As New LoaderTask(Of Integer, DlNeoForgeListResult)("DlNeoForgeList Main", AddressOf DlNeoForgeListMain)
+ Private Sub DlNeoForgeListMain(Loader As LoaderTask(Of Integer, DlNeoForgeListResult))
+ Select Case Setup.Get("ToolDownloadVersion")
+ Case 0
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 30),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 60)
+ }, Loader.IsForceRestarting)
+ Case 1
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 5),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 35)
+ }, Loader.IsForceRestarting)
+ Case Else
+ DlSourceLoader(Loader, New List(Of KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)) From {
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListOfficialLoader, 60),
+ New KeyValuePair(Of LoaderTask(Of Integer, DlNeoForgeListResult), Integer)(DlNeoForgeListBmclapiLoader, 60)
+ }, Loader.IsForceRestarting)
+ End Select
+ End Sub
+
+ '''
+ ''' NeoForge 版本列表，官方源。
+ '''
+ Public DlNeoForgeListOfficialLoader As New LoaderTask(Of Integer, DlNeoForgeListResult)("DlNeoForgeList Official", AddressOf DlNeoForgeListOfficialMain)
+ Private Sub DlNeoForgeListOfficialMain(Loader As LoaderTask(Of Integer, DlNeoForgeListResult))
+ '获取版本列表 JSON
+ Dim ResultLatest As String = NetGetCodeByDownload("https://maven.neoforged.net/api/maven/versions/releases/net/neoforged/neoforge", UseBrowserUserAgent:=True, IsJson:=True)
+ Dim ResultLegacy As String = NetGetCodeByDownload("https://maven.neoforged.net/api/maven/versions/releases/net/neoforged/forge", UseBrowserUserAgent:=True, IsJson:=True)
+ If ResultLatest.Length < 100 OrElse ResultLegacy.Length < 100 Then Throw New Exception("获取到的版本列表长度不足（" & ResultLatest & "）")
+ '解析
+ Try
+ Loader.Output = New DlNeoForgeListResult With {.IsOfficial = True, .SourceName = "NeoForge 官方源",
+ .Value = GetNeoForgeEntries(ResultLatest, ResultLegacy)}
+ Catch ex As Exception
+ Throw New Exception("NeoForge 官方源版本列表解析失败（" & ResultLatest & vbCrLf & vbCrLf & ResultLegacy & "）", ex)
+ End Try
+ End Sub
+
+ '''
+ ''' NeoForge 版本列表，BMCLAPI。
+ '''
+ Public DlNeoForgeListBmclapiLoader As New LoaderTask(Of Integer, DlNeoForgeListResult)("DlNeoForgeList Bmclapi", AddressOf DlNeoForgeListOfficialMain)
+ Public Sub DlNeoForgeVersionBmclapiMain(Loader As LoaderTask(Of Integer, DlNeoForgeListResult))
+ '获取版本列表 JSON
+ Dim ResultLatest As String = NetGetCodeByDownload("https://bmclapi2.bangbang93.com/neoforge/meta/api/maven/details/releases/net/neoforged/neoforge", UseBrowserUserAgent:=True, IsJson:=True)
+ Dim ResultLegacy As String = NetGetCodeByDownload("https://bmclapi2.bangbang93.com/neoforge/meta/api/maven/details/releases/net/neoforged/forge", UseBrowserUserAgent:=True, IsJson:=True)
+ If ResultLatest.Length < 100 OrElse ResultLegacy.Length < 100 Then Throw New Exception("获取到的版本列表长度不足（" & ResultLatest & "）")
+ '解析
+ Try
+ Loader.Output = New DlNeoForgeListResult With {.IsOfficial = True, .SourceName = "BMCLAPI",
+ .Value = GetNeoForgeEntries(ResultLatest, ResultLegacy)}
+ Catch ex As Exception
+ Throw New Exception("NeoForge BMCLAPI 版本列表解析失败（" & ResultLatest & vbCrLf & vbCrLf & ResultLegacy & "）", ex)
+ End Try
+ End Sub
+
+ Private Function GetNeoForgeEntries(LatestJson As String, LatestLegacyJson As String) As List(Of DlNeoForgeListEntry)
+ Dim VersionNames = RegexSearch(LatestLegacyJson & LatestJson,
+ "(?<="")(1\.20\.1-)?\d+\.\d+\.\d+(-beta)?(?="")") '我寻思直接正则就行.jpg
+ Dim Versions = VersionNames.
+ Where(Function(name) name <> "47.1.82"). '这个版本虽然在版本列表中，但不能下载
+ Select(Function(name) New DlNeoForgeListEntry(name)).ToList
+ If Not Versions.Any() Then Throw New Exception("没有可用版本")
+ Versions = Versions.OrderByDescending(Function(a) a.Version).ToList
+ Return Versions
+ End Function
+
+#End Region
+
#Region "DlLiteLoaderList | LiteLoader 版本列表"
Public Structure DlLiteLoaderListResult
@@ -741,6 +884,7 @@
'''
Public OfficialError As Exception
End Structure
+
Public Class DlLiteLoaderListEntry
'''
''' 实际的文件名，如“liteloader-installer-1.12-00-SNAPSHOT.jar”。
@@ -820,7 +964,7 @@
Next
Loader.Output = New DlLiteLoaderListResult With {.IsOfficial = True, .SourceName = "LiteLoader 官方源", .Value = Versions}
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Result.ToString & "）", ex)
+ Throw New Exception("LiteLoader 官方源版本列表解析失败（" & Result.ToString & "）", ex)
End Try
End Sub
@@ -848,7 +992,7 @@
Next
Loader.Output = New DlLiteLoaderListResult With {.IsOfficial = False, .SourceName = "BMCLAPI", .Value = Versions}
Catch ex As Exception
- Throw New Exception("版本列表解析失败（" & Result.ToString & "）", ex)
+ Throw New Exception("LiteLoader BMCLAPI 版本列表解析失败（" & Result.ToString & "）", ex)
End Try
End Sub
@@ -906,7 +1050,7 @@
If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
Loader.Output = Output
Catch ex As Exception
- Throw New Exception("列表解析失败（" & Result.ToString & "）", ex)
+ Throw New Exception("Fabric 官方源版本列表解析失败（" & Result.ToString & "）", ex)
End Try
End Sub
@@ -921,7 +1065,7 @@
If Output.Value("game") Is Nothing OrElse Output.Value("loader") Is Nothing OrElse Output.Value("installer") Is Nothing Then Throw New Exception("获取到的列表缺乏必要项")
Loader.Output = Output
Catch ex As Exception
- Throw New Exception("列表解析失败（" & Result.ToString & "）", ex)
+ Throw New Exception("Fabric BMCLAPI 版本列表解析失败（" & Result.ToString & "）", ex)
End Try
End Sub
@@ -944,25 +1088,25 @@
Public Function DlSourceResourceGet(MojangBase As String) As String()
MojangBase = MojangBase.Replace("http://resources.download.minecraft.net", "https://resources.download.minecraft.net")
Return {
- MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://resources.download.minecraft.net", "https://bmclapi2.bangbang93.com/assets"),
- MojangBase
- }
+ MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/assets").Replace("https://resources.download.minecraft.net", "https://bmclapi2.bangbang93.com/assets"),
+ MojangBase
+ }
End Function
Public Function DlSourceLibraryGet(MojangBase As String) As String()
Return {
- MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/maven"),
- MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries"),
- MojangBase
- }
+ MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/maven").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/maven"),
+ MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com/libraries").Replace("https://libraries.minecraft.net", "https://bmclapi2.bangbang93.com/libraries"),
+ MojangBase
+ }
End Function
Public Function DlSourceLauncherOrMetaGet(MojangBase As String) As String()
If MojangBase Is Nothing Then Throw New Exception("无对应的 json 下载地址")
Return {
- MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com"),
- MojangBase
- }
+ MojangBase.Replace("https://piston-data.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://piston-meta.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launcher.mojang.com", "https://bmclapi2.bangbang93.com").Replace("https://launchermeta.mojang.com", "https://bmclapi2.bangbang93.com"),
+ MojangBase
+ }
End Function
Private Sub DlSourceLoader(Of InputType, OutputType)(MainLoader As LoaderTask(Of InputType, OutputType),
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
index 7767f6b..3bf5ef3 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModJava.vb
@@ -240,21 +240,25 @@
Dim UserJava As JavaEntry = Nothing
'获取版本独立设置中指定的 Java
- If RelatedVersion IsNot Nothing AndAlso Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion).ToString.StartsWithF("{") Then
- Try
- UserJava = JavaEntry.FromJson(GetJson(Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion)))
- UserJava.Check()
- Catch ex As ThreadInterruptedException
- Throw
- Catch ex As Exception
- UserJava = Nothing
- Setup.Reset("VersionArgumentJavaSelect", Version:=RelatedVersion)
- Log(ex, "版本独立设置中指定的 Java 已无法使用，此设置已重置", LogLevel.Hint)
- End Try
+ Dim VersionSelect As String = ""
+ If RelatedVersion IsNot Nothing Then
+ VersionSelect = Setup.Get("VersionArgumentJavaSelect", Version:=RelatedVersion)
+ If VersionSelect.StartsWithF("{") Then
+ Try
+ UserJava = JavaEntry.FromJson(GetJson(VersionSelect))
+ UserJava.Check()
+ Catch ex As ThreadInterruptedException
+ Throw
+ Catch ex As Exception
+ UserJava = Nothing
+ Setup.Reset("VersionArgumentJavaSelect", Version:=RelatedVersion)
+ Log(ex, "版本独立设置中指定的 Java 已无法使用，此设置已重置", LogLevel.Hint)
+ End Try
+ End If
End If
'获取全局设置中指定的 Java
- If UserJava Is Nothing AndAlso Setup.Get("LaunchArgumentJavaSelect") <> "" Then
+ If UserJava Is Nothing AndAlso VersionSelect <> "" AndAlso Setup.Get("LaunchArgumentJavaSelect") <> "" Then
Try
UserJava = JavaEntry.FromJson(GetJson(Setup.Get("LaunchArgumentJavaSelect")))
UserJava.Check()
@@ -665,34 +669,18 @@ Wait:
'若该目录有 Java，则加入结果
If File.Exists(Path & "javaw.exe") Then Results(Path) = Source
'查找其下的所有文件夹
+ Dim Keywords = {"java", "jdk", "env", "环境", "run", "软件", "jre", "mc", "dragon",
+ "soft", "cache", "temp", "corretto", "roaming", "users", "craft", "program", "世界", "net",
+ "游戏", "oracle", "game", "file", "data", "jvm", "服务", "server", "客户", "client", "整合",
+ "应用", "运行", "前置", "mojang", "官启", "新建文件夹", "eclipse", "microsoft", "hotspot",
+ "runtime", "x86", "x64", "forge", "原版", "optifine", "官方", "启动", "hmcl", "mod", "高清",
+ "download", "launch", "程序", "path", "version", "baka", "pcl", "zulu", "local", "packages",
+ "4297127d64ec6", "国服", "网易", "ext", "netease", "1.", "启动"}
For Each FolderInfo As DirectoryInfo In OriginalPath.EnumerateDirectories
If FolderInfo.Attributes.HasFlag(FileAttributes.ReparsePoint) Then Continue For '跳过符号链接
Dim SearchEntry = GetFolderNameFromPath(FolderInfo.Name).ToLower '用于搜索的字符串
- If IsFullSearch OrElse
- FolderInfo.Parent.Name.ToLower = "users" OrElse
- SearchEntry.Contains("java") OrElse SearchEntry.Contains("jdk") OrElse SearchEntry.Contains("env") OrElse
- SearchEntry.Contains("环境") OrElse SearchEntry.Contains("run") OrElse SearchEntry.Contains("软件") OrElse
- SearchEntry.Contains("jre") OrElse SearchEntry = "bin" OrElse SearchEntry.Contains("mc") OrElse
- SearchEntry.Contains("soft") OrElse SearchEntry.Contains("cache") OrElse SearchEntry.Contains("temp") OrElse
- SearchEntry.Contains("corretto") OrElse SearchEntry.Contains("roaming") OrElse SearchEntry.Contains("users") OrElse
- SearchEntry.Contains("craft") OrElse SearchEntry.Contains("program") OrElse SearchEntry.Contains("世界") OrElse
- SearchEntry.Contains("net") OrElse SearchEntry.Contains("游戏") OrElse SearchEntry.Contains("oracle") OrElse
- SearchEntry.Contains("game") OrElse SearchEntry.Contains("file") OrElse SearchEntry.Contains("data") OrElse
- SearchEntry.Contains("jvm") OrElse SearchEntry.Contains("服务") OrElse SearchEntry.Contains("server") OrElse
- SearchEntry.Contains("客户") OrElse SearchEntry.Contains("client") OrElse SearchEntry.Contains("整合") OrElse
- SearchEntry.Contains("应用") OrElse SearchEntry.Contains("运行") OrElse SearchEntry.Contains("前置") OrElse
- SearchEntry.Contains("mojang") OrElse SearchEntry.Contains("官启") OrElse SearchEntry.Contains("新建文件夹") OrElse
- SearchEntry.Contains("eclipse") OrElse SearchEntry.Contains("microsoft") OrElse SearchEntry.Contains("hotspot") OrElse
- SearchEntry.Contains("runtime") OrElse SearchEntry.Contains("x86") OrElse SearchEntry.Contains("x64") OrElse
- SearchEntry.Contains("forge") OrElse SearchEntry.Contains("原版") OrElse SearchEntry.Contains("optifine") OrElse
- SearchEntry.Contains("官方") OrElse SearchEntry.Contains("启动") OrElse SearchEntry.Contains("hmcl") OrElse
- SearchEntry.Contains("mod") OrElse SearchEntry.Contains("高清") OrElse SearchEntry.Contains("download") OrElse
- SearchEntry.Contains("launch") OrElse SearchEntry.Contains("程序") OrElse SearchEntry.Contains("path") OrElse
- SearchEntry.Contains("version") OrElse SearchEntry.Contains("baka") OrElse SearchEntry.Contains("pcl") OrElse
- SearchEntry.Contains("zulu") OrElse
- SearchEntry.Contains("local") OrElse SearchEntry.Contains("packages") OrElse SearchEntry.Contains("4297127d64ec6") OrElse '官启文件夹
- SearchEntry.Contains("国服") OrElse SearchEntry.Contains("网易") OrElse SearchEntry.Contains("ext") OrElse '网易 Java 文件夹名
- SearchEntry.Contains("netease") OrElse SearchEntry.Contains("1.") OrElse SearchEntry.Contains("启动") Then
+ If IsFullSearch OrElse FolderInfo.Parent.Name.ToLower = "users" OrElse
+ Keywords.Any(Function(w) SearchEntry.Contains(w)) OrElse SearchEntry = "bin" Then
JavaSearchFolder(FolderInfo, Results, Source)
End If
Next
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
index e4df4ac..163f498 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModLaunch.vb
@@ -113,10 +113,18 @@ Public Module ModLaunch
New LoaderTask(Of Process, Integer)("等待游戏窗口出现", AddressOf McLaunchWait) With {.ProgressWeight = 1},
New LoaderTask(Of Integer, Integer)("结束处理", AddressOf McLaunchEnd) With {.ProgressWeight = 1}
}
- If Setup.Get("LaunchArgumentRam") Then
- CType(Loaders(2), LoaderCombo(Of String)).Block = False
- Loaders.Insert(3, New LoaderTask(Of Integer, Integer)("内存优化", AddressOf McLaunchMemoryOptimize) With {.ProgressWeight = 30})
- End If
+ '内存优化
+ Select Case Setup.Get("VersionRamOptimize", Version:=McVersionCurrent)
+ Case 0 '全局
+ If Setup.Get("LaunchArgumentRam") Then '使用全局设置
+ CType(Loaders(2), LoaderCombo(Of String)).Block = False
+ Loaders.Insert(3, New LoaderTask(Of Integer, Integer)("内存优化", AddressOf McLaunchMemoryOptimize) With {.ProgressWeight = 30})
+ End If
+ Case 1 '开启
+ CType(Loaders(2), LoaderCombo(Of String)).Block = False
+ Loaders.Insert(3, New LoaderTask(Of Integer, Integer)("内存优化", AddressOf McLaunchMemoryOptimize) With {.ProgressWeight = 30})
+ Case 2 '关闭
+ End Select
Dim LaunchLoader As New LoaderCombo(Of Object)("Minecraft 启动", Loaders) With {.Show = False}
If McLoginLoader.State = LoadState.Finished Then McLoginLoader.State = LoadState.Waiting '要求重启登录主加载器，它会自行决定是否启动副加载器
'等待加载器执行并更新 UI
@@ -1072,8 +1080,8 @@ SystemBrowser:
Case 4
'自定义
Do Until McSkinSex(Uuid) = If(Setup.Get("LaunchSkinSlim"), "Alex", "Steve")
- If Uuid.EndsWithF("FFFFF") Then Uuid = Mid(Uuid, 1, 32 - 5) & "00000"
- Uuid = Mid(Uuid, 1, 32 - 5) & (Long.Parse(Right(Uuid, 5), Globalization.NumberStyles.AllowHexSpecifier) + 1).ToString("X").PadLeft(5, "0")
+ If Uuid.EndsWithF("FFFFF") Then Uuid = Uuid.Substring(0, 27) & "00000"
+ Uuid = Uuid.Substring(0, 27) & (Long.Parse(Uuid.Substring(27), Globalization.NumberStyles.AllowHexSpecifier) + 1).ToString("X").PadLeft(5, "0")
Loop
End Select
Return Uuid
@@ -1270,7 +1278,9 @@ SystemBrowser:
Public Function ExtractJavaWrapper() As String
Dim WrapperPath As String = GetJavaWrapperDir() & "\JavaWrapper.jar"
SyncLock ExtractJavaWrapperLock '避免 OptiFine 和 Forge 安装时同时释放 Java Wrapper 导致冲突
- WriteFile(WrapperPath, GetResources("JavaWrapper"))
+ If Not WriteFile(WrapperPath, GetResources("JavaWrapper")) Then
+ Throw New FileNotFoundException("释放 Java Wrapper 失败")
+ End If
End SyncLock
Log("[Java] 已释放 Java Wrapper：" & WrapperPath)
Return WrapperPath
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb
index 458a42a..4afbfd0 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMinecraft.vb
@@ -151,7 +151,7 @@ Public Module ModMinecraft
#Region "版本处理"
- Public Const McVersionCacheVersion As Integer = 29
+ Public Const McVersionCacheVersion As Integer = 30
Private _McVersionCurrent As McVersion
Private _McVersionLast = 0 '为 0 以保证与 Nothing 不相同，使得 UI 显示可以正常初始化
@@ -290,7 +290,7 @@ Public Module ModMinecraft
Public ReadOnly Property Modable As Boolean
Get
If Not IsLoaded Then Load()
- Return Version.HasFabric OrElse Version.HasForge OrElse Version.HasLiteLoader OrElse
+ Return Version.HasFabric OrElse Version.HasForge OrElse Version.HasLiteLoader OrElse Version.HasNeoForge OrElse
DisplayType = McVersionCardType.API '#223
End Get
End Property
@@ -345,7 +345,7 @@ Public Module ModMinecraft
End If
Next
End If
- '从 Forge Arguments 中获取版本号
+ '从 Forge / NeoForge Arguments 中获取版本号
If JsonObject("arguments") IsNot Nothing AndAlso JsonObject("arguments")("game") IsNot Nothing Then
Dim Mark As Boolean = False
For Each Argument In JsonObject("arguments")("game")
@@ -715,8 +715,8 @@ Recheck:
'OptiFine
If RealJson.Contains("optifine") Then
State = McVersionState.OptiFine
- Version.OptiFineVersion = If(RegexSeek(RealJson, "(?<=HD_U_)[^"":/]+"), "未知版本")
Version.HasOptiFine = True
+ Version.OptiFineVersion = If(RegexSeek(RealJson, "(?<=HD_U_)[^"":/]+"), "未知版本")
End If
'LiteLoader
If RealJson.Contains("liteloader") Then
@@ -727,14 +727,20 @@ Recheck:
'FUTURE: [Quilt 支持] 确认这里的玩意儿对不对
If RealJson.Contains("net.fabricmc:fabric-loader") OrElse RealJson.Contains("org.quiltmc:quilt-loader") Then
State = McVersionState.Fabric
- Version.FabricVersion = If(RegexSeek(RealJson, "(?<=(net.fabricmc:fabric-loader:)|(org.quiltmc:quilt-loader:))[0-9\.]+(\+build.[0-9]+)?"), "未知版本").Replace("+build", "")
Version.HasFabric = True
- ElseIf RealJson.Contains("minecraftforge") Then
+ Version.FabricVersion = If(RegexSeek(RealJson, "(?<=(net.fabricmc:fabric-loader:)|(org.quiltmc:quilt-loader:))[0-9\.]+(\+build.[0-9]+)?"), "未知版本").Replace("+build", "")
+ ElseIf RealJson.Contains("minecraftforge") AndAlso Not RealJson.Contains("net.neoforge") Then
State = McVersionState.Forge
+ Version.HasForge = True
Version.ForgeVersion = RegexSeek(RealJson, "(?<=forge:[0-9\.]+(_pre[0-9]*)?\-)[0-9\.]+")
If Version.ForgeVersion Is Nothing Then Version.ForgeVersion = RegexSeek(RealJson, "(?<=net\.minecraftforge:minecraftforge:)[0-9\.]+")
If Version.ForgeVersion Is Nothing Then Version.ForgeVersion = If(RegexSeek(RealJson, "(?<=net\.minecraftforge:fmlloader:[0-9\.]+-)[0-9\.]+"), "未知版本")
- Version.HasForge = True
+ ElseIf RealJson.Contains("net.neoforge") Then
+ '1.20.1 JSON 范例："--fml.forgeVersion", "47.1.99"
+ '1.20.2+ JSON 范例："--fml.neoForgeVersion", "20.6.119-beta"
+ State = McVersionState.NeoForge
+ Version.HasNeoForge = True
+ Version.NeoForgeVersion = If(RegexSeek(RealJson, "(?<=orgeVersion"",[^""]*?"")[^""]+(?="",)"), "未知版本")
End If
Version.IsApiLoaded = True
End Select
@@ -752,6 +758,8 @@ ExitDataLoad:
Logo = PathImage & "Blocks/CobbleStone.png"
Case McVersionState.Forge
Logo = PathImage & "Blocks/Anvil.png"
+ Case McVersionState.NeoForge
+ Logo = PathImage & "Blocks/NeoForge.png"
Case McVersionState.Fabric
Logo = PathImage & "Blocks/Fabric.png"
Case McVersionState.OptiFine
@@ -780,7 +788,7 @@ ExitDataLoad:
End If
Case McVersionState.Old
Info = "远古版本"
- Case McVersionState.Original, McVersionState.Forge, McVersionState.Fabric, McVersionState.OptiFine, McVersionState.LiteLoader
+ Case McVersionState.Original, McVersionState.Forge, McVersionState.NeoForge, McVersionState.Fabric, McVersionState.OptiFine, McVersionState.LiteLoader
Info = Version.ToString
Case McVersionState.Fool
Info = GetMcFoolName(Version.McName)
@@ -813,6 +821,7 @@ ExitDataLoad:
WriteIni(Path & "PCL\Setup.ini", "VersionOptiFine", Version.OptiFineVersion)
WriteIni(Path & "PCL\Setup.ini", "VersionLiteLoader", Version.HasLiteLoader)
WriteIni(Path & "PCL\Setup.ini", "VersionForge", Version.ForgeVersion)
+ WriteIni(Path & "PCL\Setup.ini", "VersionNeoForge", Version.NeoForgeVersion)
WriteIni(Path & "PCL\Setup.ini", "VersionApiCode", Version.SortCode)
WriteIni(Path & "PCL\Setup.ini", "VersionOriginal", Version.McName)
WriteIni(Path & "PCL\Setup.ini", "VersionOriginalMain", Version.McCodeMain)
@@ -852,6 +861,7 @@ ExitDataLoad:
OptiFine
Old
Forge
+ NeoForge
LiteLoader
Fabric
End Enum
@@ -903,6 +913,17 @@ ExitDataLoad:
'''
Public ForgeVersion As String = ""
+ 'NeoForge
+
+ '''
+ ''' 该版本是否安装了 NeoForge。
+ '''
+ Public HasNeoForge As Boolean = False
+ '''
+ ''' NeoForge 版本号，如 21.0.2-beta、47.1.79。
+ '''
+ Public NeoForgeVersion As String = ""
+
'Fabric
'''
@@ -929,6 +950,7 @@ ExitDataLoad:
Public Overrides Function ToString() As String
ToString = ""
If HasForge Then ToString += ", Forge" & If(ForgeVersion = "未知版本", "", " " & ForgeVersion)
+ If HasNeoForge Then ToString += ", NeoForge" & If(NeoForgeVersion = "未知版本", "", " " & NeoForgeVersion)
If HasFabric Then ToString += ", Fabric" & If(FabricVersion = "未知版本", "", " " & FabricVersion)
If HasOptiFine Then ToString += ", OptiFine" & If(OptiFineVersion = "未知版本", "", " " & OptiFineVersion)
If HasLiteLoader Then ToString += ", LiteLoader"
@@ -955,15 +977,15 @@ ExitDataLoad:
Else
Throw New Exception("无效的 Fabric 版本：" & ForgeVersion)
End If
- ElseIf HasForge Then
- If ForgeVersion = "未知版本" Then Return 0
- Dim SubVersions = ForgeVersion.Split(".")
+ ElseIf HasForge OrElse HasNeoForge Then
+ If ForgeVersion = "未知版本" AndAlso NeoForgeVersion = "未知版本" Then Return 0
+ Dim SubVersions = If(HasForge, ForgeVersion.Split("."), NeoForgeVersion.Split("."))
If SubVersions.Length = 4 Then
_SortCode = Val(SubVersions(0)) * 1000000 + Val(SubVersions(1)) * 10000 + Val(SubVersions(3))
ElseIf SubVersions.Length = 3 Then
_SortCode = Val(SubVersions(0)) * 1000000 + Val(SubVersions(1)) * 10000 + Val(SubVersions(2))
Else
- Throw New Exception("无效的 Forge 版本：" & ForgeVersion)
+ Throw New Exception("无效的 Neo/Forge 版本：" & ForgeVersion)
End If
ElseIf HasOptiFine Then
If OptiFineVersion = "未知版本" Then Return 0
@@ -1175,6 +1197,7 @@ OnLoaded:
Dim VersionInfo As New McVersionInfo With {
.FabricVersion = ReadIni(Version.Path & "PCL\Setup.ini", "VersionFabric", ""),
.ForgeVersion = ReadIni(Version.Path & "PCL\Setup.ini", "VersionForge", ""),
+ .NeoForgeVersion = ReadIni(Version.Path & "PCL\Setup.ini", "VersionNeoForge", ""),
.OptiFineVersion = ReadIni(Version.Path & "PCL\Setup.ini", "VersionOptiFine", ""),
.HasLiteLoader = ReadIni(Version.Path & "PCL\Setup.ini", "VersionLiteLoader", False),
.SortCode = ReadIni(Version.Path & "PCL\Setup.ini", "VersionApiCode", -1),
@@ -1183,9 +1206,10 @@ OnLoaded:
.McCodeSub = ReadIni(Version.Path & "PCL\Setup.ini", "VersionOriginalSub", -1),
.IsApiLoaded = True
}
- VersionInfo.HasFabric = VersionInfo.FabricVersion.Count > 1
- VersionInfo.HasForge = VersionInfo.ForgeVersion.Count > 1
- VersionInfo.HasOptiFine = VersionInfo.OptiFineVersion.Count > 1
+ VersionInfo.HasFabric = VersionInfo.FabricVersion.Any()
+ VersionInfo.HasForge = VersionInfo.ForgeVersion.Any()
+ VersionInfo.HasNeoForge = VersionInfo.NeoForgeVersion.Any()
+ VersionInfo.HasOptiFine = VersionInfo.OptiFineVersion.Any()
Version.Version = VersionInfo
End If
@@ -1273,7 +1297,7 @@ OnLoaded:
McVersionFilter(VersionList, VersionListOriginal, {McVersionState.Fool}, McVersionCardType.Fool)
'筛选 API 版本
- McVersionFilter(VersionList, VersionListOriginal, {McVersionState.Forge, McVersionState.LiteLoader, McVersionState.Fabric}, McVersionCardType.API)
+ McVersionFilter(VersionList, VersionListOriginal, {McVersionState.Forge, McVersionState.NeoForge, McVersionState.LiteLoader, McVersionState.Fabric}, McVersionCardType.API)
'将老版本预先分类入不常用，只剩余原版、快照、OptiFine
Dim VersionUseful As New List(Of McVersion)
@@ -1407,7 +1431,7 @@ OnLoaded:
End Function)
End If
- 'API 版本：优先按版本排序，此后【先放 Fabric，再放 Forge（按版本号从高到低排序），最后放 LiteLoader（按名称排序）】
+ 'API 版本：优先按版本排序，此后【先放 Fabric，再放 Neo/Forge（按版本号从高到低排序），最后放 LiteLoader（按名称排序）】
If ResultVersionList.ContainsKey(McVersionCardType.API) Then
ResultVersionList(McVersionCardType.API) = Sort(ResultVersionList(McVersionCardType.API),
Function(Left As McVersion, Right As McVersion)
@@ -1417,6 +1441,8 @@ OnLoaded:
Else
If Left.Version.HasFabric Xor Right.Version.HasFabric Then
Return Left.Version.HasFabric
+ ElseIf Left.Version.HasNeoForge Xor Right.Version.HasNeoForge Then
+ Return Left.Version.HasNeoForge
ElseIf Left.Version.HasForge Xor Right.Version.HasForge Then
Return Left.Version.HasForge
ElseIf Not Left.Version.SortCode <> Right.Version.SortCode Then
@@ -1649,7 +1675,7 @@ OnLoaded:
Return _Url
End Get
Set(value As String)
- '孤儿 Forge 作者喜欢把没有的 URL 写个空字符串
+ '孤儿 Forge 作者喜欢把没有 URL 的写个空字符串
_Url = If(String.IsNullOrWhiteSpace(value), Nothing, value)
End Set
End Property
@@ -1666,15 +1692,6 @@ OnLoaded:
End Get
End Property
'''
- ''' 原 Json 中 Name 项最后一部分的版本号。
- '''
- Public ReadOnly Property Version As String
- Get
- Dim Splited = OriginalName.Split(":")
- Return Splited(Splited.Count - 1)
- End Get
- End Property
- '''
''' 原 Json 中的 Name 项。
'''
Public OriginalName As String
@@ -1755,7 +1772,7 @@ OnLoaded:
'根据 Inherit 获取最深层版本
Dim OriginalVersion As McVersion = Version
'1.17+ 的 Forge 不寻找 Inherit
- If Not (Version.Version.HasForge AndAlso Version.Version.McCodeMain >= 17) Then
+ If Not ((Version.Version.HasForge OrElse Version.Version.HasNeoForge) AndAlso Version.Version.McCodeMain >= 17) Then
Do Until OriginalVersion.InheritVersion = ""
If OriginalVersion.InheritVersion = OriginalVersion.Name Then Exit Do
OriginalVersion = New McVersion(PathMcFolder & "versions\" & OriginalVersion.InheritVersion & "\")
@@ -1840,13 +1857,14 @@ OnLoaded:
Try
If Library("downloads") IsNot Nothing AndAlso Library("downloads")("artifact") IsNot Nothing Then
BasicArray.Add(New McLibToken With {
- .IsJumpLoader = IsJumpLoader,
- .OriginalName = Library("name"),
- .Url = If(RootUrl, Library("downloads")("artifact")("url")),
- .LocalPath = If(Library("downloads")("artifact")("path") Is Nothing, McLibGet(Library("name"), CustomMcFolder:=CustomMcFolder), CustomMcFolder & "libraries\" & Library("downloads")("artifact")("path").ToString.Replace("/", "\")),
- .Size = Val(Library("downloads")("artifact")("size").ToString),
- .IsNatives = False,
- .SHA1 = Library("downloads")("artifact")("sha1")?.ToString})
+ .IsJumpLoader = IsJumpLoader,
+ .OriginalName = Library("name"),
+ .Url = If(RootUrl, Library("downloads")("artifact")("url")),
+ .LocalPath = If(Library("downloads")("artifact")("path") Is Nothing, McLibGet(Library("name"),
+ CustomMcFolder:=CustomMcFolder), CustomMcFolder & "libraries\" & Library("downloads")("artifact")("path").ToString.Replace("/", "\")),
+ .Size = Val(Library("downloads")("artifact")("size").ToString),
+ .IsNatives = False,
+ .SHA1 = Library("downloads")("artifact")("sha1")?.ToString})
Else
BasicArray.Add(New McLibToken With {.IsJumpLoader = IsJumpLoader, .OriginalName = Library("name"), .Url = RootUrl, .LocalPath = LocalPath, .Size = 0, .IsNatives = False, .SHA1 = Nothing})
End If
@@ -1880,15 +1898,25 @@ OnLoaded:
'去重
Dim ResultArray As New Dictionary(Of String, McLibToken)
+ Dim GetVersion =
+ Function(Token As McLibToken) As String
+ '测试例：
+ 'D:\Minecraft\test\libraries\net\neoforged\mergetool\2.0.0\mergetool-2.0.0-api.jar
+ 'D:\Minecraft\test\libraries\org\apache\commons\commons-collections4\4.2\commons-collections4-4.2.jar
+ 'D:\Minecraft\test\libraries\com\google\guava\guava\31.1-jre\guava-31.1-jre.jar
+ Return GetFolderNameFromPath(GetPathFromFullPath(Token.LocalPath))
+ End Function
For i = 0 To BasicArray.Count - 1
Dim Key As String = BasicArray(i).Name & BasicArray(i).IsNatives.ToString & BasicArray(i).IsJumpLoader.ToString
If ResultArray.ContainsKey(Key) Then
- If BasicArray(i).Version <> ResultArray(Key).Version AndAlso KeepSameNameDifferentVersionResult Then
- Log($"[Minecraft] 发现疑似重复的支持库：{BasicArray(i)} 与 {ResultArray(Key)}")
+ Dim BasicArrayVersion As String = GetVersion(BasicArray(i))
+ Dim ResultArrayVersion As String = GetVersion(ResultArray(Key))
+ If BasicArrayVersion <> ResultArrayVersion AndAlso KeepSameNameDifferentVersionResult Then
+ Log($"[Minecraft] 发现疑似重复的支持库：{BasicArray(i)} ({BasicArrayVersion}) 与 {ResultArray(Key)} ({ResultArrayVersion})")
ResultArray.Add(Key & GetUuid(), BasicArray(i))
Else
- Log($"[Minecraft] 发现重复的支持库：{BasicArray(i)} 与 {ResultArray(Key)}，已忽略其中之一")
- If VersionSortBoolean(BasicArray(i).Version, ResultArray(Key).Version) Then
+ Log($"[Minecraft] 发现重复的支持库：{BasicArray(i)} ({BasicArrayVersion}) 与 {ResultArray(Key)} ({ResultArrayVersion})，已忽略其中之一")
+ If VersionSortBoolean(BasicArrayVersion, ResultArrayVersion) Then
ResultArray(Key) = BasicArray(i)
End If
End If
@@ -1948,6 +1976,7 @@ OnLoaded:
End If
End If
End If
+
'Authlib-Injector 文件
If Setup.Get("VersionServerLogin", Version:=Version) = 4 OrElse
(PageLinkHiper.HiperState = LoadState.Finished AndAlso Setup.Get("LoginType") = McLoginType.Legacy) Then 'HiPer 登录转接
@@ -1997,8 +2026,13 @@ OnLoaded:
If Token.Url IsNot Nothing Then
'获取 Url 的真实地址
Urls.Add(Token.Url)
- If Token.Url.Contains("launcher.mojang.com/v1/objects") Then Urls = DlSourceLauncherOrMetaGet(Token.Url).ToList() 'Mappings
- If Token.Url.Contains("maven") Then Urls.Insert(0, Token.Url.Replace(Mid(Token.Url, 1, Token.Url.IndexOfF("maven")), "https://bmclapi2.bangbang93.com/").Replace("maven.fabricmc.net", "maven").Replace("maven.minecraftforge.net", "maven"))
+ If Token.Url.Contains("launcher.mojang.com/v1/objects") Then
+ Urls = DlSourceLauncherOrMetaGet(Token.Url).ToList() 'Mappings
+ End If
+ If Token.Url.Contains("maven") Then
+ Urls.Insert(0, Token.Url.Replace(Mid(Token.Url, 1, Token.Url.IndexOfF("maven")), "https://bmclapi2.bangbang93.com/").
+ Replace("maven.fabricmc.net", "maven").Replace("maven.minecraftforge.net", "maven").Replace("maven.neoforged.net/releases", "maven"))
+ End If
End If
If Token.LocalPath.Contains("transformer-discovery-service") Then
'Transformer 文件释放
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb
index 348d3cb..0f26a62 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModMod.vb
@@ -887,7 +887,7 @@ Finished:
ModList.Add(ModEntry)
'读取 Comp 缓存
If ModEntry.State = McMod.McModState.Unavaliable Then Continue For
- Dim CacheKey = ModEntry.ModrinthHash & PageVersionLeft.Version.Version.McName
+ Dim CacheKey = ModEntry.ModrinthHash & PageVersionLeft.Version.Version.McName & GetTargetModLoaders().Join("")
If Cache.ContainsKey(CacheKey) Then
ModEntry.FromJson(Cache(CacheKey))
'如果缓存中的信息在 6 小时以内更新过，则无需重新获取
@@ -923,20 +923,15 @@ Finished:
Throw
End Try
End Sub
-
'联网加载 Mod 详情
- Private Const LocalModCacheVersion As Integer = 4
+ Private Const LocalModCacheVersion As Integer = 5
Public McModDetailLoader As New LoaderTask(Of KeyValuePair(Of List(Of McMod), JObject), Integer)("Mod List Detail Loader", AddressOf McModDetailLoad)
Private Sub McModDetailLoad(Loader As LoaderTask(Of KeyValuePair(Of List(Of McMod), JObject), Integer))
Dim Mods As List(Of McMod) = Loader.Input.Key
Dim Cache As JObject = Loader.Input.Value
'获取作为检查目标的加载器和版本
Dim TargetMcVersion As McVersionInfo = PageVersionLeft.Version.Version
- Dim ModLoaders As New List(Of CompModLoaderType)
- If TargetMcVersion.HasForge Then ModLoaders.Add(CompModLoaderType.Forge)
- If TargetMcVersion.HasFabric Then ModLoaders.Add(CompModLoaderType.Fabric)
- If TargetMcVersion.HasLiteLoader Then ModLoaders.Add(CompModLoaderType.LiteLoader)
- If Not ModLoaders.Any() Then ModLoaders.AddRange({CompModLoaderType.Forge, CompModLoaderType.Fabric, CompModLoaderType.LiteLoader, CompModLoaderType.Quilt})
+ Dim ModLoaders = GetTargetModLoaders()
Dim McVersion = TargetMcVersion.McName
'暂不向下扩展检查的 MC 小版本
'例如：Mod 在更新 1.16.5 后，对早期的 1.16.2 版本发布了修补补丁，这会导致 PCL 将 1.16.5 版本的 Mod 降级到 1.16.2
@@ -1136,10 +1131,19 @@ Finished:
If Not Mods.Any() Then Exit Sub
For Each Entry In Mods 'TODO: Bookshelf 的 Logo 会在两个网站间横跳
Entry.CompLoaded = SucceedThreadCount = 2
- Cache(Entry.ModrinthHash & McVersion) = Entry.ToJson()
+ Cache(Entry.ModrinthHash & McVersion & ModLoaders.Join("")) = Entry.ToJson()
Next
WriteFile(PathTemp & "Cache\LocalMod.json", Cache.ToString(If(ModeDebug, Newtonsoft.Json.Formatting.Indented, Newtonsoft.Json.Formatting.None)))
End Sub
+ Private Function GetTargetModLoaders() As List(Of CompModLoaderType)
+ Dim ModLoaders As New List(Of CompModLoaderType)
+ If PageVersionLeft.Version.Version.HasForge Then ModLoaders.Add(CompModLoaderType.Forge)
+ If PageVersionLeft.Version.Version.HasNeoForge Then ModLoaders.Add(CompModLoaderType.NeoForge)
+ If PageVersionLeft.Version.Version.HasFabric Then ModLoaders.Add(CompModLoaderType.Fabric)
+ If PageVersionLeft.Version.Version.HasLiteLoader Then ModLoaders.Add(CompModLoaderType.LiteLoader)
+ If Not ModLoaders.Any() Then ModLoaders.AddRange({CompModLoaderType.Forge, CompModLoaderType.NeoForge, CompModLoaderType.Fabric, CompModLoaderType.LiteLoader, CompModLoaderType.Quilt})
+ Return ModLoaders
+ End Function
#If DEBUG Then
'''
diff --git a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
index bcd878c..7dacc5d 100644
--- a/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
+++ b/Plain Craft Launcher 2/Modules/Minecraft/ModModpack.vb
@@ -25,6 +25,7 @@ Public Module ModModpack
Archive = New ZipArchive(New FileStream(File, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
'从根目录判断整合包类型
If Archive.GetEntry("mcbbs.packmeta") IsNot Nothing Then PackType = 3 : Exit Try 'MCBBS 整合包（优先于 manifest.json 判断）
+ If Archive.GetEntry("mmc-pack.json") IsNot Nothing Then PackType = 2 : Exit Try 'MMC 整合包（优先于 manifest.json 判断，#4194）
If Archive.GetEntry("modrinth.index.json") IsNot Nothing Then PackType = 4 : Exit Try 'Modrinth 整合包
If Archive.GetEntry("manifest.json") IsNot Nothing Then
Dim Json As JObject = GetJson(ReadFile(Archive.GetEntry("manifest.json").Open, Encoding.UTF8))
@@ -35,7 +36,6 @@ Public Module ModModpack
End If
End If
If Archive.GetEntry("modpack.json") IsNot Nothing Then PackType = 1 : Exit Try 'HMCL 整合包
- If Archive.GetEntry("mmc-pack.json") IsNot Nothing Then PackType = 2 : Exit Try 'MMC 整合包
'从一级目录判断整合包类型
For Each Entry In Archive.Entries
Dim FullNames As String() = Entry.FullName.Split("/")
@@ -183,6 +183,7 @@ Retry:
'获取 Mod API 版本信息
Dim ForgeVersion As String = Nothing
+ Dim NeoForgeVersion As String = Nothing
Dim FabricVersion As String = Nothing
For Each Entry In If(Json("minecraft")("modLoaders"), {})
Dim Id As String = If(Entry("id"), "").ToString.ToLower
@@ -194,16 +195,25 @@ Retry:
End If
Try
Log("[ModPack] 整合包 Forge 版本：" & Id)
- ForgeVersion = Id.Split("-")(1)
+ ForgeVersion = Id.Replace("forge-", "")
Exit For
Catch ex As Exception
Log(ex, "读取整合包 Forge 版本失败：" & Id)
End Try
+ ElseIf Id.StartsWithF("neoforge-") Then
+ 'NeoForge 指定
+ Try
+ Log("[ModPack] 整合包 NeoForge 版本：" & Id)
+ NeoForgeVersion = Id.Replace("neoforge-", "")
+ Exit For
+ Catch ex As Exception
+ Log(ex, "读取整合包 NeoForge 版本失败：" & Id)
+ End Try
ElseIf Id.StartsWithF("fabric-") Then
'Fabric 指定
Try
Log("[ModPack] 整合包 Fabric 版本：" & Id)
- FabricVersion = Id.Split("-")(1)
+ FabricVersion = Id.Replace("fabric-", "")
Exit For
Catch ex As Exception
Log(ex, "读取整合包 Fabric 版本失败：" & Id)
@@ -271,19 +281,23 @@ Retry:
'建立 CompFile
Dim File As New CompFile(ModJson, CompType.Mod)
If Not File.Available Then Continue For
- '根据 modules 和文件名后缀判断是资源包还是 Mod
- Dim IsResourcePack As Boolean
+ '根据 modules 和文件名后缀判断资源类型
+ Dim TargetFolder As String
If ModJson("modules").Any Then 'modules 可能返回 null（#1006）
Dim ModuleNames = CType(ModJson("modules"), JArray).Select(Function(l) l("name").ToString).ToList
- IsResourcePack =
- (Not ModuleNames.Contains("META-INF")) AndAlso (Not ModuleNames.Contains("mcmod.info")) AndAlso '不包含 META-INF 或 mcmod.info
- ModuleNames.Contains("pack.mcmeta") AndAlso '包含 pack.mcmeta
- (Not File.FileName.EndsWithF(".jar", True)) '文件后缀不是 .jar
+ If ModuleNames.Contains("META-INF") OrElse ModuleNames.Contains("mcmod.info") OrElse
+ File.FileName.EndsWithF(".jar", True) Then
+ TargetFolder = "mods"
+ ElseIf ModuleNames.Contains("pack.mcmeta") Then
+ TargetFolder = "resourcepacks"
+ Else
+ TargetFolder = "shaderpacks"
+ End If
Else
- IsResourcePack = False
+ TargetFolder = "mods"
End If
'实际的添加
- FileList.Add(Id, File.ToNetFile($"{PathMcFolder}versions\{VersionName}\{If(IsResourcePack, "resourcepacks", "mods")}\"))
+ FileList.Add(Id, File.ToNetFile($"{PathMcFolder}versions\{VersionName}\{TargetFolder}\"))
Task.Progress += 1 / (1 + ModList.Count)
Next
Task.Output = FileList.Values.ToList
@@ -301,6 +315,7 @@ Retry:
.TargetVersionFolder = $"{PathMcFolder}versions\{VersionName}\",
.MinecraftName = Json("minecraft")("version").ToString,
.ForgeVersion = ForgeVersion,
+ .NeoForgeVersion = NeoForgeVersion,
.FabricVersion = FabricVersion
}
Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request, True)
@@ -368,6 +383,7 @@ Retry:
'获取 Mod API 版本信息
Dim MinecraftVersion As String = Nothing
Dim ForgeVersion As String = Nothing
+ Dim NeoForgeVersion As String = Nothing
Dim FabricVersion As String = Nothing
For Each Entry As JProperty In If(Json("dependencies"), {})
Select Case Entry.Name.ToLower
@@ -376,6 +392,9 @@ Retry:
Case "forge" 'eg. 14.23.5.2859 / 1.19-41.1.0
ForgeVersion = Entry.Value.ToString
Log("[ModPack] 整合包 Forge 版本：" & ForgeVersion)
+ Case "neoforge", "neo-forge" 'eg. 20.6.98-beta
+ NeoForgeVersion = Entry.Value.ToString
+ Log("[ModPack] 整合包 NeoForge 版本：" & NeoForgeVersion)
Case "fabric-loader" 'eg. 0.14.14
FabricVersion = Entry.Value.ToString
Log("[ModPack] 整合包 Fabric 版本：" & FabricVersion)
@@ -447,6 +466,7 @@ Retry:
.TargetVersionFolder = $"{PathMcFolder}versions\{VersionName}\",
.MinecraftName = MinecraftVersion,
.ForgeVersion = ForgeVersion,
+ .NeoForgeVersion = NeoForgeVersion,
.FabricVersion = FabricVersion
}
Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request, True)
@@ -676,6 +696,8 @@ Retry:
Request.MinecraftName = Component("version")
Case "net.minecraftforge"
Request.ForgeVersion = Component("version")
+ Case "net.neoforged"
+ Request.NeoForgeVersion = Component("version")
Case "net.fabricmc.fabric-loader"
Request.FabricVersion = Component("version")
Case "org.quiltmc.quilt-loader" 'eg. 1.0.0
@@ -772,6 +794,7 @@ Retry:
.MinecraftName = Addons("game"),
.OptiFineVersion = If(Addons.ContainsKey("optifine"), Addons("optifine"), Nothing),
.ForgeVersion = If(Addons.ContainsKey("forge"), Addons("forge"), Nothing),
+ .NeoForgeVersion = If(Addons.ContainsKey("neoforge"), Addons("neoforge"), Nothing),
.FabricVersion = If(Addons.ContainsKey("fabric"), Addons("fabric"), Nothing)
}
Dim MergeLoaders As List(Of LoaderBase) = McInstallLoader(Request, True)
diff --git a/Plain Craft Launcher 2/Modules/ModEvent.vb b/Plain Craft Launcher 2/Modules/ModEvent.vb
index aa09e79..e5282a9 100644
--- a/Plain Craft Launcher 2/Modules/ModEvent.vb
+++ b/Plain Craft Launcher 2/Modules/ModEvent.vb
@@ -21,28 +21,38 @@
OpenWebsite(Data(0))
Case "打开文件", "打开帮助"
- RunInThread(Sub()
- Try
- '确认实际路径
- Dim ActualPaths = GetEventAbsoluteUrls(Data(0), Type)
- Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
- '执行
- If Type = "打开文件" Then
- Dim Info As New ProcessStartInfo With {
- .Arguments = If(Data.Length >= 2, Data(1), ""),
- .FileName = Location,
- .WorkingDirectory = WorkingDir
- }
- Process.Start(Info)
- Else '打开帮助
- PageOtherHelp.EnterHelpPage(Location)
- End If
- Catch ex As Exception
- Log(ex, "执行打开类自定义事件失败", LogLevel.Msgbox)
- End Try
- End Sub)
+ RunInThread(
+ Sub()
+ Try
+ '确认实际路径
+ Dim ActualPaths = GetEventAbsoluteUrls(Data(0), Type)
+ Dim Location = ActualPaths(0), WorkingDir = ActualPaths(1)
+ Log($"[Control] 打开类自定义事件实际路径：{Location}，工作目录：{WorkingDir}")
+ '执行
+ If Type = "打开文件" Then
+ Dim Info As New ProcessStartInfo With {
+ .Arguments = If(Data.Length >= 2, Data(1), ""),
+ .FileName = Location,
+ .WorkingDirectory = WorkingDir
+ }
+ Process.Start(Info)
+ Else '打开帮助
+ PageOtherHelp.EnterHelpPage(Location)
+ End If
+ Catch ex As Exception
+ Log(ex, "执行打开类自定义事件失败", LogLevel.Msgbox)
+ End Try
+ End Sub)
Case "启动游戏"
+ If Data(0) = "\current" Then
+ If McVersionCurrent Is Nothing Then
+ Hint("请先选择一个 Minecraft 版本！", HintType.Critical)
+ Exit Sub
+ Else
+ Data(0) = McVersionCurrent.Name
+ End If
+ End If
If McLaunchStart(New McLaunchOptions With
{.ServerIp = If(Data.Length >= 2, Data(1), Nothing), .Version = New McVersion(Data(0))}) Then
Hint("正在启动 " & Data(0) & "……")
diff --git a/Plain Craft Launcher 2/Modules/ModMain.vb b/Plain Craft Launcher 2/Modules/ModMain.vb
index c7a424d..5687be7 100644
--- a/Plain Craft Launcher 2/Modules/ModMain.vb
+++ b/Plain Craft Launcher 2/Modules/ModMain.vb
@@ -394,6 +394,7 @@ EndHint:
Public FrmDownloadOptiFine As PageDownloadOptiFine
Public FrmDownloadLiteLoader As PageDownloadLiteLoader
Public FrmDownloadForge As PageDownloadForge
+ Public FrmDownloadNeoForge As PageDownloadNeoForge
Public FrmDownloadFabric As PageDownloadFabric
Public FrmDownloadMod As PageDownloadMod
Public FrmDownloadPack As PageDownloadPack
diff --git a/Plain Craft Launcher 2/Modules/ModMusic.vb b/Plain Craft Launcher 2/Modules/ModMusic.vb
index 8377aef..cc1ace6 100644
--- a/Plain Craft Launcher 2/Modules/ModMusic.vb
+++ b/Plain Craft Launcher 2/Modules/ModMusic.vb
@@ -69,16 +69,25 @@
Else
'有背景音乐
FrmMain.BtnExtraMusic.Show = True
-
- Dim ToolTipText As String = "正在播放：" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
+ Dim ToolTipText As String
If MusicState = MusicStates.Pause Then
FrmMain.BtnExtraMusic.Logo = Logo.IconPlay
FrmMain.BtnExtraMusic.LogoScale = 0.8
- If MusicAllList.Count > 1 Then ToolTipText += vbCrLf & "左键播放，右键播放下一曲。"
+ ToolTipText = "已暂停：" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
+ If MusicAllList.Count > 1 Then
+ ToolTipText += vbCrLf & "左键恢复播放，右键播放下一曲。"
+ Else
+ ToolTipText += vbCrLf & "左键恢复播放，右键重新从头播放。"
+ End If
Else
FrmMain.BtnExtraMusic.Logo = Logo.IconMusic
FrmMain.BtnExtraMusic.LogoScale = 1
- If MusicAllList.Count > 1 Then ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。"
+ ToolTipText = "正在播放：" & GetFileNameWithoutExtentionFromPath(MusicCurrent)
+ If MusicAllList.Count > 1 Then
+ ToolTipText += vbCrLf & "左键暂停，右键播放下一曲。"
+ Else
+ ToolTipText += vbCrLf & "左键暂停，右键重新从头播放。"
+ End If
End If
FrmMain.BtnExtraMusic.ToolTip = ToolTipText
ToolTipService.SetVerticalOffset(FrmMain.BtnExtraMusic, If(ToolTipText.Contains(vbLf), 10, 16))
@@ -115,13 +124,14 @@
'''
Public Sub MusicControlNext()
If MusicAllList.Count = 1 Then
- Hint("播放列表中仅有一首歌曲！")
+ MusicStartPlay(MusicCurrent)
+ Hint("重新播放：" & GetFileNameFromPath(MusicCurrent), HintType.Finish)
Else
Dim Address As String = DequeueNextMusicAddress()
MusicStartPlay(Address)
Hint("正在播放：" & GetFileNameFromPath(Address), HintType.Finish)
- MusicRefreshUI()
End If
+ MusicRefreshUI()
End Sub
#End Region
diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb
index d60f952..f6e0a36 100644
--- a/Plain Craft Launcher 2/Modules/ModSecret.vb
+++ b/Plain Craft Launcher 2/Modules/ModSecret.vb
@@ -252,6 +252,7 @@ Friend Module ModSecret
Return False
End Function
Public Function DonateCodeInput() As Boolean?
+ Return Nothing
End Function
#End Region
diff --git a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb
index 885e140..5a7874b 100644
--- a/Plain Craft Launcher 2/My Project/AssemblyInfo.vb
+++ b/Plain Craft Launcher 2/My Project/AssemblyInfo.vb
@@ -51,6 +51,6 @@ Imports System.Runtime.InteropServices
' 可以指定所有值，也可以使用以下所示的 "*" 预置版本号和修订号
' 方法是按如下所示使用“*”
-
-
+
+
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
index 3b02dc6..866c3e1 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/ModDownloadLib.vb
@@ -316,46 +316,6 @@ Public Module ModDownloadLib
#Region "OptiFine 下载"
- Public Sub McDownloadOptiFine(DownloadInfo As DlOptiFineListEntry)
- Try
- Dim Id As String = DownloadInfo.NameVersion
- Dim VersionFolder As String = PathMcFolder & "versions\" & Id & "\"
- Dim IsNewVersion As Boolean = Val(DownloadInfo.Inherit.Split(".")(1)) >= 14
- Dim Target As String = If(IsNewVersion,
- PathTemp & "Cache\Code\" & DownloadInfo.NameVersion & "_" & GetUuid(),
- PathMcFolder & "libraries\optifine\OptiFine\" & DownloadInfo.NameFile.Replace("OptiFine_", "").Replace(".jar", "").Replace("preview_", "") & "\" & DownloadInfo.NameFile.Replace("OptiFine_", "OptiFine-").Replace("preview_", ""))
-
- '重复任务检查
- SyncLock LoaderTaskbarLock
- For i = 0 To LoaderTaskbar.Count - 1
- If LoaderTaskbar(i).Name = "OptiFine " & DownloadInfo.NameDisplay & " 下载" Then
- Hint("该版本正在下载中！", HintType.Critical)
- Exit Sub
- End If
- Next
- End SyncLock
-
- '已有版本检查
- If File.Exists(VersionFolder & Id & ".json") Then
- If MyMsgBox("版本 " & Id & " 已存在，是否重新下载？" & vbCrLf & "这会覆盖版本的 json 和 jar 文件，但不会影响版本隔离的文件。", "版本已存在", "继续", "取消") = 1 Then
- File.Delete(VersionFolder & Id & ".jar")
- File.Delete(VersionFolder & Id & ".json")
- Else
- Exit Sub
- End If
- End If
-
- '启动
- Dim Loader As New LoaderCombo(Of String)("OptiFine " & DownloadInfo.NameDisplay & " 下载", McDownloadOptiFineLoader(DownloadInfo)) With {.OnStateChanged = AddressOf McInstallState}
- Loader.Start(VersionFolder)
- LoaderTaskbarAdd(Loader)
- FrmMain.BtnExtraDownload.ShowRefresh()
- FrmMain.BtnExtraDownload.Ribble()
-
- Catch ex As Exception
- Log(ex, "开始 OptiFine 下载失败", LogLevel.Feedback)
- End Try
- End Sub
Private Sub McDownloadOptiFineSave(DownloadInfo As DlOptiFineListEntry)
Try
Dim Id As String = DownloadInfo.NameVersion
@@ -1005,74 +965,13 @@ Retry:
#End Region
-#Region "Forge 下载"
+#Region "Forgelike 下载"
- Public Sub McDownloadForge(DownloadInfo As DlForgeVersionEntry)
- '老版本提示
- If DownloadInfo.Category = "client" Then
- If MyMsgBox("该 Forge 版本过于古老，PCL 暂不支持该版本的自动安装。" & vbCrLf &
- "若你仍然希望继续，PCL 将把安装程序下载到你指定的位置，但不会进行安装。",
- "版本过老", "继续", "取消") = 1 Then
- McDownloadForgeSave(DownloadInfo)
- End If
- Exit Sub
- End If
- If DownloadInfo.Category = "universal" OrElse DownloadInfo.Inherit.StartsWithF("1.5") Then '对该版本自动安装的支持将在之后加入
- If MyMsgBox("该 Forge 版本过于古老，PCL 暂不支持该版本的自动安装。" & vbCrLf &
- "若你仍然希望继续，PCL 将把安装程序下载到你指定的位置，但不会进行安装。",
- "版本过老", "继续", "取消") = 1 Then
- McDownloadForgeSave(DownloadInfo)
- End If
- Exit Sub
- End If
- '初始化参数
- Dim Id As String = DownloadInfo.Inherit & "-forge-" & DownloadInfo.Version
- Dim Target As String = PathTemp & "Cache\Code\ForgeInstall-" & DownloadInfo.Version & "_" & GetUuid() & "." & DownloadInfo.FileSuffix
- Dim VersionFolder As String = PathMcFolder & "versions\" & Id & "\"
- Dim DisplayName As String = "Forge " & DownloadInfo.Inherit & " - " & DownloadInfo.Version
+ Public Sub McDownloadForgelikeSave(Info As DlForgelikeEntry)
Try
-
- '重复任务检查
- SyncLock LoaderTaskbarLock
- For i = 0 To LoaderTaskbar.Count - 1
- If LoaderTaskbar(i).Name = DisplayName & " 下载" Then
- Hint("该版本正在下载中！", HintType.Critical)
- Exit Sub
- End If
- Next
- End SyncLock
-
- '已有版本检查
- If File.Exists(VersionFolder & Id & ".json") Then
- If MyMsgBox("版本 " & Id & " 已存在，是否重新下载？" & vbCrLf & "这会覆盖版本的 json 和 jar 文件，但不会影响版本隔离的文件。", "版本已存在", "继续", "取消") = 1 Then
- File.Delete(VersionFolder & Id & ".jar")
- File.Delete(VersionFolder & Id & ".json")
- Else
- Exit Sub
- End If
- End If
-
- '启动
- Dim Loader As New LoaderCombo(Of String)(DisplayName & " 下载", McDownloadForgeLoader(DownloadInfo.Version, DownloadInfo.Inherit, DownloadInfo)) With {.OnStateChanged = AddressOf McInstallState}
- Loader.Start(VersionFolder)
- LoaderTaskbarAdd(Loader)
- FrmMain.BtnExtraDownload.ShowRefresh()
- FrmMain.BtnExtraDownload.Ribble()
-
- Catch ex As Exception
- Log(ex, "开始 Forge 下载失败", LogLevel.Feedback)
- Finally
- '删除安装包
- Try
- If File.Exists(Target) Then File.Delete(Target)
- Catch
- End Try
- End Try
- End Sub
- Public Sub McDownloadForgeSave(DownloadInfo As DlForgeVersionEntry)
- Try
- Dim Target As String = SelectAs("选择保存位置", DownloadInfo.FileName, "Forge 文件 (*." & DownloadInfo.FileSuffix & ")|*." & DownloadInfo.FileSuffix)
- Dim DisplayName As String = "Forge " & DownloadInfo.Inherit & " - " & DownloadInfo.Version
+ Dim Target As String = SelectAs("选择保存位置", $"{Info.LoaderName}-{Info.Inherit}-{Info.VersionName}.{Info.FileExtension}",
+ $"{Info.LoaderName} 安装器 (*.{Info.FileExtension})|*.{Info.FileExtension}")
+ Dim DisplayName As String = $"{Info.LoaderName} {Info.Inherit} - {Info.VersionName}"
If Not Target.Contains("\") Then Exit Sub
'重复任务检查
@@ -1085,34 +984,41 @@ Retry:
Next
End SyncLock
- '构造步骤加载器
- Dim Loaders As New List(Of LoaderBase)
'获取下载地址
- Loaders.Add(New LoaderTask(Of DlForgeVersionEntry, List(Of NetFile))("获取下载地址",
- Sub(Task As LoaderTask(Of DlForgeVersionEntry, List(Of NetFile)))
- Dim Files As New List(Of NetFile)
+ Dim Files As New List(Of NetFile)
+ If Info.IsNeoForge Then
+ 'NeoForge
+ Dim Neo As DlNeoForgeListEntry = Info
+ Dim Url As String = Neo.UrlBase & "-installer.jar"
Files.Add(New NetFile({
- "https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/" & DownloadInfo.Inherit & "-" & DownloadInfo.FileVersion & "/" & DownloadInfo.FileName,
- "https://files.minecraftforge.net/maven/net/minecraftforge/forge/" & DownloadInfo.Inherit & "-" & DownloadInfo.FileVersion & "/" & DownloadInfo.FileName
- }, Target, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash)))
- Task.Output = Files
- End Sub) With {.ProgressWeight = 0.1, .Show = False})
- '下载
- Loaders.Add(New LoaderDownload("下载主文件", New List(Of NetFile)) With {.ProgressWeight = 6})
+ Url.Replace("maven.neoforged.net/releases", "bmclapi2.bangbang93.com/maven"), Url
+ }, Target, New FileChecker(MinSize:=64 * 1024)))
+ Else
+ 'Forge
+ Dim Forge As DlForgeVersionEntry = Info
+ Files.Add(New NetFile({
+ $"https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/{Forge.Inherit}-{Forge.FileVersion}/forge-{Forge.Inherit}-{Forge.FileVersion}-{Forge.Category}.{Forge.FileExtension}",
+ $"https://files.minecraftforge.net/maven/net/minecraftforge/forge/{Forge.Inherit}-{Forge.FileVersion}/forge-{Forge.Inherit}-{Forge.FileVersion}-{Forge.Category}.{Forge.FileExtension}"
+ }, Target, New FileChecker(MinSize:=64 * 1024, Hash:=Forge.Hash)))
+ End If
+
+ '构造加载器
+ Dim Loaders As New List(Of LoaderBase)
+ Loaders.Add(New LoaderDownload("下载主文件", Files) With {.ProgressWeight = 6})
'启动
- Dim Loader As New LoaderCombo(Of DlForgeVersionEntry)(DisplayName & " 下载", Loaders) With {.OnStateChanged = AddressOf DownloadStateSave}
- Loader.Start(DownloadInfo)
+ Dim Loader = New LoaderCombo(Of DlForgelikeEntry)(DisplayName & " 下载", Loaders) With {.OnStateChanged = AddressOf DownloadStateSave}
+ Loader.Start(Info)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
FrmMain.BtnExtraDownload.Ribble()
Catch ex As Exception
- Log(ex, "开始 Forge 下载失败", LogLevel.Feedback)
+ Log(ex, $"开始 {Info.LoaderName} 安装器下载失败", LogLevel.Feedback)
End Try
End Sub
- Private Sub ForgeInjector(Target As String, Task As LoaderTask(Of Boolean, Boolean), McFolder As String, UseJavaWrapper As Boolean)
+ Private Sub ForgelikeInjector(Target As String, Task As LoaderTask(Of Boolean, Boolean), McFolder As String, UseJavaWrapper As Boolean, IsNeoForge As Boolean)
'选择 Java
Dim Java As JavaEntry
SyncLock JavaLock
@@ -1153,7 +1059,8 @@ Retry:
.RedirectStandardError = True,
.RedirectStandardOutput = True
}
- Log("[Download] 开始安装 Forge：" & Arguments)
+ Dim LoaderName As String = If(IsNeoForge, "NeoForge", "Forge")
+ Log($"[Download] 开始安装 {LoaderName}：" & Arguments)
Dim process As New Process With {.StartInfo = Info}
Dim LastResults As New Queue(Of String)
Using outputWaitHandle As New AutoResetEvent(False)
@@ -1166,15 +1073,15 @@ Retry:
Else
LastResults.Enqueue(e.Data)
If LastResults.Count > 100 Then LastResults.Dequeue()
- ForgeInjectorLine(e.Data, Task)
+ ForgelikeInjectorLine(e.Data, Task)
End If
Catch ex As ObjectDisposedException
Catch ex As Exception
- Log(ex, "读取 Forge 安装器信息失败")
+ Log(ex, $"读取 {LoaderName} 安装器信息失败")
End Try
Try
If Task.State = LoadState.Aborted AndAlso Not process.HasExited Then
- Log("[Installer] 由于任务取消，已中止 Forge 安装")
+ Log($"[Installer] 由于任务取消，已中止 {LoaderName} 安装")
process.Kill()
End If
Catch
@@ -1189,15 +1096,15 @@ Retry:
Else
LastResults.Enqueue(e.Data)
If LastResults.Count > 100 Then LastResults.Dequeue()
- ForgeInjectorLine(e.Data, Task)
+ ForgelikeInjectorLine(e.Data, Task)
End If
Catch ex As ObjectDisposedException
Catch ex As Exception
- Log(ex, "读取 Forge 安装器错误信息失败")
+ Log(ex, $"读取 {LoaderName} 安装器错误信息失败")
End Try
Try
If Task.State = LoadState.Aborted AndAlso Not process.HasExited Then
- Log("[Installer] 由于任务取消，已中止 Forge 安装")
+ Log($"[Installer] 由于任务取消，已中止 {LoaderName} 安装")
process.Kill()
End If
Catch
@@ -1222,116 +1129,135 @@ Retry:
For i As Integer = Math.Max(0, LastResults.Count - 5) To LastResults.Count - 1 '最后 5 行
LastLines &= vbCrLf & LastResults(i)
Next
- Throw New Exception("Forge 安装器出错，日志结束部分为：" & LastLines)
+ Throw New Exception($"{LoaderName} 安装器出错，日志结束部分为：" & LastLines)
End Using
End Using
End SyncLock
End Sub
- Private Sub ForgeInjectorLine(Content As String, Task As LoaderTask(Of Boolean, Boolean))
- If Content.StartsWithF(" Data") OrElse Content.StartsWithF(" Slim") Then
- If ModeDebug Then Log("[Installer] " & Content)
- ElseIf Content.StartsWithF(" Reading patch ") Then
- If ModeDebug Then Log("[Installer] " & Content)
- Task.Progress = 0.86
- Else
- Select Case Content
- Case "Extracting json"
- Log("[Installer] " & Content)
- Task.Progress = 0.07
- Case "Downloading libraries"
- Log("[Installer] " & Content)
- Task.Progress = 0.08
- Case " File exists: Checksum validated."
- If ModeDebug Then Log("[Installer] " & Content)
- Task.Progress += 0.003
- Case "Building Processors"
- Task.Progress = 0.38
- Case "Task: DOWNLOAD_MOJMAPS" 'B
- Task.Progress = 0.4
- Case "Task: MERGE_MAPPING" 'B
- Task.Progress = 0.6
- Case "Splitting: "
- Task.Progress = 0.62
- Case "Parameter Annotations" 'B
- Task.Progress = 0.66
- Case "Processing Complete" 'B
- Task.Progress = 0.7
- Case "Remapping final jar" 'A
- Task.Progress = 0.72
- Case "Remapping jar... 50%" 'A
- Task.Progress = 0.76
- Case "Remapping jar... 100%" 'A
- Task.Progress = 0.81
- Case "Injecting profile"
- Task.Progress = 0.91
- Case Else
- If ModeDebug Then Log("[Installer] " & Content)
- Exit Sub
- End Select
- Log("[Installer] " & Content)
- End If
+ Private Sub ForgelikeInjectorLine(Content As String, Task As LoaderTask(Of Boolean, Boolean))
+ Select Case Content
+ Case "Extracting json"
+ Log("[Installer] " & Content)
+ Task.Progress = 0.07
+ Case "Downloading libraries"
+ Log("[Installer] " & Content)
+ Task.Progress = 0.08
+ Case " File exists: Checksum validated."
+ If ModeDebug Then Log("[Installer] " & Content)
+ Task.Progress += 0.003
+ Case "Building Processors"
+ Task.Progress = 0.18
+ Case "Task: DOWNLOAD_MOJMAPS" 'B
+ Task.Progress = 0.2
+ Case "Task: MERGE_MAPPING" 'B
+ Task.Progress = 0.3
+ Case "Splitting: "
+ Task.Progress = 0.35
+ Case "Parameter Annotations" 'B
+ Task.Progress = 0.4
+ Case "Processing Complete" 'B
+ Task.Progress = 0.5
+ Case "log: null" 'new
+ Task.Progress = 0.5
+ Case "Sorting" 'new
+ Task.Progress = 0.65
+ Case "Remapping final jar" 'A
+ Task.Progress = 0.72
+ Case "Remapping jar... 50%" 'A
+ Task.Progress = 0.76
+ Case "Remapping jar... 100%" 'A
+ Task.Progress = 0.81
+ Case "Injecting profile"
+ Task.Progress = 0.91
+ Case Else
+ If ModeDebug Then Log("[Installer] " & Content)
+ Exit Sub
+ End Select
+ Log("[Installer] " & Content)
End Sub
'''
- ''' 获取下载某个 Forge 版本的加载器列表。
+ ''' 获取下载某个 Forgelike 版本的加载器列表。
'''
- Private Function McDownloadForgeLoader(Version As String, Inherit As String, Optional DownloadInfo As DlForgeVersionEntry = Nothing, Optional McFolder As String = Nothing, Optional ClientDownloadLoader As LoaderCombo(Of String) = Nothing, Optional ClientFolder As String = Nothing, Optional FixLibrary As Boolean = True) As List(Of LoaderBase)
+ Private Function McDownloadForgelikeLoader(IsNeoForge As Boolean, LoaderVersion As String, TargetVersion As String, Inherit As String, Optional Info As DlForgelikeEntry = Nothing, Optional McFolder As String = Nothing, Optional ClientDownloadLoader As LoaderCombo(Of String) = Nothing, Optional ClientFolder As String = Nothing) As List(Of LoaderBase)
'参数初始化
McFolder = If(McFolder, PathMcFolder)
- If Version.StartsWithF("1.") AndAlso Version.Contains("-") Then
- '类似 1.19.3-41.2.8 格式，优先使用 Version 中要求的版本而非 Inherit（例如 1.19.3 却使用了 1.19 的 Forge）
- Inherit = Version.Before("-")
- Version = Version.After("-")
+ If IsNeoForge AndAlso Info Is Nothing Then
+ '需要传入 API Name，但整合包版本可能不以 1.20.1- 开头，所以需要进行特别处理
+ If Inherit = "1.20.1" AndAlso Not LoaderVersion.StartsWithF("1.20.1-") Then
+ Info = New DlNeoForgeListEntry("1.20.1-" & LoaderVersion)
+ Else
+ Info = New DlNeoForgeListEntry(LoaderVersion)
+ End If
End If
+ If Not IsNeoForge AndAlso LoaderVersion.StartsWithF("1.") AndAlso LoaderVersion.Contains("-") Then
+ '类似 1.19.3-41.2.8 格式，优先使用 Version 中要求的版本而非 Inherit（例如 1.19.3 却使用了 1.19 的 Forge）
+ Inherit = LoaderVersion.Before("-")
+ LoaderVersion = LoaderVersion.After("-")
+ End If
+ Dim LoaderName As String = If(IsNeoForge, "NeoForge", "Forge")
Dim IsCustomFolder As Boolean = McFolder <> PathMcFolder
- Dim Id As String = Inherit & "-forge-" & Version
- Dim InstallerAddress As String = PathTemp & "Cache\Code\ForgeInstall-" & Version & "_" & RandomInteger(0, 100000)
- Dim VersionFolder As String = McFolder & "versions\" & Id & "\"
- Dim DisplayName As String = "Forge " & Inherit & " - " & Version
+ Dim InstallerAddress As String = $"{PathTemp}Cache\Code\{LoaderName}Install-{LoaderVersion}_{RandomInteger(0, 100000)}"
+ Dim VersionFolder As String = $"{McFolder}versions\{TargetVersion}\"
+ Dim DisplayName As String = $"{LoaderName} {Inherit} - {LoaderVersion}"
Dim Loaders As New List(Of LoaderBase)
- Dim LibVersionFolder As String = PathMcFolder & "versions\" & Id & "\" '作为 Lib 文件目标的版本文件夹
+ Dim LibVersionFolder As String = $"{PathMcFolder}versions\{TargetVersion}\" '作为 Lib 文件目标的版本文件夹
- '获取下载信息
- If DownloadInfo Is Nothing Then
- Loaders.Add(New LoaderTask(Of String, String)("获取 Mod 加载器详细信息",
+ '获取 Forge 下载信息
+ If Info Is Nothing Then
+ Loaders.Add(New LoaderTask(Of String, String)($"获取 {LoaderName} 详细信息",
Sub(Task As LoaderTask(Of String, String))
- '获取 Forge 版本列表
+ '获取 Forge 对应 MC 版本列表
Dim ForgeLoader = New LoaderTask(Of String, List(Of DlForgeVersionEntry))("McDownloadForgeLoader " & Inherit, AddressOf DlForgeVersionMain)
ForgeLoader.WaitForExit(Inherit)
Task.Progress = 0.8
'查找对应版本
For Each ForgeVersion In ForgeLoader.Output
- If ForgeVersion.Version = Version Then
- DownloadInfo = ForgeVersion
+ If VersionSortInteger(ForgeVersion.Version.ToString, LoaderVersion) = 0 Then
+ Info = ForgeVersion
Exit Sub
End If
Next
- Throw New Exception("未能找到 Forge " & Inherit & "-" & Version & " 的详细信息！")
+ Throw New Exception($"未能找到 {LoaderName} " & Inherit & "-" & LoaderVersion & " 的详细信息！")
End Sub) With {.ProgressWeight = 3})
End If
- '下载 Forge 主文件
- Loaders.Add(New LoaderTask(Of String, List(Of NetFile))("准备 Mod 加载器下载",
- Sub(Task As LoaderTask(Of String, List(Of NetFile)))
- '启动依赖版本的下载
- If ClientDownloadLoader Is Nothing Then
- If IsCustomFolder Then Throw New Exception("如果没有指定原版下载器，则不能指定 MC 安装文件夹")
- ClientDownloadLoader = McDownloadClient(NetPreDownloadBehaviour.ExitWhileExistsOrDownloading, Inherit)
- End If
- '添加主文件
- Dim Files As New List(Of NetFile) From {New NetFile({
- "https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/" & Inherit & "-" & DownloadInfo.FileVersion & "/" & DownloadInfo.FileName,
- "https://files.minecraftforge.net/maven/net/minecraftforge/forge/" & Inherit & "-" & DownloadInfo.FileVersion & "/" & DownloadInfo.FileName
- }, InstallerAddress, New FileChecker(MinSize:=64 * 1024, Hash:=DownloadInfo.Hash))}
- Task.Output = Files
- End Sub) With {.ProgressWeight = 0.5, .Show = False})
- Loaders.Add(New LoaderDownload("下载 Mod 加载器主文件", New List(Of NetFile)) With {.ProgressWeight = 9})
+ '下载 Forgelike 主文件
+ Loaders.Add(New LoaderTask(Of String, List(Of NetFile))($"准备下载 {LoaderName}",
+ Sub(Task As LoaderTask(Of String, List(Of NetFile)))
+ '启动依赖版本的下载
+ If ClientDownloadLoader Is Nothing Then
+ If IsCustomFolder Then Throw New Exception("如果没有指定原版下载器，则不能指定 MC 安装文件夹")
+ ClientDownloadLoader = McDownloadClient(NetPreDownloadBehaviour.ExitWhileExistsOrDownloading, Inherit)
+ End If
+ '添加主文件下载
+ Dim Files As New List(Of NetFile)
+ If Info.IsNeoForge Then
+ 'NeoForge
+ Dim Neo As DlNeoForgeListEntry = Info
+ Dim Url As String = Neo.UrlBase & "-installer.jar"
+ Files.Add(New NetFile({
+ Url.Replace("maven.neoforged.net/releases", "bmclapi2.bangbang93.com/maven"), Url
+ }, InstallerAddress, New FileChecker(MinSize:=64 * 1024)))
+ Else
+ 'Forge
+ Dim Forge As DlForgeVersionEntry = Info
+ Dim FileName As String =
+ $"{Forge.Inherit.Replace("-", "_")}-{Forge.FileVersion}/forge-{Forge.Inherit.Replace("-", "_")}-{Forge.FileVersion}-{Forge.Category}.{Forge.FileExtension}"
+ Files.Add(New NetFile({
+ $"https://bmclapi2.bangbang93.com/maven/net/minecraftforge/forge/{FileName}",
+ $"https://files.minecraftforge.net/maven/net/minecraftforge/forge/{FileName}"
+ }, InstallerAddress, New FileChecker(MinSize:=64 * 1024, Hash:=Forge.Hash)))
+ End If
+ Task.Output = Files
+ End Sub) With {.ProgressWeight = 0.5, .Show = False})
+ Loaders.Add(New LoaderDownload($"下载 {LoaderName} 主文件", New List(Of NetFile)) With {.ProgressWeight = 9})
'安装（仅在新版安装时需要原版 Jar）
- If Version.Before(".") >= 20 Then
- Log("[Download] 检测为新版 Forge：" & Version)
+ If IsNeoForge OrElse LoaderVersion.Before(".") >= 20 Then
+ Log($"[Download] 检测为{If(IsNeoForge, " Neo", "新版 ")}Forge：" & LoaderVersion)
Dim Libs As List(Of McLibToken) = Nothing
- Loaders.Add(New LoaderTask(Of String, List(Of NetFile))("分析 Mod 加载器支持库文件",
+ Loaders.Add(New LoaderTask(Of String, List(Of NetFile))($"分析 {LoaderName} 支持库文件",
Sub(Task As LoaderTask(Of String, List(Of NetFile)))
Task.Output = New List(Of NetFile)
Dim Installer As ZipArchive = Nothing
@@ -1357,27 +1283,27 @@ Retry:
Log("[Download] 需要下载 Mappings：" & Address)
End If
Task.Progress = 0.8
- '去除其中的原始 Forge 项
+ '去除其中的原始 Forgelike 项
For i = 0 To Libs.Count - 1
- If Libs(i).LocalPath.EndsWithF("forge-" & Inherit & "-" & Version & ".jar") OrElse
- Libs(i).LocalPath.EndsWithF("forge-" & Inherit & "-" & Version & "-client.jar") Then
- Log("[Download] 已从待下载 Forge 支持库中移除：" & Libs(i).LocalPath, LogLevel.Debug)
+ If Libs(i).LocalPath.EndsWithF($"{LoaderName.ToLower}-{Inherit}-{LoaderVersion}.jar") OrElse
+ Libs(i).LocalPath.EndsWithF($"{LoaderName.ToLower}-{Inherit}-{LoaderVersion}-client.jar") Then
+ Log($"[Download] 已从待下载 {LoaderName} 支持库中移除：" & Libs(i).LocalPath, LogLevel.Debug)
Libs.RemoveAt(i)
Exit For
End If
Next
Task.Output = McLibFixFromLibToken(Libs, PathMcFolder)
Catch ex As Exception
- Throw New Exception("获取新版 Forge 支持库列表失败", ex)
+ Throw New Exception($"获取{If(IsNeoForge, " Neo", "新版 ")}Forge 支持库列表失败", ex)
Finally
'释放文件
If Installer IsNot Nothing Then Installer.Dispose()
End Try
End Sub) With {.ProgressWeight = 2})
- Loaders.Add(New LoaderDownload("下载 Mod 加载器支持库文件", New List(Of NetFile)) With {.ProgressWeight = 12})
- Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("获取 Mod 下载器支持库文件",
+ Loaders.Add(New LoaderDownload($"下载 {LoaderName} 支持库文件", New List(Of NetFile)) With {.ProgressWeight = 12})
+ Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)($"获取 {LoaderName} 支持库文件",
Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
-#Region "Forge 文件"
+#Region "Forgelike 文件"
If IsCustomFolder Then
For Each LibFile As McLibToken In Libs
Dim RealPath As String = LibFile.LocalPath.Replace(PathMcFolder, McFolder)
@@ -1385,7 +1311,7 @@ Retry:
Directory.CreateDirectory(IO.Path.GetDirectoryName(RealPath))
CopyFile(LibFile.LocalPath, RealPath)
End If
- If ModeDebug Then Log("[Download] 复制的 Forge 支持库文件：" & LibFile.LocalPath)
+ If ModeDebug Then Log($"[Download] 复制的 {LoaderName} 支持库文件：" & LibFile.LocalPath)
Next
End If
#End Region
@@ -1393,9 +1319,9 @@ Retry:
'等待原版文件下载完成
If ClientDownloadLoader Is Nothing Then Exit Sub
Dim TargetLoaders As List(Of LoaderBase) =
- ClientDownloadLoader.GetLoaderList.Where(Function(l) l.Name = McDownloadClientLibName OrElse l.Name = McDownloadClientJsonName).
- Where(Function(l) l.State <> LoadState.Finished).ToList
- If TargetLoaders.Any Then Log("[Download] Forge 安装正在等待原版文件下载完成")
+ ClientDownloadLoader.GetLoaderList.Where(Function(l) l.Name = McDownloadClientLibName OrElse l.Name = McDownloadClientJsonName).
+ Where(Function(l) l.State <> LoadState.Finished).ToList()
+ If TargetLoaders.Any Then Log($"[Download] {LoaderName} 安装正在等待原版文件下载完成")
Do While TargetLoaders.Any AndAlso Not Task.IsAborted
TargetLoaders = TargetLoaders.Where(Function(l) l.State <> LoadState.Finished).ToList
Thread.Sleep(50)
@@ -1415,14 +1341,13 @@ Retry:
End SyncLock
#End Region
End Sub) With {.ProgressWeight = 0.1, .Show = False})
- Loaders.Add(New LoaderTask(Of Boolean, Boolean)("安装 Mod 加载器（方式 A）",
+ Loaders.Add(New LoaderTask(Of Boolean, Boolean)(If(IsNeoForge, "安装 NeoForge", "安装 Forge（方式 A）"),
Sub(Task As LoaderTask(Of Boolean, Boolean))
Dim Installer As ZipArchive = Nothing
Try
- Log("[Download] 开始进行新版方式 Forge 安装：" & InstallerAddress)
+ Log($"[Download] 开始进行 Forgelike 安装：" & InstallerAddress)
'记录当前文件夹列表（在新建目标文件夹之前）
- Dim OldList = New DirectoryInfo(McFolder & "versions\").EnumerateDirectories.
- Select(Function(i) i.FullName).ToList()
+ Dim OldList = New DirectoryInfo(McFolder & "versions\").EnumerateDirectories.Select(Function(i) i.FullName).ToList()
'解压并获取信息
Installer = New ZipArchive(New FileStream(InstallerAddress, FileMode.Open))
Dim Json As JObject = GetJson(ReadFile(Installer.GetEntry("install_profile.json").Open))
@@ -1440,15 +1365,15 @@ Retry:
WriteFile(PathTemp & "Cache\forge_installer.jar", GetResources("ForgeInstaller"))
Task.Progress = 0.06
'运行注入器
- ForgeInjector(InstallerAddress, Task, McFolder, UseJavaWrapper)
+ ForgelikeInjector(InstallerAddress, Task, McFolder, UseJavaWrapper, IsNeoForge)
Task.Progress = 0.97
Catch ex As Exception
If UseJavaWrapper Then
- Log(ex, "使用 JavaWrapper 安装 Forge 失败，将不使用 JavaWrapper 并重试")
+ Log(ex, $"使用 JavaWrapper 安装 {LoaderName} 失败，将不使用 JavaWrapper 并重试")
UseJavaWrapper = False
GoTo Retry
Else
- Throw New Exception("运行 Forge 安装器失败", ex)
+ Throw New Exception($"运行 {LoaderName} 安装器失败", ex)
End If
End Try
'拷贝新增的版本 Json
@@ -1457,29 +1382,38 @@ Retry:
If DeltaList.Count > 1 Then
'它可能和 OptiFine 安装同时运行，导致增加的文件不止一个（这导致了 #151）
'也可能是因为 Forge 安装器的 Bug，生成了一个名字错误的文件夹，所以需要检查文件夹是否为空
- DeltaList = DeltaList.Where(Function(l) l.Name.Contains("forge") AndAlso l.EnumerateFiles.Any).ToList
+ DeltaList = DeltaList.Where(Function(l) l.Name.ContainsF("forge", True) AndAlso l.EnumerateFiles.Any).ToList
End If
- If DeltaList.Count = 1 Then '如果没有新增文件夹，那么预测的文件夹名就是正确的
+ If DeltaList.Count = 1 Then
+ '如果没有新增文件夹，那么预测的文件夹名就是正确的
+ '如果只新增 1 个文件夹，那么拷贝 json 文件
Dim JsonFile As FileInfo = DeltaList(0).EnumerateFiles.First()
- WriteFile(VersionFolder & Id & ".json", ReadFile(JsonFile.FullName))
+ WriteFile(VersionFolder & TargetVersion & ".json", ReadFile(JsonFile.FullName))
+ Log($"[Download] 已拷贝新增的版本 JSON 文件：{JsonFile.FullName} -> {VersionFolder}{TargetVersion}.json")
+ ElseIf DeltaList.Count > 1 Then
+ '新增了多个文件夹
+ Log($"[Download] 有多个疑似的新增版本，无法确定：{DeltaList.Select(Function(d) d.Name).Join(";")}")
+ Else
+ '没有新增文件夹
+ Log("[Download] 未找到新增的版本文件夹")
End If
'新建 mods 文件夹
Directory.CreateDirectory(New McVersion(VersionFolder).GetPathIndie(True) & "mods\")
Catch ex As Exception
- Throw New Exception("安装新 Forge 版本失败", ex)
+ Throw New Exception($"安装新 {LoaderName} 版本失败", ex)
Finally
'清理文件
Try
If Installer IsNot Nothing Then Installer.Dispose()
If File.Exists(InstallerAddress) Then File.Delete(InstallerAddress)
Catch ex As Exception
- Log(ex, "安装 Forge 清理文件时出错")
+ Log(ex, $"安装 {LoaderName} 清理文件时出错")
End Try
End Try
End Sub) With {.ProgressWeight = 10})
Else
- Log("[Download] 检测为非新版 Forge：" & Version)
- Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)("安装 Mod 加载器（方式 B）",
+ Log("[Download] 检测为非新版 Forge：" & LoaderVersion)
+ Loaders.Add(New LoaderTask(Of List(Of NetFile), Boolean)($"安装 {LoaderName}（方式 B）",
Sub(Task As LoaderTask(Of List(Of NetFile), Boolean))
Dim Installer As ZipArchive = Nothing
Try
@@ -1492,12 +1426,12 @@ Retry:
Directory.CreateDirectory(VersionFolder)
Task.Progress = 0.5
If Json("install") Is Nothing Then
- '中版格式
- Log("[Download] 进行中版方式安装：" & InstallerAddress)
+ '中版：Legacy 方式 1
+ Log("[Download] 开始进行 Forge 安装，Legacy 方式 1：" & InstallerAddress)
'建立 Json 文件
Dim JsonVersion As JObject = GetJson(ReadFile(Installer.GetEntry(Json("json").ToString.TrimStart("/")).Open))
- JsonVersion("id") = Id
- WriteFile(VersionFolder & Id & ".json", JsonVersion.ToString)
+ JsonVersion("id") = TargetVersion
+ WriteFile(VersionFolder & TargetVersion & ".json", JsonVersion.ToString)
Task.Progress = 0.6
'解压支持库文件
Installer.Dispose()
@@ -1505,17 +1439,17 @@ Retry:
CopyDirectory(InstallerAddress & "_unrar\maven\", McFolder & "libraries\")
DeleteDirectory(InstallerAddress & "_unrar\")
Else
- '旧版格式
- Log("[Download] 进行旧版方式安装：" & InstallerAddress)
+ '旧版：Legacy 方式 2
+ Log("[Download] 开始进行 Forge 安装，Legacy 方式 2：" & InstallerAddress)
'解压 Jar 文件
Dim JarAddress As String = McLibGet(Json("install")("path"), CustomMcFolder:=McFolder)
If File.Exists(JarAddress) Then File.Delete(JarAddress)
WriteFile(JarAddress, Installer.GetEntry(Json("install")("filePath")).Open)
Task.Progress = 0.9
'建立 Json 文件
- Json("versionInfo")("id") = Id
+ Json("versionInfo")("id") = TargetVersion
If Json("versionInfo")("inheritsFrom") Is Nothing Then CType(Json("versionInfo"), JObject).Add("inheritsFrom", Inherit)
- WriteFile(VersionFolder & Id & ".json", Json("versionInfo").ToString)
+ WriteFile(VersionFolder & TargetVersion & ".json", Json("versionInfo").ToString)
End If
'新建 mods 文件夹
Directory.CreateDirectory(New McVersion(VersionFolder).GetPathIndie(True) & "mods\")
@@ -1532,11 +1466,6 @@ Retry:
End Try
End Try
End Sub) With {.ProgressWeight = 1})
- If FixLibrary Then
- If IsCustomFolder Then Throw New Exception("若需要补全支持库，就不能自定义 MC 文件夹")
- Loaders.Add(New LoaderTask(Of String, List(Of NetFile))("分析 Mod 加载器支持库文件", Sub(Task As LoaderTask(Of String, List(Of NetFile))) Task.Output = McLibFix(New McVersion(VersionFolder))) With {.ProgressWeight = 1, .Show = False})
- Loaders.Add(New LoaderDownload("下载 Mod 加载器支持库文件", New List(Of NetFile)) With {.ProgressWeight = 11})
- End If
End If
Return Loaders
@@ -1546,16 +1475,16 @@ Retry:
#Region "Forge 下载菜单"
- Public Sub ForgeDownloadListItemPreload(Stack As StackPanel, Entrys As List(Of DlForgeVersionEntry), OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean)
+ Public Sub ForgeDownloadListItemPreload(Stack As StackPanel, Entries As List(Of DlForgeVersionEntry), OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean)
'获取推荐版本与最新版本
Dim FreshVersion As DlForgeVersionEntry = Nothing
- If Entrys.Any Then
- FreshVersion = Entrys(0)
+ If Entries.Any Then
+ FreshVersion = Entries(0)
Else
Log("[System] 未找到可用的 Forge 版本", LogLevel.Debug)
End If
Dim RecommendedVersion As DlForgeVersionEntry = Nothing
- For Each Entry In Entrys
+ For Each Entry In Entries
If Entry.IsRecommended Then RecommendedVersion = Entry
Next
'若推荐版本与最新版本为同一版本，则仅显示推荐版本
@@ -1572,15 +1501,14 @@ Retry:
Stack.Children.Add(Fresh)
End If
'添加间隔
- Stack.Children.Add(New TextBlock With {.Text = "全部版本 (" & Entrys.Count & ")", .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 13, 0, 4)})
+ Stack.Children.Add(New TextBlock With {.Text = "全部版本 (" & Entries.Count & ")", .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 13, 0, 4)})
End Sub
Public Function ForgeDownloadListItem(Entry As DlForgeVersionEntry, OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean) As MyListItem
'建立控件
Dim NewItem As New MyListItem With {
- .Title = Entry.Version, .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Entry,
- .Info = If(Entry.ReleaseTime = "",
- If(ModeDebug, "种类：" & Entry.Category & If(Entry.Branch Is Nothing, "", "，开发分支：" & Entry.Branch), ""),
- "发布于 " & Entry.ReleaseTime & If(ModeDebug, "，种类：" & Entry.Category & If(Entry.Branch Is Nothing, "", "，开发分支：" & Entry.Branch), "")),
+ .Title = Entry.VersionName, .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Entry,
+ .Info = {If(Entry.ReleaseTime = "", "", "发布于 " & Entry.ReleaseTime), If(ModeDebug, "种类：" & Entry.Category, "")}.
+ Where(Function(d) d <> "").Join("，"),
.Logo = PathImage & "Blocks/Anvil.png"
}
AddHandler NewItem.Click, OnClick
@@ -1623,7 +1551,7 @@ Retry:
Else
Version = sender.Parent.Parent.Tag
End If
- OpenWebsite("https://files.minecraftforge.net/maven/net/minecraftforge/forge/" & Version.Inherit & "-" & Version.Version & "/forge-" & Version.Inherit & "-" & Version.Version & "-changelog.txt")
+ OpenWebsite($"https://files.minecraftforge.net/maven/net/minecraftforge/forge/{Version.Inherit}-{Version.VersionName}/forge-{Version.Inherit}-{Version.VersionName}-changelog.txt")
End Sub
Public Sub ForgeSave_Click(sender As Object, e As RoutedEventArgs)
Dim Version As DlForgeVersionEntry
@@ -1634,7 +1562,7 @@ Retry:
Else
Version = sender.Parent.Parent.Tag
End If
- McDownloadForgeSave(Version)
+ McDownloadForgelikeSave(Version)
End Sub
#End Region
@@ -1696,6 +1624,101 @@ Retry:
#End Region
+#Region "NeoForge 下载菜单"
+
+ Public Sub NeoForgeDownloadListItemPreload(Stack As StackPanel, Entries As List(Of DlNeoForgeListEntry), OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean)
+ '获取最新稳定版和测试版
+ Dim FreshStableVersion As DlNeoForgeListEntry = Nothing
+ Dim FreshBetaVersion As DlNeoForgeListEntry = Nothing
+ If Entries.Any() Then
+ For Each Entry In Entries.ToList()
+ If Entry.IsBeta Then
+ If FreshBetaVersion Is Nothing Then FreshBetaVersion = Entry
+ Else
+ FreshStableVersion = Entry
+ Exit For
+ End If
+ Next
+ Else
+ Log("[System] 未找到可用的 NeoForge 版本", LogLevel.Debug)
+ End If
+ '显示各个版本
+ If FreshStableVersion IsNot Nothing Then
+ Dim Fresh = NeoForgeDownloadListItem(FreshStableVersion, OnClick, IsSaveOnly)
+ Fresh.Info = If(Fresh.Info = "", "最新稳定版", "最新" & Fresh.Info)
+ Stack.Children.Add(Fresh)
+ End If
+ If FreshBetaVersion IsNot Nothing Then
+ Dim Fresh = NeoForgeDownloadListItem(FreshBetaVersion, OnClick, IsSaveOnly)
+ Fresh.Info = If(Fresh.Info = "", "最新测试版", "最新" & Fresh.Info)
+ Stack.Children.Add(Fresh)
+ End If
+ '添加间隔
+ Stack.Children.Add(New TextBlock With {.Text = "全部版本 (" & Entries.Count & ")", .HorizontalAlignment = HorizontalAlignment.Left, .Margin = New Thickness(6, 13, 0, 4)})
+ End Sub
+ Public Function NeoForgeDownloadListItem(Info As DlNeoForgeListEntry, OnClick As MyListItem.ClickEventHandler, IsSaveOnly As Boolean) As MyListItem
+ '建立控件
+ Dim NewItem As New MyListItem With {
+ .Title = Info.VersionName, .SnapsToDevicePixels = True, .Height = 42, .Type = MyListItem.CheckType.Clickable, .Tag = Info,
+ .Info = If(Info.IsBeta, "测试版", "稳定版"),
+ .Logo = PathImage & "Blocks/NeoForge.png"
+ }
+ AddHandler NewItem.Click, OnClick
+ '建立菜单
+ If IsSaveOnly Then
+ NewItem.ContentHandler = AddressOf NeoForgeSaveContMenuBuild
+ Else
+ NewItem.ContentHandler = AddressOf NeoForgeContMenuBuild
+ End If
+ '结束
+ Return NewItem
+ End Function
+ Private Sub NeoForgeContMenuBuild(sender As MyListItem, e As EventArgs)
+ Dim BtnSave As New MyIconButton With {.Logo = Logo.IconButtonSave, .ToolTip = "另存为"}
+ ToolTipService.SetPlacement(BtnSave, Primitives.PlacementMode.Center)
+ ToolTipService.SetVerticalOffset(BtnSave, 30)
+ ToolTipService.SetHorizontalOffset(BtnSave, 2)
+ AddHandler BtnSave.Click, AddressOf NeoForgeSave_Click
+ Dim BtnInfo As New MyIconButton With {.LogoScale = 1.05, .Logo = Logo.IconButtonInfo, .ToolTip = "更新日志"}
+ ToolTipService.SetPlacement(BtnInfo, Primitives.PlacementMode.Center)
+ ToolTipService.SetVerticalOffset(BtnInfo, 30)
+ ToolTipService.SetHorizontalOffset(BtnInfo, 2)
+ AddHandler BtnInfo.Click, AddressOf NeoForgeLog_Click
+ sender.Buttons = {BtnSave, BtnInfo}
+ End Sub
+ Private Sub NeoForgeSaveContMenuBuild(sender As MyListItem, e As EventArgs)
+ Dim BtnInfo As New MyIconButton With {.LogoScale = 1.05, .Logo = Logo.IconButtonInfo, .ToolTip = "更新日志"}
+ ToolTipService.SetPlacement(BtnInfo, Primitives.PlacementMode.Center)
+ ToolTipService.SetVerticalOffset(BtnInfo, 30)
+ ToolTipService.SetHorizontalOffset(BtnInfo, 2)
+ AddHandler BtnInfo.Click, AddressOf NeoForgeLog_Click
+ sender.Buttons = {BtnInfo}
+ End Sub
+ Private Sub NeoForgeLog_Click(sender As Object, e As RoutedEventArgs)
+ Dim Info As DlNeoForgeListEntry
+ If sender.Tag IsNot Nothing Then
+ Info = sender.Tag
+ ElseIf sender.Parent.Tag IsNot Nothing Then
+ Info = sender.Parent.Tag
+ Else
+ Info = sender.Parent.Parent.Tag
+ End If
+ OpenWebsite(Info.UrlBase & "-changelog.txt")
+ End Sub
+ Public Sub NeoForgeSave_Click(sender As Object, e As RoutedEventArgs)
+ Dim Info As DlNeoForgeListEntry
+ If sender.Tag IsNot Nothing Then
+ Info = sender.Tag
+ ElseIf sender.Parent.Tag IsNot Nothing Then
+ Info = sender.Parent.Tag
+ Else
+ Info = sender.Parent.Parent.Tag
+ End If
+ McDownloadForgelikeSave(Info)
+ End Sub
+
+#End Region
+
#Region "Fabric 下载"
Public Sub McDownloadFabricLoaderSave(DownloadInfo As JObject)
@@ -1861,6 +1884,16 @@ Retry:
'''
Public ForgeEntry As DlForgeVersionEntry = Nothing
+ '若要下载 NeoForge，则需要在下面两项中完成至少一项
+ '''
+ ''' 欲下载的 NeoForge 版本名。
+ '''
+ Public NeoForgeVersion As String = Nothing
+ '''
+ ''' 欲下载的 NeoForge。
+ '''
+ Public NeoForgeEntry As DlNeoForgeListEntry = Nothing
+
'''
''' 欲下载的 Fabric Loader 版本名。
'''
@@ -1961,7 +1994,7 @@ Retry:
Public Function McInstallLoader(Request As McInstallRequest, Optional DontFixLibraries As Boolean = False) As List(Of LoaderBase)
'获取缓存目录
Dim PathInstallTemp As String
- If PathTemp.Contains(" ") AndAlso Request.ForgeEntry IsNot Nothing Then
+ If PathTemp.Contains(" ") AndAlso (Request.OptiFineEntry IsNot Nothing OrElse Request.ForgeEntry IsNot Nothing OrElse Request.NeoForgeEntry IsNot Nothing) Then
PathInstallTemp = OsDrive & "ProgramData\PCL\Install\"
Else
PathInstallTemp = PathTemp & "Install\"
@@ -1996,8 +2029,11 @@ Retry:
End If
If Request.OptiFineEntry IsNot Nothing Then OptiFineFolder = TempMcFolder & "versions\" & Request.OptiFineEntry.NameVersion
Dim ForgeFolder As String = Nothing
- If Request.ForgeEntry IsNot Nothing Then Request.ForgeVersion = If(Request.ForgeVersion, Request.ForgeEntry.Version)
- If Request.ForgeVersion IsNot Nothing Then ForgeFolder = TempMcFolder & "versions\" & Request.MinecraftName & "-forge-" & Request.ForgeVersion
+ If Request.ForgeEntry IsNot Nothing Then Request.ForgeVersion = If(Request.ForgeVersion, Request.ForgeEntry.VersionName)
+ If Request.ForgeVersion IsNot Nothing Then ForgeFolder = TempMcFolder & "versions\forge-" & Request.ForgeVersion
+ Dim NeoForgeFolder As String = Nothing
+ If Request.NeoForgeEntry IsNot Nothing Then Request.NeoForgeVersion = If(Request.NeoForgeVersion, Request.NeoForgeEntry.VersionName)
+ If Request.NeoForgeVersion IsNot Nothing Then NeoForgeFolder = TempMcFolder & "versions\neoforge-" & Request.NeoForgeVersion
Dim FabricFolder As String = Nothing
If Request.FabricVersion IsNot Nothing Then FabricFolder = TempMcFolder & "versions\fabric-loader-" & Request.FabricVersion & "-" & Request.MinecraftName
Dim LiteLoaderFolder As String = Nothing
@@ -2014,6 +2050,7 @@ Retry:
'记录日志
If OptiFineFolder IsNot Nothing Then Log("[Download] OptiFine 缓存：" & OptiFineFolder)
If ForgeFolder IsNot Nothing Then Log("[Download] Forge 缓存：" & ForgeFolder)
+ If NeoForgeFolder IsNot Nothing Then Log("[Download] NeoForge 缓存：" & NeoForgeFolder)
If FabricFolder IsNot Nothing Then Log("[Download] Fabric 缓存：" & FabricFolder)
If LiteLoaderFolder IsNot Nothing Then Log("[Download] LiteLoader 缓存：" & LiteLoaderFolder)
Log("[Download] 对应的原版版本：" & Request.MinecraftName)
@@ -2048,7 +2085,11 @@ Retry:
End If
'Forge
If Request.ForgeVersion IsNot Nothing Then
- LoaderList.Add(New LoaderCombo(Of String)("下载 Forge " & Request.ForgeVersion, McDownloadForgeLoader(Request.ForgeVersion, Request.MinecraftName, Request.ForgeEntry, TempMcFolder, ClientLoader, Request.TargetVersionFolder, False)) With {.Show = False, .ProgressWeight = 25, .Block = Request.FabricVersion Is Nothing AndAlso Request.LiteLoaderEntry Is Nothing})
+ LoaderList.Add(New LoaderCombo(Of String)("下载 Forge " & Request.ForgeVersion, McDownloadForgelikeLoader(False, Request.ForgeVersion, "forge-" & Request.ForgeVersion, Request.MinecraftName, Request.ForgeEntry, TempMcFolder, ClientLoader, Request.TargetVersionFolder)) With {.Show = False, .ProgressWeight = 25, .Block = Request.FabricVersion Is Nothing AndAlso Request.LiteLoaderEntry Is Nothing AndAlso Request.NeoForgeEntry Is Nothing})
+ End If
+ 'NeoForge
+ If Request.NeoForgeVersion IsNot Nothing Then
+ LoaderList.Add(New LoaderCombo(Of String)("下载 NeoForge " & Request.NeoForgeVersion, McDownloadForgelikeLoader(True, Request.NeoForgeVersion, "neoforge-" & Request.NeoForgeVersion, Request.MinecraftName, Request.NeoForgeEntry, TempMcFolder, ClientLoader, Request.TargetVersionFolder)) With {.Show = False, .ProgressWeight = 25, .Block = Request.ForgeEntry Is Nothing AndAlso Request.FabricVersion Is Nothing AndAlso Request.LiteLoaderEntry Is Nothing})
End If
'LiteLoader
If Request.LiteLoaderEntry IsNot Nothing Then
@@ -2061,14 +2102,14 @@ Retry:
'合并安装
LoaderList.Add(New LoaderTask(Of String, String)("安装游戏",
Sub(Task As LoaderTask(Of String, String))
- InstallMerge(OutputFolder, OutputFolder, OptiFineFolder, OptiFineAsMod, ForgeFolder, Request.ForgeVersion, FabricFolder, LiteLoaderFolder)
+ InstallMerge(OutputFolder, OutputFolder, OptiFineFolder, OptiFineAsMod, ForgeFolder, Request.ForgeVersion, NeoForgeFolder, Request.NeoForgeVersion, FabricFolder, LiteLoaderFolder)
Task.Progress = 0.3
If Directory.Exists(TempMcFolder & "libraries") Then CopyDirectory(TempMcFolder & "libraries", PathMcFolder & "libraries")
If Directory.Exists(TempMcFolder & "mods") Then CopyDirectory(TempMcFolder & "mods", PathMcFolder & "mods")
End Sub) With {.ProgressWeight = 2, .Block = True})
'补全文件
If Not DontFixLibraries AndAlso
- (Request.OptiFineEntry IsNot Nothing OrElse (Request.ForgeVersion IsNot Nothing AndAlso Request.ForgeVersion.Before(".") >= 20) OrElse Request.FabricVersion IsNot Nothing OrElse Request.LiteLoaderEntry IsNot Nothing) Then
+ (Request.OptiFineEntry IsNot Nothing OrElse (Request.ForgeVersion IsNot Nothing AndAlso Request.ForgeVersion.Before(".") >= 20) OrElse Request.NeoForgeVersion IsNot Nothing OrElse Request.FabricVersion IsNot Nothing OrElse Request.LiteLoaderEntry IsNot Nothing) Then
Dim LoadersLib As New List(Of LoaderBase)
LoadersLib.Add(New LoaderTask(Of String, List(Of NetFile))("分析游戏支持库文件（副加载器）", Sub(Task As LoaderTask(Of String, List(Of NetFile))) Task.Output = McLibFix(New McVersion(OutputFolder))) With {.ProgressWeight = 1, .Show = False})
LoadersLib.Add(New LoaderDownload("下载游戏支持库文件（副加载器）", New List(Of NetFile)) With {.ProgressWeight = 7, .Show = False})
@@ -2084,17 +2125,18 @@ Retry:
'''
''' 将多个版本 Json 进行合并，如果目标已存在则直接覆盖。失败会抛出异常。
'''
- Private Sub InstallMerge(OutputFolder As String, MinecraftFolder As String, Optional OptiFineFolder As String = Nothing, Optional OptiFineAsMod As Boolean = False, Optional ForgeFolder As String = Nothing, Optional ForgeVersion As String = Nothing, Optional FabricFolder As String = Nothing, Optional LiteLoaderFolder As String = Nothing)
+ Private Sub InstallMerge(OutputFolder As String, MinecraftFolder As String, Optional OptiFineFolder As String = Nothing, Optional OptiFineAsMod As Boolean = False, Optional ForgeFolder As String = Nothing, Optional ForgeVersion As String = Nothing, Optional NeoForgeFolder As String = Nothing, Optional NeoForgeVersion As String = Nothing, Optional FabricFolder As String = Nothing, Optional LiteLoaderFolder As String = Nothing)
Log("[Download] 开始进行版本合并，输出：" & OutputFolder & "，Minecraft：" & MinecraftFolder &
If(OptiFineFolder IsNot Nothing, "，OptiFine：" & OptiFineFolder, "") &
If(ForgeFolder IsNot Nothing, "，Forge：" & ForgeFolder, "") &
+ If(NeoForgeFolder IsNot Nothing, "，NeoForge：" & NeoForgeFolder, "") &
If(LiteLoaderFolder IsNot Nothing, "，LiteLoader：" & LiteLoaderFolder, "") &
If(FabricFolder IsNot Nothing, "，Fabric：" & FabricFolder, ""))
Directory.CreateDirectory(OutputFolder)
- Dim HasOptiFine As Boolean = OptiFineFolder IsNot Nothing AndAlso Not OptiFineAsMod, HasForge As Boolean = ForgeFolder IsNot Nothing, HasLiteLoader As Boolean = LiteLoaderFolder IsNot Nothing, HasFabric As Boolean = FabricFolder IsNot Nothing
- Dim OutputName As String, MinecraftName As String, OptiFineName As String, ForgeName As String, LiteLoaderName As String, FabricName As String
- Dim OutputJsonPath As String, MinecraftJsonPath As String, OptiFineJsonPath As String = Nothing, ForgeJsonPath As String = Nothing, LiteLoaderJsonPath As String = Nothing, FabricJsonPath As String = Nothing
+ Dim HasOptiFine As Boolean = OptiFineFolder IsNot Nothing AndAlso Not OptiFineAsMod, HasForge As Boolean = ForgeFolder IsNot Nothing, HasNeoForge As Boolean = NeoForgeFolder IsNot Nothing, HasLiteLoader As Boolean = LiteLoaderFolder IsNot Nothing, HasFabric As Boolean = FabricFolder IsNot Nothing
+ Dim OutputName As String, MinecraftName As String, OptiFineName As String, ForgeName As String, NeoForgeName As String, LiteLoaderName As String, FabricName As String
+ Dim OutputJsonPath As String, MinecraftJsonPath As String, OptiFineJsonPath As String = Nothing, ForgeJsonPath As String = Nothing, NeoForgeJsonPath As String = Nothing, LiteLoaderJsonPath As String = Nothing, FabricJsonPath As String = Nothing
Dim OutputJar As String, MinecraftJar As String
#Region "初始化路径信息"
If Not OutputFolder.EndsWithF("\") Then OutputFolder += "\"
@@ -2119,6 +2161,12 @@ Retry:
ForgeJsonPath = ForgeFolder & ForgeName & ".json"
End If
+ If HasNeoForge Then
+ If Not NeoForgeFolder.EndsWithF("\") Then NeoForgeFolder += "\"
+ NeoForgeName = GetFolderNameFromPath(NeoForgeFolder)
+ NeoForgeJsonPath = NeoForgeFolder & NeoForgeName & ".json"
+ End If
+
If HasLiteLoader Then
If Not LiteLoaderFolder.EndsWithF("\") Then LiteLoaderFolder += "\"
LiteLoaderName = GetFolderNameFromPath(LiteLoaderFolder)
@@ -2132,7 +2180,7 @@ Retry:
End If
#End Region
- Dim OutputJson As JObject, MinecraftJson As JObject, OptiFineJson As JObject = Nothing, ForgeJson As JObject = Nothing, LiteLoaderJson As JObject = Nothing, FabricJson As JObject = Nothing
+ Dim OutputJson As JObject, MinecraftJson As JObject, OptiFineJson As JObject = Nothing, ForgeJson As JObject = Nothing, NeoForgeJson As JObject = Nothing, LiteLoaderJson As JObject = Nothing, FabricJson As JObject = Nothing
#Region "读取文件并检查文件是否合规"
Dim MinecraftJsonText As String = ReadFile(MinecraftJsonPath)
If Not MinecraftJsonText.StartsWithF("{") Then Throw New Exception("Minecraft json 有误，地址：" & MinecraftJsonPath & "，前段内容：" & MinecraftJsonText.Substring(0, Math.Min(MinecraftJsonText.Length, 1000)))
@@ -2150,6 +2198,12 @@ Retry:
ForgeJson = GetJson(ForgeJsonText)
End If
+ If HasNeoForge Then
+ Dim NeoForgeJsonText As String = ReadFile(NeoForgeJsonPath)
+ If Not NeoForgeJsonText.StartsWithF("{") Then Throw New Exception("NeoForge json 有误，地址：" & NeoForgeJsonPath & "，前段内容：" & NeoForgeJsonText.Substring(0, Math.Min(NeoForgeJsonText.Length, 1000)))
+ NeoForgeJson = GetJson(NeoForgeJsonText)
+ End If
+
If HasLiteLoader Then
Dim LiteLoaderJsonText As String = ReadFile(LiteLoaderJsonPath)
If Not LiteLoaderJsonText.StartsWithF("{") Then Throw New Exception("LiteLoader json 有误，地址：" & LiteLoaderJsonPath & "，前段内容：" & LiteLoaderJsonText.Substring(0, Math.Min(LiteLoaderJsonText.Length, 1000)))
@@ -2163,12 +2217,13 @@ Retry:
End If
#End Region
-#Region "处理 Json 文件"
+#Region "处理 JSON 文件"
'获取 minecraftArguments
Dim AllArguments As String =
If(MinecraftJson("minecraftArguments"), " ").ToString & " " &
If(OptiFineJson IsNot Nothing, If(OptiFineJson("minecraftArguments"), " ").ToString, " ") & " " &
If(ForgeJson IsNot Nothing, If(ForgeJson("minecraftArguments"), " ").ToString, " ") & " " &
+ If(NeoForgeJson IsNot Nothing, If(NeoForgeJson("minecraftArguments"), " ").ToString, " ") & " " &
If(LiteLoaderJson IsNot Nothing, If(LiteLoaderJson("minecraftArguments"), " ").ToString, " ")
'分割参数字符串
Dim RawArguments As List(Of String) = AllArguments.Split(" ").Where(Function(l) l <> "").Select(Function(l) l.Trim).ToList
@@ -2198,6 +2253,12 @@ Retry:
ForgeJson.Remove("time")
OutputJson.Merge(ForgeJson)
End If
+ If HasNeoForge Then
+ '合并 NeoForge
+ NeoForgeJson.Remove("releaseTime")
+ NeoForgeJson.Remove("time")
+ OutputJson.Merge(NeoForgeJson)
+ End If
If HasLiteLoader Then
'合并 LiteLoader
LiteLoaderJson.Remove("releaseTime")
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb
index 519b862..95b18d0 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadClient.xaml.vb
@@ -87,7 +87,7 @@
PanMain.Children.Add(NewCard)
Next
Catch ex As Exception
- Log(ex, "可视化版本列表出错", LogLevel.Feedback)
+ Log(ex, "可视化 MC 版本列表出错", LogLevel.Feedback)
End Try
End Sub
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb
index 1fa91e3..0302160 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb
@@ -177,17 +177,18 @@
End Sub) With {.ProgressWeight = 0.1})
'启动
- Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged = Sub(MyLoader)
- Select Case MyLoader.State
- Case LoadState.Failed
- Hint(MyLoader.Name & "失败：" & GetExceptionSummary(MyLoader.Error), HintType.Critical)
- Case LoadState.Aborted
- Hint(MyLoader.Name & "已取消！", HintType.Info)
- Case LoadState.Loading
- Exit Sub '不重新加载版本列表
- End Select
- McInstallFailedClearFolder(MyLoader)
- End Sub}
+ Dim Loader As New LoaderCombo(Of String)(LoaderName, Loaders) With {.OnStateChanged =
+ Sub(MyLoader)
+ Select Case MyLoader.State
+ Case LoadState.Failed
+ Hint(MyLoader.Name & "失败：" & GetExceptionSummary(MyLoader.Error), HintType.Critical)
+ Case LoadState.Aborted
+ Hint(MyLoader.Name & "已取消！", HintType.Info)
+ Case LoadState.Loading
+ Exit Sub '不重新加载版本列表
+ End Select
+ McInstallFailedClearFolder(MyLoader)
+ End Sub}
Loader.Start(PathMcFolder & "versions\" & VersionName & "\")
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
@@ -197,7 +198,7 @@
Log(ex, "下载资源整合包失败", LogLevel.Feedback)
End Try
End Sub
- 'Mod 下载；整合包另存为
+ 'Mod、资源包下载；整合包另存为
Public Shared CachedFolder As String = Nothing '仅在本次缓存的下载文件夹
Public Sub Save_Click(sender As Object, e As EventArgs)
Dim File As CompFile = If(TypeOf sender Is MyListItem, sender, sender.Parent).Tag
@@ -211,10 +212,10 @@
'获取 Mod 所需的加载器种类
Dim AllowForge As Boolean? = Nothing, AllowFabric As Boolean? = Nothing
If File.ModLoaders.Any Then '从文件中获取
- AllowForge = File.ModLoaders.Contains(CompModLoaderType.Forge)
+ AllowForge = File.ModLoaders.Contains(CompModLoaderType.Forge) OrElse File.ModLoaders.Contains(CompModLoaderType.NeoForge)
AllowFabric = File.ModLoaders.Contains(CompModLoaderType.Fabric)
ElseIf Project.ModLoaders.Any Then '从工程中获取
- AllowForge = Project.ModLoaders.Contains(CompModLoaderType.Forge)
+ AllowForge = Project.ModLoaders.Contains(CompModLoaderType.Forge) OrElse File.ModLoaders.Contains(CompModLoaderType.NeoForge)
AllowFabric = Project.ModLoaders.Contains(CompModLoaderType.Fabric)
End If
If AllowForge IsNot Nothing AndAlso Not AllowForge AndAlso
@@ -230,7 +231,7 @@
If File.GameVersions.Any(Function(v) v.Contains(".")) AndAlso
Not File.GameVersions.Any(Function(v) v.Contains(".") AndAlso v.Split(".")(1) = Version.Version.McCodeMain.ToString) Then Return False
If AllowForge Is Nothing OrElse AllowFabric Is Nothing Then Return True
- If AllowForge AndAlso Version.Version.HasForge Then Return True
+ If AllowForge AndAlso (Version.Version.HasForge OrElse Version.Version.HasNeoForge) Then Return True
If AllowFabric AndAlso Version.Version.HasFabric Then Return True
Return False
End Function
@@ -260,10 +261,11 @@
Log("[Comp] 由于当前版本不兼容，使用当前的 MC 文件夹作为默认下载位置")
End If
Else '选择 Mod 数量最多的版本
- Dim SelectedVersion = SuitableVersions.OrderBy(Function(v)
- Dim Info As New DirectoryInfo(v.PathIndie & "mods\")
- Return If(Info.Exists, Info.GetFiles().Length, -1)
- End Function).LastOrDefault()
+ Dim SelectedVersion = SuitableVersions.OrderBy(
+ Function(v)
+ Dim Info As New DirectoryInfo(v.PathIndie & "mods\")
+ Return If(Info.Exists, Info.GetFiles().Length, -1)
+ End Function).LastOrDefault()
DefaultFolder = SelectedVersion.PathIndie & "mods\"
Directory.CreateDirectory(DefaultFolder)
Log("[Comp] 使用适合的游戏版本作为默认下载位置（" & SelectedVersion.Name & "）")
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb
index 78541a0..354fe86 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadForge.xaml.vb
@@ -33,7 +33,7 @@
' PanMain.Children.Insert(0, CardWarn)
'End If
Catch ex As Exception
- Log(ex, "可视化版本列表出错", LogLevel.Feedback)
+ Log(ex, "可视化 Forge 版本列表出错", LogLevel.Feedback)
End Try
End Sub
@@ -55,10 +55,6 @@
Card.StackInstall()
End Sub
- Public Sub DownloadStart(sender As MyListItem, e As Object)
- McDownloadForge(sender.Tag)
- End Sub
-
'介绍栏
Private Sub BtnWeb_Click(sender As Object, e As EventArgs) Handles BtnWeb.Click
OpenWebsite("https://files.minecraftforge.net")
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml
index b6b6dc5..6c7a800 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml
@@ -20,6 +20,7 @@
+
@@ -79,6 +80,24 @@
Data="F1 M2,0 L0,2 8,10 0,18 2,20 10,12 18,20 20,18 12,10 20,2 18,0 10,8 2,0Z" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -178,6 +197,7 @@
+
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
index d7ef0bc..9cf83e2 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadInstall.xaml.vb
@@ -10,6 +10,7 @@
DlOptiFineListLoader.Start()
DlLiteLoaderListLoader.Start()
DlFabricListLoader.Start()
+ DlNeoForgeListLoader.Start()
'重载预览
TextSelectName.ValidateRules = New ObjectModel.Collection(Of Validate) From {New ValidateFolderName(PathMcFolder & "versions")}
@@ -26,6 +27,7 @@
LoadLiteLoader.State = DlLiteLoaderListLoader
LoadFabric.State = DlFabricListLoader
LoadFabricApi.State = DlFabricApiLoader
+ LoadNeoForge.State = DlNeoForgeListLoader
LoadOptiFabric.State = DlOptiFabricLoader
End Sub
@@ -51,6 +53,7 @@
CardOptiFine.IsSwaped = True
CardLiteLoader.IsSwaped = True
CardForge.IsSwaped = True
+ CardNeoForge.IsSwaped = True
CardFabric.IsSwaped = True
CardFabricApi.IsSwaped = True
CardOptiFabric.IsSwaped = True
@@ -80,32 +83,36 @@
AniStart({
AaOpacity(PanMinecraft, -PanMinecraft.Opacity, 100, 10),
AaTranslateX(PanMinecraft, -50 - CType(PanMinecraft.RenderTransform, TranslateTransform).X, 110, 10),
- AaCode(Sub()
- PanBack.ScrollToHome()
- TextSelectName.Validate()
- OptiFine_Loaded()
- LiteLoader_Loaded()
- Forge_Loaded()
- Fabric_Loaded()
- FabricApi_Loaded()
- OptiFabric_Loaded()
- SelectReload()
- End Sub, After:=True),
+ AaCode(
+ Sub()
+ PanBack.ScrollToHome()
+ TextSelectName.Validate()
+ OptiFine_Loaded()
+ LiteLoader_Loaded()
+ Forge_Loaded()
+ NeoForge_Loaded()
+ Fabric_Loaded()
+ FabricApi_Loaded()
+ OptiFabric_Loaded()
+ SelectReload()
+ End Sub, After:=True),
AaOpacity(PanSelect, 1 - PanSelect.Opacity, 250, 150),
AaTranslateX(PanSelect, -CType(PanSelect.RenderTransform, TranslateTransform).X, 500, 150, Ease:=New AniEaseOutBack(AniEasePower.Weak)),
- AaCode(Sub()
- PanMinecraft.Visibility = Visibility.Collapsed
- PanBack.IsHitTestVisible = True
- '初始化 Binding
- If IsFirstLoaded Then Exit Sub
- IsFirstLoaded = True
- BtnOptiFineClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardOptiFine.MainTextBlock, .Mode = BindingMode.OneWay})
- BtnLiteLoaderClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardLiteLoader.MainTextBlock, .Mode = BindingMode.OneWay})
- BtnForgeClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardForge.MainTextBlock, .Mode = BindingMode.OneWay})
- BtnFabricClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardFabric.MainTextBlock, .Mode = BindingMode.OneWay})
- BtnFabricApiClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardFabricApi.MainTextBlock, .Mode = BindingMode.OneWay})
- BtnOptiFabricClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardOptiFabric.MainTextBlock, .Mode = BindingMode.OneWay})
- End Sub,, True)
+ AaCode(
+ Sub()
+ PanMinecraft.Visibility = Visibility.Collapsed
+ PanBack.IsHitTestVisible = True
+ '初始化 Binding
+ If IsFirstLoaded Then Exit Sub
+ IsFirstLoaded = True
+ BtnOptiFineClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardOptiFine.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnLiteLoaderClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardLiteLoader.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnForgeClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardForge.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnNeoForgeClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardNeoForge.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnFabricClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardFabric.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnFabricApiClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardFabricApi.MainTextBlock, .Mode = BindingMode.OneWay})
+ BtnOptiFabricClearInner.SetBinding(Shapes.Path.FillProperty, New Binding("Foreground") With {.Source = CardOptiFabric.MainTextBlock, .Mode = BindingMode.OneWay})
+ End Sub,, True)
}, "FrmDownloadInstall SelectPageSwitch", True)
End Sub
Public Sub ExitSelectPage()
@@ -213,6 +220,26 @@
End If
End Sub
+ 'NeoForge
+ Private SelectedNeoForge As DlNeoForgeListEntry = Nothing
+ Private Sub SetNeoForgeInfoShow(IsShow As String)
+ If PanNeoForgeInfo.Tag = IsShow Then Exit Sub
+ PanNeoForgeInfo.Tag = IsShow
+ If IsShow = "True" Then
+ '显示信息栏
+ AniStart({
+ AaTranslateY(PanNeoForgeInfo, -CType(PanNeoForgeInfo.RenderTransform, TranslateTransform).Y, 270, 100, Ease:=New AniEaseOutBack),
+ AaOpacity(PanNeoForgeInfo, 1 - PanNeoForgeInfo.Opacity, 100, 90)
+ }, "SetNeoForgeInfoShow")
+ Else
+ '隐藏信息栏
+ AniStart({
+ AaTranslateY(PanNeoForgeInfo, 6 - CType(PanNeoForgeInfo.RenderTransform, TranslateTransform).Y, 200),
+ AaOpacity(PanNeoForgeInfo, -PanNeoForgeInfo.Opacity, 100)
+ }, "SetNeoForgeInfoShow")
+ End If
+ End Sub
+
'Fabric
Private SelectedFabric As String = Nothing
Private Sub SetFabricInfoShow(IsShow As String)
@@ -277,7 +304,7 @@
'''
''' 重载已选择的项目的显示。
'''
- Private Sub SelectReload() Handles CardOptiFine.Swap, LoadOptiFine.StateChanged, CardForge.Swap, LoadForge.StateChanged, CardFabric.Swap, LoadFabric.StateChanged, CardFabricApi.Swap, LoadFabricApi.StateChanged, CardOptiFabric.Swap, LoadOptiFabric.StateChanged, CardLiteLoader.Swap, LoadLiteLoader.StateChanged
+ Private Sub SelectReload() Handles CardOptiFine.Swap, LoadOptiFine.StateChanged, CardForge.Swap, LoadForge.StateChanged, CardNeoForge.Swap, LoadNeoForge.StateChanged, CardFabric.Swap, LoadFabric.StateChanged, CardFabricApi.Swap, LoadFabricApi.StateChanged, CardOptiFabric.Swap, LoadOptiFabric.StateChanged, CardLiteLoader.Swap, LoadLiteLoader.StateChanged
If SelectedMinecraftId Is Nothing OrElse IsReloading Then Exit Sub
IsReloading = True
'主预览
@@ -338,9 +365,30 @@
Else
BtnForgeClear.Visibility = Visibility.Visible
ImgForge.Visibility = Visibility.Visible
- LabForge.Text = SelectedForge.Version
+ LabForge.Text = SelectedForge.VersionName
LabForge.Foreground = ColorGray1
End If
+ 'NeoForge
+ If Not SelectedMinecraftId.Contains("1.") OrElse Val(SelectedMinecraftId.Split(".")(1)) <= 19 Then
+ CardNeoForge.Visibility = Visibility.Collapsed
+ Else
+ CardNeoForge.Visibility = Visibility.Visible
+ Dim NeoForgeError As String = LoadNeoForgeGetError()
+ CardNeoForge.MainSwap.Visibility = If(NeoForgeError Is Nothing, Visibility.Visible, Visibility.Collapsed)
+ If NeoForgeError IsNot Nothing Then CardNeoForge.IsSwaped = True
+ SetNeoForgeInfoShow(CardNeoForge.IsSwaped)
+ If SelectedNeoForge Is Nothing Then
+ BtnNeoForgeClear.Visibility = Visibility.Collapsed
+ ImgNeoForge.Visibility = Visibility.Collapsed
+ LabNeoForge.Text = If(NeoForgeError, "点击选择")
+ LabNeoForge.Foreground = ColorGray4
+ Else
+ BtnNeoForgeClear.Visibility = Visibility.Visible
+ ImgNeoForge.Visibility = Visibility.Visible
+ LabNeoForge.Text = SelectedNeoForge.VersionName
+ LabNeoForge.Foreground = ColorGray1
+ End If
+ End If
'Fabric
If SelectedMinecraftId.Contains("1.") AndAlso Val(SelectedMinecraftId.Split(".")(1)) <= 13 Then
CardFabric.Visibility = Visibility.Collapsed
@@ -411,9 +459,16 @@
HintFabricAPI.Visibility = Visibility.Collapsed
End If
If SelectedFabric IsNot Nothing AndAlso SelectedOptiFine IsNot Nothing AndAlso SelectedOptiFabric Is Nothing Then
- HintOptiFabric.Visibility = Visibility.Visible
+ If SelectedMinecraftId.StartsWith("1.14") OrElse SelectedMinecraftId.StartsWith("1.15") Then
+ HintOptiFabric.Visibility = Visibility.Collapsed
+ HintOptiFabricOld.Visibility = Visibility.Visible
+ Else
+ HintOptiFabric.Visibility = Visibility.Visible
+ HintOptiFabricOld.Visibility = Visibility.Collapsed
+ End If
Else
HintOptiFabric.Visibility = Visibility.Collapsed
+ HintOptiFabricOld.Visibility = Visibility.Collapsed
End If
If SelectedMinecraftId.Contains("1.") AndAlso Val(SelectedMinecraftId.Split(".")(1)) >= 16 AndAlso SelectedOptiFine IsNot Nothing AndAlso
(SelectedForge IsNot Nothing OrElse SelectedFabric IsNot Nothing) Then
@@ -434,6 +489,7 @@
SelectedOptiFine = Nothing
SelectedLiteLoader = Nothing
SelectedForge = Nothing
+ SelectedNeoForge = Nothing
SelectedFabric = Nothing
SelectedFabricApi = Nothing
SelectedOptiFabric = Nothing
@@ -449,7 +505,10 @@
Name += "-Fabric " & SelectedFabric.Replace("+build", "")
End If
If SelectedForge IsNot Nothing Then
- Name += "-Forge_" & SelectedForge.Version
+ Name += "-Forge_" & SelectedForge.VersionName
+ End If
+ If SelectedNeoForge IsNot Nothing Then
+ Name += "-NeoForge_" & SelectedNeoForge.VersionName
End If
If SelectedLiteLoader IsNot Nothing Then
Name += "-LiteLoader"
@@ -468,7 +527,10 @@
Info += ", Fabric " & SelectedFabric.Replace("+build", "")
End If
If SelectedForge IsNot Nothing Then
- Info += ", Forge " & SelectedForge.Version
+ Info += ", Forge " & SelectedForge.VersionName
+ End If
+ If SelectedNeoForge IsNot Nothing Then
+ Info += ", NeoForge " & SelectedNeoForge.VersionName
End If
If SelectedLiteLoader IsNot Nothing Then
Info += ", LiteLoader"
@@ -487,6 +549,8 @@
Return "pack://application:,,,/images/Blocks/Fabric.png"
ElseIf SelectedForge IsNot Nothing Then
Return "pack://application:,,,/images/Blocks/Anvil.png"
+ ElseIf SelectedNeoForge IsNot Nothing Then
+ Return "pack://application:,,,/images/Blocks/NeoForge.png"
ElseIf SelectedLiteLoader IsNot Nothing Then
Return "pack://application:,,,/images/Blocks/Egg.png"
ElseIf SelectedOptiFine IsNot Nothing Then
@@ -624,6 +688,7 @@
''' 获取 OptiFine 的加载异常信息。若正常则返回 Nothing。
'''
Private Function LoadOptiFineGetError() As String
+ If SelectedNeoForge IsNot Nothing Then Return "与 NeoForge 不兼容"
If LoadOptiFine Is Nothing OrElse LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
If LoadOptiFine.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFine.State, Object).Error.Message
'检查 Forge 1.13 - 1.14.3：全部不兼容
@@ -659,10 +724,12 @@
Private Function IsOptiFineSuitForForge(OptiFine As DlOptiFineListEntry, Forge As DlForgeVersionEntry)
If Forge.Inherit <> OptiFine.Inherit Then Return False '不是同一个大版本
If OptiFine.RequiredForgeVersion Is Nothing Then Return False '不兼容 Forge
- Return (OptiFine.RequiredForgeVersion.Contains(".") AndAlso 'XX.X.XXX
- VersionSortInteger(Forge.Version, OptiFine.RequiredForgeVersion) >= 0) OrElse
- (Not OptiFine.RequiredForgeVersion.Contains(".") AndAlso '#XXXX
- Forge.Version.After(".") >= OptiFine.RequiredForgeVersion)
+ If String.IsNullOrWhiteSpace(OptiFine.RequiredForgeVersion) Then Return True '#4183
+ If OptiFine.RequiredForgeVersion.Contains(".") Then 'XX.X.XXX
+ Return VersionSortInteger(Forge.Version.ToString, OptiFine.RequiredForgeVersion) >= 0
+ Else 'XXXX
+ Return Forge.Version.Revision >= OptiFine.RequiredForgeVersion
+ End If
End Function
'限制展开
@@ -685,11 +752,12 @@
Next
If Not Versions.Any() Then Exit Sub
'排序
- Versions = Sort(Versions, Function(Left As DlOptiFineListEntry, Right As DlOptiFineListEntry) As Boolean
- If Not Left.IsPreview AndAlso Right.IsPreview Then Return True
- If Left.IsPreview AndAlso Not Right.IsPreview Then Return False
- Return VersionSortBoolean(Left.NameDisplay, Right.NameDisplay)
- End Function)
+ Versions = Sort(Versions,
+ Function(Left As DlOptiFineListEntry, Right As DlOptiFineListEntry) As Boolean
+ If Not Left.IsPreview AndAlso Right.IsPreview Then Return True
+ If Left.IsPreview AndAlso Not Right.IsPreview Then Return False
+ Return VersionSortBoolean(Left.NameDisplay, Right.NameDisplay)
+ End Function)
'可视化
PanOptiFine.Children.Clear()
For Each Version In Versions
@@ -706,6 +774,7 @@
If SelectedForge IsNot Nothing AndAlso Not IsOptiFineSuitForForge(SelectedOptiFine, SelectedForge) Then SelectedForge = Nothing
OptiFabric_Loaded()
Forge_Loaded()
+ NeoForge_Loaded()
CardOptiFine.IsSwaped = True
SelectReload()
End Sub
@@ -715,6 +784,7 @@
CardOptiFine.IsSwaped = True
e.Handled = True
Forge_Loaded()
+ NeoForge_Loaded()
SelectReload()
End Sub
@@ -800,6 +870,7 @@
Dim NotSuitForOptiFine As Boolean = False
For Each Version In Loader.Output
If Version.Category = "universal" OrElse Version.Category = "client" Then Continue For '跳过无法自动安装的版本
+ If SelectedNeoForge IsNot Nothing Then Return "与 NeoForge 不兼容"
If SelectedFabric IsNot Nothing Then Return "与 Fabric 不兼容"
If SelectedOptiFine IsNot Nothing AndAlso
VersionSortInteger(SelectedMinecraftId, "1.13") >= 0 AndAlso VersionSortInteger("1.14.3", SelectedMinecraftId) >= 0 Then
@@ -829,16 +900,15 @@
If SelectedMinecraftId <> Loader.Input Then Exit Sub
If Loader.State <> LoadState.Finished Then Exit Sub
'获取要显示的版本
- Dim Versions As New List(Of DlForgeVersionEntry)
- Versions.AddRange(Loader.Output) '复制数组，以免 Output 在实例化后变空
+ Dim Versions = Loader.Output.ToList '复制数组，以免 Output 在实例化后变空
If Not Loader.Output.Any() Then Exit Sub
PanForge.Children.Clear()
- Versions = Sort(Versions, Function(a, b) New Version(a.Version) > New Version(b.Version)).
- Where(Function(v)
- If v.Category = "universal" OrElse v.Category = "client" Then Return False '跳过无法自动安装的版本
- If SelectedOptiFine IsNot Nothing AndAlso Not IsOptiFineSuitForForge(SelectedOptiFine, v) Then Return False
- Return True
- End Function).ToList
+ Versions = Sort(Versions, Function(a, b) a.Version > b.Version).Where(
+ Function(v)
+ If v.Category = "universal" OrElse v.Category = "client" Then Return False '跳过无法自动安装的版本
+ If SelectedOptiFine IsNot Nothing AndAlso Not IsOptiFineSuitForForge(SelectedOptiFine, v) Then Return False
+ Return True
+ End Function).ToList()
ForgeDownloadListItemPreload(PanForge, Versions, AddressOf Forge_Selected, False)
For Each Version In Versions
PanForge.Children.Add(ForgeDownloadListItem(Version, AddressOf Forge_Selected, False))
@@ -866,6 +936,67 @@
#End Region
+#Region "NeoForge 列表"
+
+ '''
+ ''' 获取 NeoForge 的加载异常信息。若正常则返回 Nothing。
+ '''
+ Private Function LoadNeoForgeGetError() As String
+ If Not SelectedMinecraftId.StartsWith("1.") Then Return "没有可用版本"
+ If SelectedOptiFine IsNot Nothing Then Return "与 OptiFine 不兼容"
+ If SelectedForge IsNot Nothing Then Return "与 Forge 不兼容"
+ If SelectedFabric IsNot Nothing Then Return "与 Fabric 不兼容"
+ If LoadNeoForge Is Nothing OrElse LoadNeoForge.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
+ If LoadNeoForge.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadNeoForge.State, Object).Error.Message
+ If DlNeoForgeListLoader.Output.Value.Any(Function(v) v.Inherit = SelectedMinecraftId) Then
+ Return Nothing
+ Else
+ Return "没有可用版本"
+ End If
+ End Function
+
+ '限制展开
+ Private Sub CardNeoForge_PreviewSwap(sender As Object, e As RouteEventArgs) Handles CardNeoForge.PreviewSwap
+ If LoadNeoForgeGetError() IsNot Nothing Then e.Handled = True
+ End Sub
+
+ '''
+ ''' 尝试重新可视化 NeoForge 版本列表。
+ '''
+ Private Sub NeoForge_Loaded() Handles LoadNeoForge.StateChanged
+ Try
+ '获取版本列表
+ If DlNeoForgeListLoader.State <> LoadState.Finished Then Exit Sub
+ Dim Versions = DlNeoForgeListLoader.Output.Value.Where(Function(v) v.Inherit = SelectedMinecraftId).ToList
+ If Not Versions.Any() Then Exit Sub
+ '可视化
+ PanNeoForge.Children.Clear()
+ NeoForgeDownloadListItemPreload(PanNeoForge, Versions, AddressOf NeoForge_Selected, False)
+ For Each Version In Versions
+ PanNeoForge.Children.Add(NeoForgeDownloadListItem(Version, AddressOf NeoForge_Selected, False))
+ Next
+ Catch ex As Exception
+ Log(ex, "可视化 NeoForge 安装版本列表出错", LogLevel.Feedback)
+ End Try
+ End Sub
+
+ '选择与清除
+ Private Sub NeoForge_Selected(sender As MyListItem, e As EventArgs)
+ SelectedNeoForge = sender.Tag
+ CardNeoForge.IsSwaped = True
+ OptiFine_Loaded()
+ SelectReload()
+ End Sub
+ Private Sub NeoForge_Clear(sender As Object, e As MouseButtonEventArgs) Handles BtnNeoForgeClear.MouseLeftButtonUp
+ SelectedNeoForge = Nothing
+ CardNeoForge.IsSwaped = True
+ e.Handled = True
+ OptiFine_Loaded()
+ SelectReload()
+ End Sub
+
+#End Region
+
#Region "Fabric 列表"
'''
@@ -877,7 +1008,7 @@
For Each Version As JObject In DlFabricListLoader.Output.Value("game")
If Version("version").ToString = SelectedMinecraftId.Replace("∞", "infinite").Replace("Combat Test 7c", "1.16_combat-3") Then
If SelectedForge IsNot Nothing Then Return "与 Forge 不兼容"
- 'If SelectedOptiFine IsNot Nothing Then Return "与 OptiFine 不兼容"
+ If SelectedNeoForge IsNot Nothing Then Return "与 NeoForge 不兼容"
Return Nothing
End If
Next
@@ -1064,6 +1195,7 @@
''' 获取 OptiFabric 的加载异常信息。若正常则返回 Nothing。
'''
Private Function LoadOptiFabricGetError() As String
+ If SelectedMinecraftId.StartsWith("1.14") OrElse SelectedMinecraftId.StartsWith("1.15") Then Return "不兼容老版本 Fabric，请手动下载 OptiFabric Origins"
If LoadOptiFabric Is Nothing OrElse LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Run Then Return "正在获取版本列表……"
If LoadOptiFabric.State.LoadingState = MyLoading.MyLoadingState.Error Then Return "获取版本列表失败：" & CType(LoadOptiFabric.State, Object).Error.Message
If DlOptiFabricLoader.Output Is Nothing Then
@@ -1109,7 +1241,8 @@
PanOptiFabric.Children.Add(OptiFabricDownloadListItem(Version, AddressOf OptiFabric_Selected))
Next
'自动选择 OptiFabric
- If Not AutoSelectedOptiFabric Then
+ If Not AutoSelectedOptiFabric AndAlso
+ Not (SelectedMinecraftId.StartsWith("1.14") OrElse SelectedMinecraftId.StartsWith("1.15")) Then '1.14~15 不自动选择
AutoSelectedOptiFabric = True
Log($"[Download] 已自动选择 OptiFabric：{CType(PanOptiFabric.Children(0), MyListItem).Title}")
OptiFabric_Selected(PanOptiFabric.Children(0), Nothing)
@@ -1141,7 +1274,7 @@
End Sub
Private Sub BtnSelectStart_Click() Handles BtnSelectStart.Click
'确认版本隔离
- If (SelectedForge IsNot Nothing OrElse SelectedFabric IsNot Nothing) AndAlso
+ If (SelectedForge IsNot Nothing OrElse SelectedNeoForge IsNot Nothing OrElse SelectedFabric IsNot Nothing) AndAlso
(Setup.Get("LaunchArgumentIndie") = 0 OrElse Setup.Get("LaunchArgumentIndie") = 2) Then
If MyMsgBox("你尚未开启版本隔离，这会导致多个 MC 共用同一个 Mod 文件夹。" & vbCrLf &
"因此在切换 MC 版本时，MC 会因为读取到与当前版本不符的 Mod 而崩溃。" & vbCrLf &
@@ -1157,6 +1290,7 @@
.MinecraftName = SelectedMinecraftId,
.OptiFineEntry = SelectedOptiFine,
.ForgeEntry = SelectedForge,
+ .NeoForgeEntry = SelectedNeoForge,
.FabricVersion = SelectedFabric,
.FabricApi = SelectedFabricApi,
.OptiFabric = SelectedOptiFabric,
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml
index 7989461..27bd0a1 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml
@@ -43,47 +43,55 @@
-
+
-
+
-
-
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb
index 56046c5..f84defc 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLeft.xaml.vb
@@ -10,7 +10,7 @@
'''
''' 勾选事件改变页面。
'''
- Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemInstall.Check, ItemClient.Check, ItemOptiFine.Check, ItemForge.Check, ItemLiteLoader.Check, ItemMod.Check, ItemFabric.Check, ItemPack.Check, ItemResourcePack.Check
+ Private Sub PageCheck(sender As MyListItem, e As RouteEventArgs) Handles ItemInstall.Check, ItemClient.Check, ItemOptiFine.Check, ItemForge.Check, ItemNeoForge.Check, ItemLiteLoader.Check, ItemMod.Check, ItemFabric.Check, ItemPack.Check, ItemResourcePack.Check
'尚未初始化控件属性时，sender.Tag 为 Nothing，会导致切换到页面 0
'若使用 IsLoaded，则会导致模拟点击不被执行（模拟点击切换页面时，控件的 IsLoaded 为 False）
If sender.Tag IsNot Nothing Then PageChange(Val(sender.Tag))
@@ -31,6 +31,9 @@
Case FormMain.PageSubType.DownloadForge
If FrmDownloadForge Is Nothing Then FrmDownloadForge = New PageDownloadForge
Return FrmDownloadForge
+ Case FormMain.PageSubType.DownloadNeoForge
+ If FrmDownloadNeoForge Is Nothing Then FrmDownloadNeoForge = New PageDownloadNeoForge
+ Return FrmDownloadNeoForge
Case FormMain.PageSubType.DownloadLiteLoader
If FrmDownloadLiteLoader Is Nothing Then FrmDownloadLiteLoader = New PageDownloadLiteLoader
Return FrmDownloadLiteLoader
@@ -72,17 +75,19 @@
FrmMain.PageRight = Target
CType(FrmMain.PanMainRight.Child, MyPageRight).PageOnExit()
AniStart({
- AaCode(Sub()
- CType(FrmMain.PanMainRight.Child, MyPageRight).PageOnForceExit()
- FrmMain.PanMainRight.Child = FrmMain.PageRight
- FrmMain.PageRight.Opacity = 0
- End Sub, 130),
- AaCode(Sub()
- '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理
- FrmMain.PageRight.Opacity = 1
- FrmMain.PageRight.PageOnEnter()
- End Sub, 30, True)
- }, "PageLeft PageChange")
+ AaCode(
+ Sub()
+ CType(FrmMain.PanMainRight.Child, MyPageRight).PageOnForceExit()
+ FrmMain.PanMainRight.Child = FrmMain.PageRight
+ FrmMain.PageRight.Opacity = 0
+ End Sub, 130),
+ AaCode(
+ Sub()
+ '延迟触发页面通用动画，以使得在 Loaded 事件中加载的控件得以处理
+ FrmMain.PageRight.Opacity = 1
+ FrmMain.PageRight.PageOnEnter()
+ End Sub, 30, True)
+ }, "PageLeft PageChange")
End Sub
#End Region
@@ -94,6 +99,7 @@
DlClientListLoader.Start(IsForceRestart:=True)
DlOptiFineListLoader.Start(IsForceRestart:=True)
DlForgeListLoader.Start(IsForceRestart:=True)
+ DlNeoForgeListLoader.Start(IsForceRestart:=True)
DlLiteLoaderListLoader.Start(IsForceRestart:=True)
DlFabricListLoader.Start(IsForceRestart:=True)
DlFabricApiLoader.Start(IsForceRestart:=True)
@@ -126,6 +132,9 @@
Case FormMain.PageSubType.DownloadForge
DlForgeListLoader.Start(IsForceRestart:=True)
ItemForge.Checked = True
+ Case FormMain.PageSubType.DownloadNeoForge
+ DlNeoForgeListLoader.Start(IsForceRestart:=True)
+ ItemNeoForge.Checked = True
Case FormMain.PageSubType.DownloadLiteLoader
DlLiteLoaderListLoader.Start(IsForceRestart:=True)
ItemLiteLoader.Checked = True
@@ -163,12 +172,14 @@
ItemOptiFine.Visibility = Visibility.Visible
ItemFabric.Visibility = Visibility.Visible
ItemForge.Visibility = Visibility.Visible
+ ItemNeoForge.Visibility = Visibility.Visible
ItemLiteLoader.Visibility = Visibility.Visible
- RunInThread(Sub()
- Thread.Sleep(20)
- RunInUiWait(Sub() ItemClient.SetChecked(True, True, True))
- AniControlEnabled -= 1
- End Sub)
+ RunInThread(
+ Sub()
+ Thread.Sleep(20)
+ RunInUiWait(Sub() ItemClient.SetChecked(True, True, True))
+ AniControlEnabled -= 1
+ End Sub)
End Sub
'折叠手动安装
Private Sub LabHand_Click(sender As Object, e As MouseButtonEventArgs) Handles LabHand.MouseLeftButtonUp
@@ -179,14 +190,16 @@
LabHand.Visibility = Visibility.Collapsed
ItemClient.Visibility = Visibility.Collapsed
ItemOptiFine.Visibility = Visibility.Collapsed
+ ItemNeoForge.Visibility = Visibility.Collapsed
ItemFabric.Visibility = Visibility.Collapsed
ItemForge.Visibility = Visibility.Collapsed
ItemLiteLoader.Visibility = Visibility.Collapsed
- RunInThread(Sub()
- Thread.Sleep(20)
- RunInUiWait(Sub() ItemInstall.SetChecked(True, True, True))
- AniControlEnabled -= 1
- End Sub)
+ RunInThread(
+ Sub()
+ Thread.Sleep(20)
+ RunInUiWait(Sub() ItemInstall.SetChecked(True, True, True))
+ AniControlEnabled -= 1
+ End Sub)
End Sub
End Class
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb
index 9a73bbe..ac18c47 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadLiteLoader.xaml.vb
@@ -38,7 +38,7 @@
PanMain.Children.Add(NewCard)
Next
Catch ex As Exception
- Log(ex, "可视化版本列表出错", LogLevel.Feedback)
+ Log(ex, "可视化 LiteLoader 版本列表出错", LogLevel.Feedback)
End Try
End Sub
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml
index 814d1c8..4483c5d 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml
@@ -33,6 +33,7 @@
+
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb
index b77199a..db3f168 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadMod.xaml.vb
@@ -40,12 +40,14 @@
Visibility.Visible, Visibility.Collapsed)
LabPage.Text = Page + 1
BtnPageFirst.IsEnabled = Page > 1
- BtnPageFirst.Opacity = If(BtnPageFirst.IsEnabled, 1, 0.2)
+ BtnPageFirst.Opacity = If(Page > 1, 1, 0.2)
BtnPageLeft.IsEnabled = Page > 0
- BtnPageLeft.Opacity = If(BtnPageLeft.IsEnabled, 1, 0.2)
- BtnPageRight.IsEnabled = Storage.Results.Count > PageSize * (Page + 1) OrElse
- Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal
- BtnPageRight.Opacity = If(BtnPageRight.IsEnabled, 1, 0.2)
+ BtnPageLeft.Opacity = If(Page > 0, 1, 0.2)
+ Dim IsRightEnabled As Boolean = '由于 WPF 的未知 bug，读取到的 IsEnabled 可能是错误的值（#3319）
+ Storage.Results.Count > PageSize * (Page + 1) OrElse
+ Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal
+ BtnPageRight.IsEnabled = IsRightEnabled
+ BtnPageRight.Opacity = If(IsRightEnabled, 1, 0.2)
'错误信息
If Storage.ErrorMessage Is Nothing Then
HintError.Visibility = Visibility.Collapsed
@@ -89,11 +91,12 @@
Page = NewPage
FrmMain.BackToTop()
Log($"[Download] Mod 切换到第 {Page + 1} 页")
- RunInThread(Sub()
- Thread.Sleep(100) '等待向上滚的动画结束
- RunInUi(Sub() CardPages.IsEnabled = True)
- Loader.Start()
- End Sub)
+ RunInThread(
+ Sub()
+ Thread.Sleep(100) '等待向上滚的动画结束
+ RunInUi(Sub() CardPages.IsEnabled = True)
+ Loader.Start()
+ End Sub)
End Sub
#Region "搜索"
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml
new file mode 100644
index 0000000..f9b7bc3
--- /dev/null
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb
new file mode 100644
index 0000000..064dda5
--- /dev/null
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadNeoForge.xaml.vb
@@ -0,0 +1,34 @@
+Public Class PageDownloadNeoForge
+
+ Private Sub LoaderInit() Handles Me.Initialized
+ PageLoaderInit(Load, PanLoad, PanMain, CardTip, DlNeoForgeListLoader, AddressOf Load_OnFinish)
+ End Sub
+ Private Sub Init() Handles Me.Loaded
+ PanBack.ScrollToHome()
+ End Sub
+
+ Private Sub Load_OnFinish()
+ '结果数据化
+ Try
+ '归类
+ Dim Dict = DlNeoForgeListLoader.Output.Value.GroupBy(Function(d) d.Inherit).OrderByDescending(Function(g) g.Key).
+ ToDictionary(Function(g) g.Key, Function(g) g.ToList())
+ '清空当前
+ PanMain.Children.Clear()
+ '转化为 UI
+ For Each Pair As KeyValuePair(Of String, List(Of DlNeoForgeListEntry)) In Dict
+ If Not Pair.Value.Any() Then Continue For
+ '增加卡片
+ Dim NewCard As New MyCard With {.Title = Pair.Key & " (" & Pair.Value.Count & ")", .Margin = New Thickness(0, 0, 0, 15), .SwapType = 13}
+ Dim NewStack As New StackPanel With {.Margin = New Thickness(20, MyCard.SwapedHeight, 18, 0), .VerticalAlignment = VerticalAlignment.Top, .RenderTransform = New TranslateTransform(0, 0), .Tag = Pair.Value}
+ NewCard.Children.Add(NewStack)
+ NewCard.SwapControl = NewStack
+ NewCard.IsSwaped = True
+ PanMain.Children.Add(NewCard)
+ Next
+ Catch ex As Exception
+ Log(ex, "可视化 NeoForge 版本列表出错", LogLevel.Feedback)
+ End Try
+ End Sub
+
+End Class
\ No newline at end of file
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb
index 0fc791c..27c2fd4 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadOptiFine.xaml.vb
@@ -13,7 +13,7 @@
'归类
Dim Dict As New Dictionary(Of String, List(Of DlOptiFineListEntry))
Dict.Add("快照版本", New List(Of DlOptiFineListEntry))
- For VersionCode As Integer = 30 To 0 Step -1
+ For VersionCode As Integer = 50 To 0 Step -1
Dict.Add("1." & VersionCode, New List(Of DlOptiFineListEntry))
Next
For Each Version As DlOptiFineListEntry In DlOptiFineListLoader.Output.Value
@@ -42,14 +42,10 @@
PanMain.Children.Add(NewCard)
Next
Catch ex As Exception
- Log(ex, "可视化版本列表出错", LogLevel.Feedback)
+ Log(ex, "可视化 OptiFine 版本列表出错", LogLevel.Feedback)
End Try
End Sub
- Public Sub DownloadStart(sender As MyListItem, e As Object)
- McDownloadOptiFine(sender.Tag)
- End Sub
-
Private Sub BtnWeb_Click(sender As Object, e As EventArgs) Handles BtnWeb.Click
OpenWebsite("https://www.optifine.net/")
End Sub
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml
index a59954f..1ed768b 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml
@@ -32,6 +32,7 @@
+
diff --git a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml.vb b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml.vb
index d9cbd06..6ec8a31 100644
--- a/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageDownload/PageDownloadPack.xaml.vb
@@ -39,12 +39,14 @@
Visibility.Visible, Visibility.Collapsed)
LabPage.Text = Page + 1
BtnPageFirst.IsEnabled = Page > 1
- BtnPageFirst.Opacity = If(BtnPageFirst.IsEnabled, 1, 0.2)
+ BtnPageFirst.Opacity = If(Page > 1, 1, 0.2)
BtnPageLeft.IsEnabled = Page > 0
- BtnPageLeft.Opacity = If(BtnPageLeft.IsEnabled, 1, 0.2)
- BtnPageRight.IsEnabled = Storage.Results.Count > PageSize * (Page + 1) OrElse
- Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal
- BtnPageRight.Opacity = If(BtnPageRight.IsEnabled, 1, 0.2)
+ BtnPageLeft.Opacity = If(Page > 0, 1, 0.2)
+ Dim IsRightEnabled As Boolean = '由于 WPF 的未知 bug，读取到的 IsEnabled 可能是错误的值（#3319）
+ Storage.Results.Count > PageSize * (Page + 1) OrElse
+ Storage.CurseForgeOffset < Storage.CurseForgeTotal OrElse Storage.ModrinthOffset < Storage.ModrinthTotal
+ BtnPageRight.IsEnabled = IsRightEnabled
+ BtnPageRight.Opacity = If(IsRightEnabled, 1, 0.2)
'错误信息
If Storage.ErrorMessage Is Nothing Then
HintError.Visibility = Visibility.Collapsed
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb
index 692bf17..91f0bc6 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/MySkin.xaml.vb
@@ -241,7 +241,7 @@ Retry:
{"Translator-Chinese", "Crowdin 中文翻译者披风"}, {"Translator", "Crowdin 翻译者披风"}, {"Cobalt", "Cobalt 披风"},
{"Vanilla", "原版披风"}, {"Minecon2011", "Minecon 2011 参与者披风"}, {"Minecon2012", "Minecon 2012 参与者披风"},
{"Minecon2013", "Minecon 2013 参与者披风"}, {"Minecon2015", "Minecon 2015 参与者披风"}, {"Minecon2016", "Minecon 2016 参与者披风"},
- {"Cherry Blossom", "樱花披风"}, {"15th Anniversary", "15 周年纪念披风"}, {"Purple Heart", "紫色心形披风"}
+ {"Cherry Blossom", "樱花披风"}, {"15th Anniversary", "15 周年纪念披风"}, {"Purple Heart", "紫色心形披风"}, {"Follower's", "追随者披风"}
}
Dim SelectionControl As New List(Of IMyRadio) From {New MyRadioBox With {.Text = "无披风"}}
For Each Cape In SkinData("capes")
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb
index c7da13c..60005b2 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchLeft.xaml.vb
@@ -21,6 +21,19 @@
'加载版本
RunInNewThread(
Sub()
+ ''自动整合包安装：准备
+ 'Dim PackInstallPath As String = Nothing
+ 'If File.Exists(Path & "modpack.zip") Then PackInstallPath = Path & "modpack.zip"
+ 'If File.Exists(Path & "modpack.mrpack") Then PackInstallPath = Path & "modpack.mrpack"
+ 'If PackInstallPath IsNot Nothing Then
+ ' Log("[Launch] 需自动安装整合包：" & PackInstallPath, LogLevel.Debug)
+ ' If Not Directory.Exists(Path & ".minecraft\") Then
+ ' Directory.CreateDirectory(Path & ".minecraft\")
+ ' Directory.CreateDirectory(Path & ".minecraft\versions\")
+ ' McFolderLauncherProfilesJsonCreate(Path & ".minecraft\")
+ ' End If
+ ' Setup.Set("LaunchFolderSelect", "$.minecraft\")
+ 'End If
'确认 Minecraft 文件夹存在
PathMcFolder = Setup.Get("LaunchFolderSelect").ToString.Replace("$", Path)
If PathMcFolder = "" OrElse Not Directory.Exists(PathMcFolder) Then
@@ -35,17 +48,21 @@
End If
Log("[Launch] Minecraft 文件夹：" & PathMcFolder)
If Setup.Get("SystemDebugDelay") Then Thread.Sleep(RandomInteger(500, 3000))
+ ''自动整合包安装
+ 'If PackInstallPath IsNot Nothing Then
+ ' If ModpackInstall(PackInstallPath) Then
+ ' Log("[Launch] 自动安装整合包成功：" & PackInstallPath)
+ ' File.Delete(PackInstallPath)
+ ' Else
+ ' Log("[Launch] 自动安装整合包失败：" & PackInstallPath)
+ ' End If
+ 'End If
'确认 Minecraft 版本存在
Dim Selection As String = Setup.Get("LaunchVersionSelect")
- Dim Version As McVersion
- If Selection = "" Then
- Version = Nothing
- Else
- Version = New McVersion(Selection)
- End If
- If IsNothing(Version) OrElse Not (Version.Path.StartsWith(PathMcFolder) AndAlso Version.Check) Then
+ Dim Version As McVersion = If(Selection = "", Nothing, New McVersion(Selection))
+ If Version Is Nothing OrElse Not (Version.Path.StartsWith(PathMcFolder) AndAlso Version.Check) Then
'无效的版本
- Log("[Launch] Minecraft 版本无效" & If(IsNothing(Version), "，没有有效版本", "：" & Version.Path), If(IsNothing(Version), LogLevel.Normal, LogLevel.Debug))
+ Log("[Launch] Minecraft 版本无效" & If(Version Is Nothing, "，没有有效版本", "：" & Version.Path), If(IsNothing(Version), LogLevel.Normal, LogLevel.Debug))
If Not McVersionListLoader.State = LoadState.Finished Then LoaderFolderRun(McVersionListLoader, PathMcFolder, LoaderFolderRunType.ForceRun, MaxDepth:=1, ExtraPath:="versions\", WaitForExit:=True)
If Not McVersionList.Any() OrElse McVersionList.First.Value(0).Logo.Contains("RedstoneBlock") Then
Version = Nothing
@@ -619,7 +636,7 @@ Finish:
Log("[Minecraft] 启动按钮：正在加载 Minecraft 版本")
FrmLaunchLeft.BtnLaunch.Text = "正在加载"
FrmLaunchLeft.BtnLaunch.IsEnabled = False
- FrmLaunchLeft.LabVersion.Text = "正在加载版本列表，请稍候"
+ FrmLaunchLeft.LabVersion.Text = "正在加载中，请稍候"
FrmLaunchLeft.BtnVersion.IsEnabled = False
FrmLaunchLeft.BtnMore.Visibility = Visibility.Collapsed
Case 1
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb
index 8da1fc5..5efe384 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLaunchRight.xaml.vb
@@ -27,15 +27,16 @@
''' 刷新自定义主页。
'''
Private Sub Refresh() Handles Me.Loaded
- RunInNewThread(Sub()
- Try
- SyncLock RefreshLock
- RefreshReal()
- End SyncLock
- Catch ex As Exception
- Log(ex, "加载 PCL 主页自定义信息失败", LogLevel.Msgbox)
- End Try
- End Sub, $"刷新自定义主页 #{GetUuid()}")
+ RunInNewThread(
+ Sub()
+ Try
+ SyncLock RefreshLock
+ RefreshReal()
+ End SyncLock
+ Catch ex As Exception
+ Log(ex, "加载 PCL 主页自定义信息失败", LogLevel.Msgbox)
+ End Try
+ End Sub, $"刷新自定义主页 #{GetUuid()}")
End Sub
Private Sub RefreshReal()
Dim Content As String = ""
@@ -155,7 +156,6 @@ Download:
Else
Log(ex, $"联网下载自定义主页失败（{Address}）")
End If
- Address = ""
End Try
End Sub
@@ -204,7 +204,7 @@ Download:
End If
Content = "" & Content & ""
Content = HelpArgumentReplace(Content)
- Log($"[Page] 实例化：加载自定义主页 UI，最终内容长度：{Content.Count}")
+ Log($"[Page] 实例化：加载自定义主页 UI 开始，最终内容长度：{Content.Count}")
Try
PanCustom.Children.Add(GetObjectFromXML(Content))
Catch ex As Exception
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb
index b5422ae..3476e70 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginAuth.xaml.vb
@@ -71,9 +71,9 @@
End Sub
Private Sub Btn_Click(sender As Object, e As EventArgs) Handles BtnLink.Click
If BtnLink.Content = "注册账号" Then
- OpenWebsite(If(McVersionCurrent Is Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister")))
+ OpenWebsite(If(McVersionCurrent IsNot Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister")))
Else
- Dim Website As String = If(McVersionCurrent Is Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister"))
+ Dim Website As String = If(McVersionCurrent IsNot Nothing, Setup.Get("VersionServerAuthRegister", Version:=McVersionCurrent), Setup.Get("CacheAuthServerRegister"))
OpenWebsite(Website.Replace("/auth/register", "/auth/forgot"))
End If
End Sub
diff --git a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb
index 4bf92e2..e61fa4e 100644
--- a/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageLaunch/PageLoginMs.xaml.vb
@@ -39,14 +39,15 @@
Public Shared Function GetLoginData() As McLoginMs
If FrmLoginMs Is Nothing Then Return New McLoginMs With {.OAuthRefreshToken = Setup.Get("CacheMsOAuthRefresh"), .UserName = Setup.Get("CacheMsName")}
Dim Result As McLoginMs = Nothing
- RunInUiWait(Sub()
- If FrmLoginMs.ComboAccounts.SelectedIndex = 0 Then
- Result = New McLoginMs
- Else
- Dim Item As MyListItem = FrmLoginMs.ComboAccounts.SelectedItem
- Result = New McLoginMs With {.OAuthRefreshToken = Item.Tag, .UserName = Item.Title}
- End If
- End Sub)
+ RunInUiWait(
+ Sub()
+ If FrmLoginMs.ComboAccounts.SelectedIndex = 0 Then
+ Result = New McLoginMs
+ Else
+ Dim Item As MyListItem = FrmLoginMs.ComboAccounts.SelectedItem
+ Result = New McLoginMs With {.OAuthRefreshToken = Item.Tag, .UserName = Item.Title}
+ End If
+ End Sub)
Return Result
End Function
'''
diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml
index a404b44..b586851 100644
--- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml
+++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml
@@ -104,139 +104,312 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml.vb b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml.vb
index 40afd2e..b8a84e6 100644
--- a/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageOther/PageOtherAbout.xaml.vb
@@ -27,7 +27,7 @@
Public Shared Sub CopyUniqueAddress() Handles BtnDonateCopy.Click
ClipboardSet(UniqueAddress)
End Sub
- Private Sub DonateCodeInput() Handles BtnDonateInput.Click
+ Private Sub BtnDonateCodeInput_Click() Handles BtnDonateInput.Click
DonateCodeInput()
End Sub
diff --git a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb
index 1709a4a..5b88927 100644
--- a/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageSelectRight.xaml.vb
@@ -38,17 +38,21 @@
CardName = "常规版本"
Case McVersionCardType.API
Dim IsForgeExists As Boolean = False
+ Dim IsNeoForgeExists As Boolean = False
Dim IsFabricExists As Boolean = False
Dim IsLiteExists As Boolean = False
For Each Version As McVersion In Card.Value
If Version.Version.HasFabric Then IsFabricExists = True
If Version.Version.HasLiteLoader Then IsLiteExists = True
If Version.Version.HasForge Then IsForgeExists = True
+ If Version.Version.HasNeoForge Then IsNeoForgeExists = True
Next
- If If(IsLiteExists, 1, 0) + If(IsForgeExists, 1, 0) + If(IsFabricExists, 1, 0) > 1 Then
+ If If(IsLiteExists, 1, 0) + If(IsForgeExists, 1, 0) + If(IsFabricExists, 1, 0) + If(IsNeoForgeExists, 1, 0) > 1 Then
CardName = "可安装 Mod"
ElseIf IsForgeExists Then
CardName = "Forge 版本"
+ ElseIf IsNeoForgeExists Then
+ CardName = "NeoForge 版本"
ElseIf IsLiteExists Then
CardName = "LiteLoader 版本"
Else
@@ -210,8 +214,8 @@
FrmMain.PageChange(FormMain.PageType.Download, FormMain.PageSubType.DownloadInstall)
End Sub
+ '修改此代码时，同时修改 PageVersionOverall 中的代码
Public Shared Sub DeleteVersion(Item As MyListItem, Version As McVersion)
- '修改此代码时，同时修改 PageVersionOverall 中的代码
Try
Dim IsShiftPressed As Boolean = My.Computer.Keyboard.ShiftKeyDown
Dim IsHintIndie As Boolean = Version.State <> McVersionState.Error AndAlso Version.PathIndie <> PathMcFolder
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb
index faef9cc..31025f3 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb
+++ b/Plain Craft Launcher 2/Pages/PageSetup/ModSetup.vb
@@ -163,6 +163,7 @@
{"VersionAdvanceRunWait", New SetupEntry(True, Source:=SetupSource.Version)},
{"VersionRamType", New SetupEntry(2, Source:=SetupSource.Version)},
{"VersionRamCustom", New SetupEntry(15, Source:=SetupSource.Version)},
+ {"VersionRamOptimize", New SetupEntry(0, Source:=SetupSource.Version)},
{"VersionArgumentTitle", New SetupEntry("", Source:=SetupSource.Version)},
{"VersionArgumentInfo", New SetupEntry("", Source:=SetupSource.Version)},
{"VersionArgumentIndie", New SetupEntry(-1, Source:=SetupSource.Version)},
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb
index 99b962a..fe721e6 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupLaunch.xaml.vb
@@ -206,10 +206,8 @@
SliderRamCustom.MaxValue = Math.Floor((RamTotal - 1.5) / 0.5) + 12
ElseIf RamTotal <= 16 Then
SliderRamCustom.MaxValue = Math.Floor((RamTotal - 8) / 1) + 25
- ElseIf RamTotal <= 32 Then
- SliderRamCustom.MaxValue = Math.Floor((RamTotal - 16) / 2) + 33
Else
- SliderRamCustom.MaxValue = Math.Min(Math.Floor((RamTotal - 32) / 4) + 41, 49)
+ SliderRamCustom.MaxValue = Math.Min(Math.Floor((RamTotal - 16) / 2) + 33, 41)
End If
'设置文本
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
@@ -259,7 +257,6 @@
End If
If RamTextLeft <> Left Then
RamTextLeft = Left
- 'If AniControlEnabled = 0 Then
Select Case Left
Case 0
AniStart({
@@ -280,22 +277,6 @@
AaOpacity(LabRamUsedTitle, 0.7 - LabRamUsedTitle.Opacity, 100)
}, "SetupLaunch Ram TextLeft")
End Select
- 'Else
- ' Select Case Left
- ' Case 0
- ' LabRamUsed.Opacity = 0
- ' LabRamTotal.Opacity = 0
- ' LabRamUsedTitle.Opacity = 0
- ' Case 1
- ' LabRamUsed.Opacity = 1
- ' LabRamTotal.Opacity = 0
- ' LabRamUsedTitle.Opacity = 0.7
- ' Case 2
- ' LabRamUsed.Opacity = 1
- ' LabRamTotal.Opacity = 1
- ' LabRamUsedTitle.Opacity = 0.7
- ' End Select
- 'End If
End If
'右侧
Dim Right As Integer
@@ -404,15 +385,14 @@ PreFin:
RamGive = (Value - 12) * 0.5 + 1.5
ElseIf Value <= 33 Then
RamGive = (Value - 25) * 1 + 8
- ElseIf Value <= 41 Then
- RamGive = (Value - 33) * 2 + 16
Else
- RamGive = (Value - 41) * 4 + 32
+ RamGive = (Value - 33) * 2 + 16
End If
End If
'若使用 32 位 Java，则限制为 1G
If If(Is32BitJava, Not JavaIs64Bit(If(UseVersionJavaSetup, Version, Nothing))) Then RamGive = Math.Min(1, RamGive)
- Return RamGive
+ '封顶 32G
+ Return Math.Min(32, RamGive)
End Function
#End Region
@@ -557,8 +537,8 @@ PreFin:
Private Sub CheckArgumentRam_Change() Handles CheckArgumentRam.Change
If AniControlEnabled <> 0 Then Exit Sub
If Not CheckArgumentRam.Checked Then Return
- If MyMsgBox("内存优化耗时较长，这会拖慢游戏的启动过程，建议仅在电脑内存不充裕时开启此选项。" & vbCrLf &
- "如果你在使用机械硬盘，这还可能会导致一小段时间的严重卡顿。" &
+ If MyMsgBox("内存优化会显著延长启动耗时，建议仅在内存不足时开启。" & vbCrLf &
+ "如果你在使用机械硬盘，这还可能导致一小段时间的严重卡顿。" &
If(IsAdmin(), "", $"{vbCrLf}{vbCrLf}每次启动游戏，PCL 都需要申请管理员权限以进行内存优化。{vbCrLf}若想自动授予权限，可以右键 PCL，打开 属性 → 兼容性 → 以管理员身份运行此程序。"),
"提醒", "确定", "取消") = 2 Then
CheckArgumentRam.Checked = False
diff --git a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb
index 181eb95..2951a1a 100644
--- a/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageSetup/PageSetupUI.xaml.vb
@@ -41,8 +41,8 @@
'设置解锁
If Not RadioLauncherTheme8.IsEnabled Then LabLauncherTheme8Copy.ToolTip = "累积赞助达到 ¥23.33 后，在爱发电私信发送【解锁码】以解锁。" & vbCrLf & "右键打开赞助页面，如果觉得 PCL 做得还不错就支持一下吧 =w=！"
RadioLauncherTheme8.ToolTip = "累积赞助达到 ¥23.33 后，在爱发电私信发送【解锁码】以解锁"
- If Not RadioLauncherTheme9.IsEnabled Then LabLauncherTheme9Copy.ToolTip = "· 反馈一个 Bug，在 Issue 标记为 [已完成] 后回复 Issue 要求解锁（右键打开反馈页面）" & vbCrLf & "· 向帮助库提交 Pull Request，在龙猫合并后解锁"
- RadioLauncherTheme9.ToolTip = "· 反馈一个 Bug，在反馈标记为 [完成] 后回复 Issue 要求解锁" & vbCrLf & "· 向帮助库提交 Pull Request，在龙猫合并后解锁"
+ If Not RadioLauncherTheme9.IsEnabled Then LabLauncherTheme9Copy.ToolTip = "· 反馈一个 Bug，在标记为 [完成] 后回复识别码要求解锁（右键打开反馈页面）" & vbCrLf & "· 提交一个 Pull Request，在合并后回复识别码要求解锁"
+ RadioLauncherTheme9.ToolTip = "· 反馈一个 Bug，在标记为 [完成] 后回复识别码要求解锁" & vbCrLf & "· 提交一个 Pull Request，在合并后回复识别码要求解锁"
'极客蓝的处理在 ThemeCheck 中
End Sub
@@ -83,7 +83,11 @@
MusicRefreshUI()
'主页
- ComboCustomPreset.SelectedIndex = Setup.Get("UiCustomPreset")
+ Try
+ ComboCustomPreset.SelectedIndex = Setup.Get("UiCustomPreset")
+ Catch
+ Setup.Reset("UiCustomPreset")
+ End Try
CType(FindName("RadioCustomType" & Setup.Load("UiCustomType")), MyRadioBox).Checked = True
TextCustomNet.Text = Setup.Get("UiCustomNet")
@@ -360,27 +364,28 @@ Refresh:
End Sub
Private Sub BtnMusicClear_Click(sender As Object, e As EventArgs) Handles BtnMusicClear.Click
If MyMsgBox("即将删除背景音乐文件夹中的所有文件。" & vbCrLf & "此操作不可撤销，是否确定？", "警告",, "取消", IsWarn:=True) = 1 Then
- RunInThread(Sub()
- Hint("正在删除背景音乐……")
- '停止播放音乐
- MusicNAudio = Nothing
- MusicWaitingList = New List(Of String)
- MusicAllList = New List(Of String)
- Thread.Sleep(200)
- '删除文件
- Try
- DeleteDirectory(Path & "PCL\Musics")
- Hint("背景音乐已删除！", HintType.Finish)
- Catch ex As Exception
- Log(ex, "删除背景音乐失败", LogLevel.Msgbox)
- End Try
- Try
- Directory.CreateDirectory(Path & "PCL\Musics")
- RunInUi(Sub() MusicRefreshPlay(False))
- Catch ex As Exception
- Log(ex, "重建背景音乐文件夹失败", LogLevel.Msgbox)
- End Try
- End Sub)
+ RunInThread(
+ Sub()
+ Hint("正在删除背景音乐……")
+ '停止播放音乐
+ MusicNAudio = Nothing
+ MusicWaitingList = New List(Of String)
+ MusicAllList = New List(Of String)
+ Thread.Sleep(200)
+ '删除文件
+ Try
+ DeleteDirectory(Path & "PCL\Musics")
+ Hint("背景音乐已删除！", HintType.Finish)
+ Catch ex As Exception
+ Log(ex, "删除背景音乐失败", LogLevel.Msgbox)
+ End Try
+ Try
+ Directory.CreateDirectory(Path & "PCL\Musics")
+ RunInUi(Sub() MusicRefreshPlay(False))
+ Catch ex As Exception
+ Log(ex, "重建背景音乐文件夹失败", LogLevel.Msgbox)
+ End Try
+ End Sub)
End If
End Sub
Private Sub CheckMusicStart_Change() Handles CheckMusicStart.Change
@@ -423,9 +428,9 @@ Refresh:
RadioLauncherTheme5Gray.Opacity -= 0.23
RadioLauncherTheme5.Opacity += 0.23
AniStart({
- AaOpacity(RadioLauncherTheme5Gray, 1, 1000),
- AaOpacity(RadioLauncherTheme5, -1, 1000)
- }, "ThemeUnlock")
+ AaOpacity(RadioLauncherTheme5Gray, 1, 1000),
+ AaOpacity(RadioLauncherTheme5, -1, 1000)
+ }, "ThemeUnlock")
If RadioLauncherTheme5Gray.Opacity < 0.08 Then
ThemeUnlock(5, UnlockHint:="隐藏主题 玄素黑 已解锁！")
AniStop("ThemeUnlock")
@@ -433,7 +438,7 @@ Refresh:
End If
End Sub
Private Sub LabLauncherTheme11Click_MouseLeftButtonUp() Handles LabLauncherTheme11Click.MouseLeftButtonUp, RadioLauncherTheme11.MouseRightButtonUp
- If LabLauncherTheme11Click.Visibility = Visibility.Collapsed OrElse LabLauncherTheme11Click.ToolTip.ToString.Contains("点击") Then
+ If LabLauncherTheme11Click.Visibility = Visibility.Collapsed OrElse If(LabLauncherTheme11Click.ToolTip, "").ToString.Contains("点击") Then
If MyMsgBox(
"1. 不爬取或攻击相关服务或网站，不盗取相关账号，没有谜题可以或需要以此来解决。" & vbCrLf &
"2. 不得篡改或损毁相关公开信息，请尽量让它们保持原状。" & vbCrLf &
@@ -664,18 +669,10 @@ Refresh:
'滑动条
Private Sub SliderLoad()
- SliderMusicVolume.GetHintText = Function(Value As Integer)
- Return Math.Ceiling(Value * 0.1) & "%"
- End Function
- SliderLauncherOpacity.GetHintText = Function(Value As Integer)
- Return Math.Round(40 + Value * 0.1) & "%"
- End Function
- SliderLauncherHue.GetHintText = Function(Value As Integer)
- Return Value & "°"
- End Function
- SliderLauncherSat.GetHintText = Function(Value As Integer)
- Return Value & "%"
- End Function
+ SliderMusicVolume.GetHintText = Function(v) Math.Ceiling(v * 0.1) & "%"
+ SliderLauncherOpacity.GetHintText = Function(v) Math.Round(40 + v * 0.1) & "%"
+ SliderLauncherHue.GetHintText = Function(v) v & "°"
+ SliderLauncherSat.GetHintText = Function(v) v & "%"
SliderLauncherDelta.GetHintText = Function(Value As Integer)
If Value > 90 Then
Return "+" & (Value - 90)
@@ -694,12 +691,8 @@ Refresh:
Return Value - 20
End If
End Function
- SliderBackgroundOpacity.GetHintText = Function(Value As Integer)
- Return Math.Round(Value * 0.1) & "%"
- End Function
- SliderBackgroundBlur.GetHintText = Function(Value As Integer)
- Return Value & " 像素"
- End Function
+ SliderBackgroundOpacity.GetHintText = Function(v) Math.Round(v * 0.1) & "%"
+ SliderBackgroundBlur.GetHintText = Function(v) v & " 像素"
End Sub
End Class
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
index 9af7c14..c909f09 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionMod.xaml.vb
@@ -607,8 +607,10 @@
If ModEntry.Comp IsNot Nothing Then
'跳转到 Mod 下载页面
FrmMain.PageChange(New FormMain.PageStackData With {.Page = FormMain.PageType.CompDetail,
- .Additional = {ModEntry.Comp, New List(Of String), PageVersionLeft.Version.Version.McName,
- If(PageVersionLeft.Version.Version.HasForge, CompModLoaderType.Forge, If(PageVersionLeft.Version.Version.HasFabric, CompModLoaderType.Fabric, CompModLoaderType.Any))}})
+ .Additional = {ModEntry.Comp, New List(Of String), PageVersionLeft.Version.Version.McName,
+ If(PageVersionLeft.Version.Version.HasForge, CompModLoaderType.Forge,
+ If(PageVersionLeft.Version.Version.HasNeoForge, CompModLoaderType.NeoForge,
+ If(PageVersionLeft.Version.Version.HasFabric, CompModLoaderType.Fabric, CompModLoaderType.Any)))}})
Else
'获取信息
Dim ContentLines As New List(Of String)
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionModDisabled.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionModDisabled.xaml
index cfbd13a..1daef41 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionModDisabled.xaml
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionModDisabled.xaml
@@ -22,7 +22,7 @@
-
+
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml
index 3452357..d461c04 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml
@@ -37,6 +37,7 @@
+
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb
index e4fc8ec..4619d5b 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionOverall.xaml.vb
@@ -127,6 +127,8 @@
'重命名主文件夹
My.Computer.FileSystem.RenameDirectory(OldPath, TempName)
My.Computer.FileSystem.RenameDirectory(TempPath, NewName)
+ '清理 ini 缓存
+ IniClearCache(PageVersionLeft.Version.Path & "PCL\Setup.ini")
'遍历重命名所有文件与文件夹
For Each Entry As DirectoryInfo In New DirectoryInfo(NewPath).EnumerateDirectories
If Not Entry.Name.Contains(OldName) Then Continue For
@@ -292,16 +294,17 @@
End SyncLock
'启动
Dim Loader As New LoaderCombo(Of String)(PageVersionLeft.Version.Name & " 文件补全", DlClientFix(PageVersionLeft.Version, True, AssetsIndexExistsBehaviour.AlwaysDownload, False))
- Loader.OnStateChanged = Sub()
- Select Case Loader.State
- Case LoadState.Finished
- Hint(Loader.Name & "成功！", HintType.Finish)
- Case LoadState.Failed
- Hint(Loader.Name & "失败：" & GetExceptionSummary(Loader.Error), HintType.Critical)
- Case LoadState.Aborted
- Hint(Loader.Name & "已取消！", HintType.Info)
- End Select
- End Sub
+ Loader.OnStateChanged =
+ Sub()
+ Select Case Loader.State
+ Case LoadState.Finished
+ Hint(Loader.Name & "成功！", HintType.Finish)
+ Case LoadState.Failed
+ Hint(Loader.Name & "失败：" & GetExceptionSummary(Loader.Error), HintType.Critical)
+ Case LoadState.Aborted
+ Hint(Loader.Name & "已取消！", HintType.Info)
+ End Select
+ End Sub
Loader.Start(PageVersionLeft.Version.Name)
LoaderTaskbarAdd(Loader)
FrmMain.BtnExtraDownload.ShowRefresh()
@@ -312,8 +315,8 @@
End Sub
'删除版本
+ '修改此代码时，同时修改 PageSelectRight 中的代码
Private Sub BtnManageDelete_Click(sender As Object, e As EventArgs) Handles BtnManageDelete.Click
- '修改此代码时，同时修改 PageSelectRight 中的代码
Try
Dim IsShiftPressed As Boolean = My.Computer.Keyboard.ShiftKeyDown
Dim IsHintIndie As Boolean = PageVersionLeft.Version.State <> McVersionState.Error AndAlso PageVersionLeft.Version.PathIndie <> PathMcFolder
@@ -321,6 +324,7 @@
If(IsHintIndie, vbCrLf & "由于该版本开启了版本隔离，删除版本时该版本对应的存档、资源包、Mod 等文件也将被一并删除！", ""),
"版本删除确认", , "取消",, IsHintIndie OrElse IsShiftPressed)
Case 1
+ IniClearCache(PageVersionLeft.Version.Path & "PCL\Setup.ini")
If IsShiftPressed Then
DeleteDirectory(PageVersionLeft.Version.Path)
Hint("版本 " & PageVersionLeft.Version.Name & " 已永久删除！", HintType.Finish)
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml
index e523d04..6dfb1fa 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml
@@ -77,6 +77,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb
index ad72125..ae11fc8 100644
--- a/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb
+++ b/Plain Craft Launcher 2/Pages/PageVersion/PageVersionSetup.xaml.vb
@@ -51,6 +51,7 @@
'游戏内存
CType(FindName("RadioRamType" & Setup.Load("VersionRamType", Version:=PageVersionLeft.Version)), MyRadioBox).Checked = True
SliderRamCustom.Value = Setup.Get("VersionRamCustom", Version:=PageVersionLeft.Version)
+ ComboRamOptimize.SelectedIndex = Setup.Get("VersionRamOptimize", Version:=PageVersionLeft.Version)
'服务器
TextServerEnter.Text = Setup.Get("VersionServerEnter", Version:=PageVersionLeft.Version)
@@ -95,6 +96,7 @@
Setup.Set("VersionArgumentIndie", 0, Version:=PageVersionLeft.Version)
Setup.Reset("VersionRamType", Version:=PageVersionLeft.Version)
Setup.Reset("VersionRamCustom", Version:=PageVersionLeft.Version)
+ Setup.Reset("VersionRamOptimize", Version:=PageVersionLeft.Version)
Setup.Reset("VersionAdvanceJvm", Version:=PageVersionLeft.Version)
Setup.Reset("VersionAdvanceGame", Version:=PageVersionLeft.Version)
Setup.Reset("VersionAdvanceAssets", Version:=PageVersionLeft.Version)
@@ -130,7 +132,7 @@
Private Shared Sub SliderChange(sender As MySlider, e As Object) Handles SliderRamCustom.Change
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.Value, Version:=PageVersionLeft.Version)
End Sub
- Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged
+ Private Shared Sub ComboChange(sender As MyComboBox, e As Object) Handles ComboArgumentIndie.SelectionChanged, ComboRamOptimize.SelectionChanged
If AniControlEnabled = 0 Then Setup.Set(sender.Tag, sender.SelectedIndex, Version:=PageVersionLeft.Version)
End Sub
Private Shared Sub CheckBoxChange(sender As MyCheckBox, e As Object) Handles CheckAdvanceRunWait.Change, CheckAdvanceAssetsV2.Change, CheckAdvanceJava.Change
@@ -163,10 +165,8 @@
SliderRamCustom.MaxValue = Math.Floor((RamTotal - 1.5) / 0.5) + 12
ElseIf RamTotal <= 16 Then
SliderRamCustom.MaxValue = Math.Floor((RamTotal - 8) / 1) + 25
- ElseIf RamTotal <= 32 Then
- SliderRamCustom.MaxValue = Math.Floor((RamTotal - 16) / 2) + 33
Else
- SliderRamCustom.MaxValue = Math.Min(Math.Floor((RamTotal - 32) / 4) + 41, 49)
+ SliderRamCustom.MaxValue = Math.Min(Math.Floor((RamTotal - 16) / 2) + 33, 41)
End If
'设置文本
LabRamGame.Text = If(RamGame = Math.Floor(RamGame), RamGame & ".0", RamGame) & " GB" &
@@ -351,15 +351,14 @@ PreFin:
RamGive = (Value - 12) * 0.5 + 1.5
ElseIf Value <= 33 Then
RamGive = (Value - 25) * 1 + 8
- ElseIf Value <= 41 Then
- RamGive = (Value - 33) * 2 + 16
Else
- RamGive = (Value - 41) * 4 + 32
+ RamGive = (Value - 33) * 2 + 16
End If
End If
'若使用 32 位 Java，则限制为 1G
If If(Is32BitJava, Not JavaIs64Bit(PageVersionLeft.Version)) Then RamGive = Math.Min(1, RamGive)
- Return RamGive
+ '封顶 32G
+ Return Math.Min(32, RamGive)
End Function
#End Region
diff --git a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
index bdaecc2..7c030f4 100644
--- a/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
+++ b/Plain Craft Launcher 2/Plain Craft Launcher 2.vbproj
@@ -38,7 +38,7 @@
false
false
true
- D:\Minecraft\程序\
+ .\bin\
Plain Craft Launcher 2.xml
41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
false
@@ -55,7 +55,7 @@
false
false
true
- D:\Minecraft\程序\
+ .\bin\
Plain Craft Launcher 2.xml
41999,42016,42017,42018,42019,42020,42021,42022,42032,42036,42314
false
@@ -100,7 +100,7 @@
false
- D:\Minecraft\程序\
+ .\bin\
Plain Craft Launcher 2.xml
true
1
@@ -111,7 +111,7 @@
false
- D:\Minecraft\程序\
+ .\bin\
Plain Craft Launcher 2.xml
true
1
@@ -129,7 +129,7 @@
- D:\Minecraft\程序\
+ .\bin\
RELEASE,BY_UPDATE
Plain Craft Launcher 2.xml
true
@@ -244,6 +244,9 @@
PageDownloadCompDetail.xaml
+
+ PageDownloadNeoForge.xaml
+
PageDownloadPack.xaml
@@ -497,6 +500,10 @@
Designer
MSBuild:Compile
+
+ Designer
+ MSBuild:Compile
+
Designer
MSBuild:Compile
@@ -925,6 +932,8 @@
-
+
+
+
\ No newline at end of file
diff --git a/Plain Craft Launcher 2/Resources/Custom.xaml b/Plain Craft Launcher 2/Resources/Custom.xaml
index f35be1d..df177e3 100644
--- a/Plain Craft Launcher 2/Resources/Custom.xaml
+++ b/Plain Craft Launcher 2/Resources/Custom.xaml
@@ -79,7 +79,11 @@
+ Text="启动 1.20.1 并进入 Hypixel" EventType="启动游戏" EventData="1.20.1|mc.hypixel.net" ToolTip="服务器 IP：mc.hypixel.net" />
+
+
@@ -144,7 +148,7 @@
+ Text="打开记事本" EventType="打开文件" EventData="notepad" />
@@ -180,28 +184,30 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
@@ -264,7 +270,7 @@
+ Text="打开记事本" EventType="打开文件" EventData="notepad" />
diff --git a/Plain Craft Launcher 2/Resources/Help.zip b/Plain Craft Launcher 2/Resources/Help.zip
index c55c8d3..600091f 100644
Binary files a/Plain Craft Launcher 2/Resources/Help.zip and b/Plain Craft Launcher 2/Resources/Help.zip differ