mirror of
https://github.com/packwiz/packwiz.git
synced 2025-04-19 21:16:30 +02:00
Change datapack-path to datapack-folder
This commit is contained in:
parent
d498b13f3d
commit
44f562927c
@ -162,10 +162,10 @@ func getProjectTypeFolder(projectType string, fileLoaders []string, packLoaders
|
|||||||
|
|
||||||
// Datapack loader is "datapack"
|
// Datapack loader is "datapack"
|
||||||
if slices.Contains(fileLoaders, "datapack") {
|
if slices.Contains(fileLoaders, "datapack") {
|
||||||
if viper.GetString("datapack-path") != "" {
|
if viper.GetString("datapack-folder") != "" {
|
||||||
return viper.GetString("datapack-path"), nil
|
return viper.GetString("datapack-folder"), nil
|
||||||
} else {
|
} else {
|
||||||
return "", errors.New("set the datapack-path option to use datapacks")
|
return "", errors.New("set the datapack-folder option to use datapacks")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Default to "mods" for mod type
|
// Default to "mods" for mod type
|
||||||
@ -230,7 +230,7 @@ func getLatestVersion(projectID string, pack core.Pack) (*modrinthApi.Version, e
|
|||||||
}
|
}
|
||||||
gameVersions := append([]string{mcVersion}, viper.GetStringSlice("acceptable-game-versions")...)
|
gameVersions := append([]string{mcVersion}, viper.GetStringSlice("acceptable-game-versions")...)
|
||||||
var loaders []string
|
var loaders []string
|
||||||
if viper.GetString("datapack-path") != "" {
|
if viper.GetString("datapack-folder") != "" {
|
||||||
loaders = append(pack.GetLoaders(), withDatapackPathMRLoaders...)
|
loaders = append(pack.GetLoaders(), withDatapackPathMRLoaders...)
|
||||||
} else {
|
} else {
|
||||||
loaders = append(pack.GetLoaders(), defaultMRLoaders...)
|
loaders = append(pack.GetLoaders(), defaultMRLoaders...)
|
||||||
@ -243,7 +243,7 @@ func getLatestVersion(projectID string, pack core.Pack) (*modrinthApi.Version, e
|
|||||||
|
|
||||||
if len(result) == 0 {
|
if len(result) == 0 {
|
||||||
// TODO: retry with datapack specified, to determine what the issue is? or just request all and filter afterwards
|
// TODO: retry with datapack specified, to determine what the issue is? or just request all and filter afterwards
|
||||||
return nil, errors.New("no valid versions found\nUse the acceptable-game-versions option to accept more game versions\nTo use datapacks, add a datapack loader mod and specify the datapack-path option with the location this mod loads datapacks from")
|
return nil, errors.New("no valid versions found\nUse the acceptable-game-versions option to accept more game versions\nTo use datapacks, add a datapack loader mod and specify the datapack-folder option with the folder this mod loads datapacks from")
|
||||||
}
|
}
|
||||||
|
|
||||||
latestValidVersion := result[0]
|
latestValidVersion := result[0]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user