mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-04-19 13:06:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

CF: Treat versions with no loader as equal in loader comparison

Browse Source
This commit is contained in:
comp500 2023-05-31 16:08:10 +01:00
parent 7b380f23df
commit cbd38b3b73
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
curseforge/curseforge.go
View File

@ -305,8 +305,13 @@ func findLatestFile(modInfoData modInfo, mcVersions []string, packLoaders []stri
// Compare first by Minecraft version (prefer higher indexes of mcVersions) // Compare first by Minecraft version (prefer higher indexes of mcVersions)
compare := int32(mcVerIdx - bestMcVer) compare := int32(mcVerIdx - bestMcVer)
if compare == 0 { if compare == 0 {
// Prefer higher loader indexes // Treat unmarked versions as neutral (i.e. same as others)
compare = int32(loaderIdx) - int32(bestLoaderType) if bestLoaderType == modloaderTypeAny || loaderIdx == modloaderTypeAny {
compare = 0
} else {
// Prefer higher loader indexes
compare = int32(loaderIdx) - int32(bestLoaderType)
}
} }
if compare == 0 { if compare == 0 {
// Other comparisons are equal, compare by ID instead // Other comparisons are equal, compare by ID instead
@ -332,8 +337,13 @@ func findLatestFile(modInfoData modInfo, mcVersions []string, packLoaders []stri
// Compare first by Minecraft version (prefer higher indexes of mcVersions) // Compare first by Minecraft version (prefer higher indexes of mcVersions)
compare := int32(mcVerIdx - bestMcVer) compare := int32(mcVerIdx - bestMcVer)
if compare == 0 { if compare == 0 {
// Prefer higher loader indexes // Treat unmarked versions as neutral (i.e. same as others)
compare = int32(loaderIdx) - int32(bestLoaderType) if bestLoaderType == modloaderTypeAny || loaderIdx == modloaderTypeAny {
compare = 0
} else {
// Prefer higher loader indexes
compare = int32(loaderIdx) - int32(bestLoaderType)
}
} }
if compare == 0 { if compare == 0 {
// Other comparisons are equal, compare by ID instead // Other comparisons are equal, compare by ID instead