|
|
@@ -939,7 +939,7 @@ Finished:
|
|
|
'开始网络获取
|
|
|
Log($"[Mod] 目标加载器:{ModLoaders.Join("/")},版本:{McVersion}")
|
|
|
Dim EndedThreadCount As Integer = 0, IsFailed As Boolean = False
|
|
|
- Dim MainThread As Thread = Thread.CurrentThread
|
|
|
+ Dim CurrentTaskThread As Thread = Thread.CurrentThread
|
|
|
'从 Modrinth 获取信息
|
|
|
RunInNewThread(
|
|
|
Sub()
|
|
|
@@ -963,7 +963,7 @@ Finished:
|
|
|
Dim File As New CompFile(ModrinthVersion(Entry.ModrinthHash), CompType.Mod)
|
|
|
If Entry.CompFile Is Nothing OrElse Entry.CompFile.ReleaseDate < File.ReleaseDate Then Entry.CompFile = File
|
|
|
Next
|
|
|
- If Loader.IsAbortedWithThread(MainThread) Then Return
|
|
|
+ If Loader.IsAbortedWithThread(CurrentTaskThread) Then Return
|
|
|
Log($"[Mod] 需要从 Modrinth 获取 {ModrinthMapping.Count} 个本地 Mod 的工程信息")
|
|
|
'步骤 3:获取工程信息
|
|
|
If Not ModrinthMapping.Any() Then Return
|
|
|
@@ -1013,7 +1013,7 @@ Finished:
|
|
|
Dim CurseForgeHashes As New List(Of UInteger)
|
|
|
For Each Entry In Mods
|
|
|
CurseForgeHashes.Add(Entry.CurseForgeHash)
|
|
|
- If Loader.IsAbortedWithThread(MainThread) Then Return
|
|
|
+ If Loader.IsAbortedWithThread(CurrentTaskThread) Then Return
|
|
|
Next
|
|
|
Dim CurseForgeRaw = CType(CType(GetJson(DlModRequest("https://api.curseforge.com/v1/fingerprints/432", "POST",
|
|
|
$"{{""fingerprints"": [{CurseForgeHashes.Join(",")}]}}", "application/json")), JObject)("data")("exactMatches"), JContainer)
|
|
|
@@ -1034,7 +1034,7 @@ Finished:
|
|
|
If Entry.CompFile Is Nothing OrElse Entry.CompFile.ReleaseDate < File.ReleaseDate Then Entry.CompFile = File
|
|
|
Next
|
|
|
Next
|
|
|
- If Loader.IsAbortedWithThread(MainThread) Then Return
|
|
|
+ If Loader.IsAbortedWithThread(CurrentTaskThread) Then Return
|
|
|
Log($"[Mod] 需要从 CurseForge 获取 {CurseForgeMapping.Count} 个本地 Mod 的工程信息")
|
|
|
'步骤 3:获取工程信息
|
|
|
If Not CurseForgeMapping.Any() Then Return
|