mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-31 02:34:31 +01: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
Download Patch File Download Diff File Expand all files Collapse all files

10
curseforge/curseforge.go
View File

@@ -305,9 +305,14 @@ 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 {
// Treat unmarked versions as neutral (i.e. same as others)
if bestLoaderType == modloaderTypeAny || loaderIdx == modloaderTypeAny {
compare = 0
} else {
// Prefer higher loader indexes // Prefer higher loader indexes
compare = int32(loaderIdx) - int32(bestLoaderType) 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
compare = int32(int64(v.ID) - int64(fileID)) compare = int32(int64(v.ID) - int64(fileID))
@@ -332,9 +337,14 @@ 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 {
// Treat unmarked versions as neutral (i.e. same as others)
if bestLoaderType == modloaderTypeAny || loaderIdx == modloaderTypeAny {
compare = 0
} else {
// Prefer higher loader indexes // Prefer higher loader indexes
compare = int32(loaderIdx) - int32(bestLoaderType) 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
compare = int32(int64(v.ID) - int64(fileID)) compare = int32(int64(v.ID) - int64(fileID))