mirrors/packwiz
1
0
Fork 0
mirror of https://github.com/packwiz/packwiz.git synced 2025-10-27 09:24:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Manually replace FLK deps with QKL when using Quilt >=1.19.2 (fixes #212)

Browse Source
This commit is contained in:
comp500
2023-04-13 17:12:44 +01:00
parent bd71ad5679
commit e966eaffc0
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modrinth/install.go
View File

@@ -228,6 +228,10 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
// TODO: could get installed version IDs, and compare to install the newest - i.e. preferring pinned versions over getting absolute latest?
installedProjects := getInstalledProjectIDs(index)
isQuilt := slices.Contains(pack.GetLoaders(), "quilt")
mcVersion, err := pack.GetMCVersion()
if err != nil {
return err
}
var depMetadata []depMetadataStore
var depProjectIDPendingQueue []string
@@ -237,7 +241,7 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
// TODO: recommend optional dependencies?
if dep.DependencyType != nil && *dep.DependencyType == "required" {
if dep.ProjectID != nil {
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt))
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt, mcVersion))
}
if dep.VersionID != nil {
depVersionIDPendingQueue = append(depVersionIDPendingQueue, *dep.VersionID)
@@ -256,7 +260,7 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
if err == nil {
for _, v := range depVersions {
// Add project ID to queue
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*v.ProjectID, isQuilt))
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*v.ProjectID, isQuilt, mcVersion))
}
} else {
fmt.Printf("Error retrieving dependency data: %s\n", err.Error())
@@ -305,7 +309,7 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
// TODO: recommend optional dependencies?
if dep.DependencyType != nil && *dep.DependencyType == "required" {
if dep.ProjectID != nil {
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt))
depProjectIDPendingQueue = append(depProjectIDPendingQueue, mapDepOverride(*dep.ProjectID, isQuilt, mcVersion))
}
if dep.VersionID != nil {
depVersionIDPendingQueue = append(depVersionIDPendingQueue, *dep.VersionID)