Skip to content

Commit 6ca32cf

Browse files
authored
Merge pull request PCL-Community#267 from PCL-Community/Fix#Modpack
fix: install function not work
2 parents 4877573 + 9fd5b9d commit 6ca32cf

File tree

1 file changed

+13
-21
lines changed

1 file changed

+13
-21
lines changed

Plain Craft Launcher 2/Pages/PageDownload/PageDownloadCompDetail.xaml.vb

+13-21
Original file line numberDiff line numberDiff line change
@@ -175,34 +175,26 @@
175175
NewCard.Children.Add(NewStack)
176176
NewCard.InstallMethod = Sub(Stack As StackPanel)
177177
Stack.Tag = Sort(CType(Stack.Tag, List(Of CompFile)), Function(a, b) a.ReleaseDate > b.ReleaseDate)
178-
If Project.Type <> CompType.ModPack Then CompFilesCardPreload(Stack, Stack.Tag)
179-
Dim DisplayBadName = CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <> CType(Stack.Tag, List(Of CompFile)).Count
180-
'存在重复的名称(#1344)
181-
For Each item In Stack.Tag
182-
Stack.Children.Add(CType(item, CompFile).ToListItem(AddressOf FrmDownloadCompDetail.Save_Click, BadDisplayName:=DisplayBadName))
183-
Next
178+
If Project.Type = CompType.ModPack Then
179+
Dim BadDisplayName = CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <> CType(Stack.Tag, List(Of CompFile)).Count
180+
For Each item In Stack.Tag
181+
Stack.Children.Add(CType(item, CompFile).ToListItem(AddressOf FrmDownloadCompDetail.Install_Click, AddressOf FrmDownloadCompDetail.Save_Click, BadDisplayName:=BadDisplayName))
182+
Next
183+
Else
184+
CompFilesCardPreload(Stack, Stack.Tag)
185+
Dim BadDisplayName = CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <> CType(Stack.Tag, List(Of CompFile)).Count
186+
For Each item In Stack.Tag
187+
Stack.Children.Add(CType(item, CompFile).ToListItem(AddressOf FrmDownloadCompDetail.Save_Click, BadDisplayName:=BadDisplayName))
188+
Next
189+
End If
184190
End Sub
185191
NewCard.SwapControl = NewStack
186192
PanResults.Children.Add(NewCard)
187193
'确定卡片是否展开
188194
If Pair.Key = TargetCardName OrElse
189195
(FrmMain.PageCurrent.Additional IsNot Nothing AndAlso '#2761
190196
CType(FrmMain.PageCurrent.Additional(1), List(Of String)).Contains(NewCard.Title)) Then
191-
MyCard.StackInstall(NewStack, Sub(Stack As StackPanel)
192-
Stack.Tag = Sort(CType(Stack.Tag, List(Of CompFile)), Function(a, b) a.ReleaseDate > b.ReleaseDate)
193-
If Project.Type = CompType.ModPack Then
194-
Dim BadDisplayName = CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <> CType(Stack.Tag, List(Of CompFile)).Count
195-
For Each item In Stack.Tag
196-
Stack.Children.Add(CType(item, CompFile).ToListItem(AddressOf FrmDownloadCompDetail.Install_Click, AddressOf FrmDownloadCompDetail.Save_Click, BadDisplayName:=BadDisplayName))
197-
Next
198-
Else
199-
CompFilesCardPreload(Stack, Stack.Tag)
200-
Dim BadDisplayName = CType(Stack.Tag, List(Of CompFile)).Distinct(Function(a, b) a.DisplayName = b.DisplayName).Count <> CType(Stack.Tag, List(Of CompFile)).Count
201-
For Each item In Stack.Tag
202-
Stack.Children.Add(CType(item, CompFile).ToListItem(AddressOf FrmDownloadCompDetail.Save_Click, BadDisplayName:=BadDisplayName))
203-
Next
204-
End If
205-
End Sub)
197+
NewCard.StackInstall()
206198
Else
207199
NewCard.IsSwaped = True
208200
End If

0 commit comments

Comments
 (0)