mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-14 06:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge duplicate getLoaders methods into single core method

Browse Source
This commit is contained in:
comp500
2022-06-08 22:34:50 +01:00
parent 72fbc68256
commit f533e677ca
4 changed files with 17 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
curseforge/curseforge.go
View File

@@ -235,24 +235,6 @@ func getSearchLoaderType(pack core.Pack) int {
}
}
func getLoaders(pack core.Pack) (loaders []string) {
_, hasFabric := pack.Versions["fabric"]
if hasFabric {
loaders = append(loaders, "fabric")
}
if _, hasQuilt := pack.Versions["quilt"]; hasQuilt {
// Backwards-compatible with Fabric for now (could be configurable later)
if !hasFabric {
loaders = append(loaders, "fabric")
}
loaders = append(loaders, "quilt")
}
if _, hasForge := pack.Versions["forge"]; hasForge {
loaders = append(loaders, "forge")
}
return
}
func matchLoaderType(packLoaders []string, modLoaderType int) bool {
if len(packLoaders) == 0 || modLoaderType == modloaderTypeAny {
return true
@@ -361,7 +343,7 @@ func (u cfUpdater) CheckUpdate(mods []core.Mod, mcVersion string, pack core.Pack
}
}
packLoaders := getLoaders(pack)
packLoaders := pack.GetLoaders()
for i, v := range mods {
projectRaw, ok := v.GetParsedUpdateData("curseforge")

4
curseforge/install.go
View File

@@ -114,7 +114,7 @@ var installCmd = &cobra.Command{
}
var fileInfoData modFileInfo
fileInfoData, err = getLatestFile(modInfoData, mcVersion, fileID, getLoaders(pack))
fileInfoData, err = getLatestFile(modInfoData, mcVersion, fileID, pack.GetLoaders())
if err != nil {
fmt.Printf("Failed to get file for project: %v\n", err)
os.Exit(1)
@@ -187,7 +187,7 @@ var installCmd = &cobra.Command{
depIDPendingQueue = depIDPendingQueue[:0]
for _, currData := range depInfoData {
depFileInfo, err := getLatestFile(currData, mcVersion, 0, getLoaders(pack))
depFileInfo, err := getLatestFile(currData, mcVersion, 0, pack.GetLoaders())
if err != nil {
fmt.Printf("Error retrieving dependency data: %s\n", err.Error())
continue