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

Fix neoforge versions (#319)

Browse Source 
* Fix neoforge versions

* Parse NeoForge versions for supported minecraft versions

* Fix fetching NeoForge 1.20.1 versions
This commit is contained in:
TheEpicBlock 2024-10-14 18:49:53 +02:00 committed by GitHub
parent 811dbc6f90
commit 0626c00149
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
core/versionutil.go
View File

@ -5,8 +5,9 @@ import (
"encoding/xml" "encoding/xml"
"errors" "errors"
"fmt" "fmt"
"github.com/unascribed/FlexVer/go/flexver"
"strings" "strings"
"github.com/unascribed/FlexVer/go/flexver"
) )
type MavenMetadata struct { type MavenMetadata struct {
@ -54,7 +55,7 @@ var ModLoaders = map[string]ModLoaderComponent{
"neoforge": { "neoforge": {
Name: "neoforge", Name: "neoforge",
FriendlyName: "NeoForge", FriendlyName: "NeoForge",
VersionListGetter: FetchMavenVersionPrefixedListStrip("https://maven.neoforged.net/releases/net/neoforged/forge/maven-metadata.xml", "NeoForge"), VersionListGetter: FetchNeoForge(),
}, },
} }
@ -74,7 +75,7 @@ func FetchMavenVersionList(url string) func(mcVersion string) ([]string, string,
} }
} }
func FetchMavenVersionPrefixedList(url string, friendlyName string) func(mcVersion string) ([]string, string, error) { func FetchMavenVersionFiltered(url string, friendlyName string, filter func(version string, mcVersion string) bool) func(mcVersion string) ([]string, string, error) {
return func(mcVersion string) ([]string, string, error) { return func(mcVersion string) ([]string, string, error) {
res, err := GetWithUA(url, "application/xml") res, err := GetWithUA(url, "application/xml")
if err != nil { if err != nil {
@ -88,17 +89,17 @@ func FetchMavenVersionPrefixedList(url string, friendlyName string) func(mcVersi
} }
allowedVersions := make([]string, 0, len(out.Versioning.Versions.Version)) allowedVersions := make([]string, 0, len(out.Versioning.Versions.Version))
for _, v := range out.Versioning.Versions.Version { for _, v := range out.Versioning.Versions.Version {
if hasPrefixSplitDash(v, mcVersion) { if filter(v, mcVersion) {
allowedVersions = append(allowedVersions, v) allowedVersions = append(allowedVersions, v)
} }
} }
if len(allowedVersions) == 0 { if len(allowedVersions) == 0 {
return []string{}, "", errors.New("no " + friendlyName + " versions available for this Minecraft version") return []string{}, "", errors.New("no " + friendlyName + " versions available for this Minecraft version")
} }
if hasPrefixSplitDash(out.Versioning.Release, mcVersion) { if filter(out.Versioning.Release, mcVersion) {
return allowedVersions, out.Versioning.Release, nil return allowedVersions, out.Versioning.Release, nil
} }
if hasPrefixSplitDash(out.Versioning.Latest, mcVersion) { if filter(out.Versioning.Latest, mcVersion) {
return allowedVersions, out.Versioning.Latest, nil return allowedVersions, out.Versioning.Latest, nil
} }
// Sort list to get largest version // Sort list to get largest version
@ -107,6 +108,10 @@ func FetchMavenVersionPrefixedList(url string, friendlyName string) func(mcVersi
} }
} }
func FetchMavenVersionPrefixedList(url string, friendlyName string) func(mcVersion string) ([]string, string, error) {
return FetchMavenVersionFiltered(url, friendlyName, hasPrefixSplitDash)
}
func FetchMavenVersionPrefixedListStrip(url string, friendlyName string) func(mcVersion string) ([]string, string, error) { func FetchMavenVersionPrefixedListStrip(url string, friendlyName string) func(mcVersion string) ([]string, string, error) {
noStrip := FetchMavenVersionPrefixedList(url, friendlyName) noStrip := FetchMavenVersionPrefixedList(url, friendlyName)
return func(mcVersion string) ([]string, string, error) { return func(mcVersion string) ([]string, string, error) {
@ -141,6 +146,41 @@ func hasPrefixSplitDash(str string, prefix string) bool {
return false return false
} }
func FetchNeoForge() func(mcVersion string) ([]string, string, error) {
// NeoForge reused Forge's versioning scheme for 1.20.1, but moved to their own versioning scheme for 1.20.2 and above
neoforgeOld := FetchMavenVersionPrefixedListStrip("https://maven.neoforged.net/releases/net/neoforged/forge/maven-metadata.xml", "NeoForge")
neoforgeNew := FetchMavenWithNeoForgeStyleVersions("https://maven.neoforged.net/releases/net/neoforged/neoforge/maven-metadata.xml", "NeoForge")
return func(mcVersion string) ([]string, string, error) {
if mcVersion == "1.20.1" {
return neoforgeOld(mcVersion)
} else {
return neoforgeNew(mcVersion)
}
}
}
func FetchMavenWithNeoForgeStyleVersions(url string, friendlyName string) func(mcVersion string) ([]string, string, error) {
return FetchMavenVersionFiltered(url, friendlyName, func(neoforgeVersion string, mcVersion string) bool {
// Minecraft versions are in the form of 1.a.b
// Neoforge versions are in the form of a.b.x
// Eg, for minecraft 1.20.6, neoforge version 20.6.2 and 20.6.83-beta would both be valid versions
// for minecraft 1.20.2, neoforge version 20.2.23-beta
// for minecraft 1.21, neoforge version 21.0.143 would be valid
var mcSplit = strings.Split(mcVersion, ".")
if len(mcSplit) < 2 {
// This does not appear to be a minecraft version that's formatted in a way that matches neoforge
return false
}
var mcMajor = mcSplit[1]
var mcMinor = "0"
if len(mcSplit) > 2 {
mcMinor = mcSplit[2]
}
return strings.HasPrefix(neoforgeVersion, mcMajor+"."+mcMinor)
})
}
func ComponentToFriendlyName(component string) string { func ComponentToFriendlyName(component string) string {
if component == "minecraft" { if component == "minecraft" {
return "Minecraft" return "Minecraft"