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

Clean up code, filter version numbers for NeoForge as well as Forge

Browse Source 
NeoForge doesn't seem to have an update checker JSON yet, so we can't determine
the recommended version
This commit is contained in:
comp500
2023-07-30 15:09:18 +01:00
parent 234f927be9
commit 4c23e264b0
7 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modrinth/install.go
View File

@@ -227,7 +227,7 @@ func installVersion(project *modrinthApi.Project, version *modrinthApi.Version,
if len(version.Dependencies) > 0 {
// 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")
isQuilt := slices.Contains(pack.GetCompatibleLoaders(), "quilt")
mcVersion, err := pack.GetMCVersion()
if err != nil {
return err
@@ -432,7 +432,7 @@ func createFileMeta(project *modrinthApi.Project, version *modrinthApi.Version,
var path string
folder := viper.GetString("meta-folder")
if folder == "" {
folder, err = getProjectTypeFolder(*project.ProjectType, version.Loaders, pack.GetLoaders())
folder, err = getProjectTypeFolder(*project.ProjectType, version.Loaders, pack.GetCompatibleLoaders())
if err != nil {
return err
}

4
modrinth/modrinth.go
View File

@@ -313,9 +313,9 @@ func getLatestVersion(projectID string, name string, pack core.Pack) (*modrinthA
}
var loaders []string
if viper.GetString("datapack-folder") != "" {
loaders = append(pack.GetLoaders(), withDatapackPathMRLoaders...)
loaders = append(pack.GetCompatibleLoaders(), withDatapackPathMRLoaders...)
} else {
loaders = append(pack.GetLoaders(), defaultMRLoaders...)
loaders = append(pack.GetCompatibleLoaders(), defaultMRLoaders...)
}
result, err := mrDefaultClient.Versions.ListVersions(projectID, modrinthApi.ListVersionsOptions{