Merge branch 'dev'

Author: Gaz492

go.mod

@@ -4,7 +4,9 @@ go 1.26.4
 
 require (
 	github.com/codeclysm/extract/v4 v4.0.0
+	github.com/ftbteam/keystone v0.0.5
 	github.com/hashicorp/go-version v1.9.0
+	github.com/imroc/req/v3 v3.59.0
 	github.com/minio/selfupdate v0.6.0
 	github.com/pterm/pterm v0.12.83
 	golang.org/x/term v0.44.0
@@ -15,17 +17,25 @@ require (
 	atomicgo.dev/cursor v0.2.0 // indirect
 	atomicgo.dev/keyboard v0.2.10 // indirect
 	atomicgo.dev/schedule v0.1.0 // indirect
+	github.com/andybalholm/brotli v1.2.0 // indirect
+	github.com/aviddiviner/go-murmur v0.0.0-20150519214947-b9740d71e571 // indirect
 	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/containerd/console v1.0.5 // indirect
+	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/gookit/color v1.6.1 // indirect
 	github.com/h2non/filetype v1.1.3 // indirect
+	github.com/icholy/digest v1.1.0 // indirect
 	github.com/juju/errors v1.0.0 // indirect
 	github.com/klauspost/compress v1.18.6 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
 	github.com/mattn/go-runewidth v0.0.23 // indirect
+	github.com/quic-go/qpack v0.6.0 // indirect
+	github.com/quic-go/quic-go v0.60.0 // indirect
+	github.com/refraction-networking/utls v1.8.2 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	golang.org/x/crypto v0.51.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
 	golang.org/x/sys v0.46.0 // indirect
 	golang.org/x/text v0.37.0 // indirect
 )

go.sum

@@ -11,8 +11,12 @@ atomicgo.dev/schedule v0.1.0 h1:nTthAbhZS5YZmgYbb2+DH8uQIZcTlIrd4eYr3UQxEjs=
 atomicgo.dev/schedule v0.1.0/go.mod h1:xeUa3oAkiuHYh8bKiQBRojqAMq3PXXbJujjb0hw8pEU=
 github.com/MarvinJWendt/testza v0.5.2 h1:53KDo64C1z/h/d/stCYCPY69bt/OSwjq5KpFNwi+zB4=
 github.com/MarvinJWendt/testza v0.5.2/go.mod h1:xu53QFE5sCdjtMCKk8YMQ2MnymimEctc4n3EjyIYvEY=
+github.com/andybalholm/brotli v1.2.0 h1:ukwgCxwYrmACq68yiUqwIWnGY0cTPox/M94sVwToPjQ=
+github.com/andybalholm/brotli v1.2.0/go.mod h1:rzTDkvFWvIrjDXZHkuS16NPggd91W3kUSvPlQ1pLaKY=
 github.com/arduino/go-paths-helper v1.12.1 h1:WkxiVUxBjKWlLMiMuYy8DcmVrkxdP7aKxQOAq7r2lVM=
 github.com/arduino/go-paths-helper v1.12.1/go.mod h1:jcpW4wr0u69GlXhTYydsdsqAjLaYK5n7oWHfKqOG6LM=
+github.com/aviddiviner/go-murmur v0.0.0-20150519214947-b9740d71e571 h1:seCdAEDyB0Hti/v1VajB7pAOIk9zmz/0/KE0D0oFqnc=
+github.com/aviddiviner/go-murmur v0.0.0-20150519214947-b9740d71e571/go.mod h1:VzSzsYCY3W9xWYWD8T2GLDidWTe5rTZv+UdDMGhLfjg=
 github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
 github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/codeclysm/extract/v4 v4.0.0 h1:H87LFsUNaJTu2e/8p/oiuiUsOK/TaPQ5wxsjPnwPEIY=
@@ -21,6 +25,13 @@ github.com/containerd/console v1.0.5 h1:R0ymNeydRqH2DmakFNdmjR2k0t7UPuiOV/N/27/q
 github.com/containerd/console v1.0.5/go.mod h1:YynlIjWYF8myEu6sdkwKIvGQq+cOckRm6So2avqoYAk=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/ftbteam/keystone v0.0.5 h1:1IO/xICIA0EPbr5NAg8HMrszF8B/K8iXO0kc5uoZXtQ=
+github.com/ftbteam/keystone v0.0.5/go.mod h1:Prtg8X+pW5TWdQADymyHoAVUfhKgUQTDYSFznVjvknI=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
+github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/gookit/assert v0.1.1 h1:lh3GcawXe/p+cU7ESTZ5Ui3Sm/x8JWpIis4/1aF0mY0=
 github.com/gookit/assert v0.1.1/go.mod h1:jS5bmIVQZTIwk42uXl4lyj4iaaxx32tqH16CFj0VX2E=
 github.com/gookit/color v1.6.1 h1:KoTnDxJPRgrL0SoX0f8rCFg2zI0t4E3GZZBMo2nN8LU=
@@ -29,14 +40,18 @@ github.com/h2non/filetype v1.1.3 h1:FKkx9QbD7HR/zjK1Ia5XiBsq9zdLi5Kf3zGyFTAFkGg=
 github.com/h2non/filetype v1.1.3/go.mod h1:319b3zT68BvV+WRj7cwy856M2ehB3HqNOt6sy1HndBY=
 github.com/hashicorp/go-version v1.9.0 h1:CeOIz6k+LoN3qX9Z0tyQrPtiB1DFYRPfCIBtaXPSCnA=
 github.com/hashicorp/go-version v1.9.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
+github.com/icholy/digest v1.1.0 h1:HfGg9Irj7i+IX1o1QAmPfIBNu/Q5A5Tu3n/MED9k9H4=
+github.com/icholy/digest v1.1.0/go.mod h1:QNrsSGQ5v7v9cReDI0+eyjsXGUoRSUZQHeQ5C4XLa0Y=
+github.com/imroc/req/v3 v3.59.0 h1:PqKhJHyBmJYob47LVuTHwRZE00ZO6icbLHe5Zra13jo=
+github.com/imroc/req/v3 v3.59.0/go.mod h1:cwLwwaE90Pq6ZMmKuHA9FivJbg3avnCH8/RA5lUUs74=
 github.com/juju/errors v1.0.0 h1:yiq7kjCLll1BiaRuNY53MGI0+EQ3rF6GB+wvboZDefM=
 github.com/juju/errors v1.0.0/go.mod h1:B5x9thDqx0wIMH3+aLIMP9HjItInYWObRovoCFM5Qe8=
 github.com/klauspost/compress v1.18.6 h1:2jupLlAwFm95+YDR+NwD2MEfFO9d4z4Prjl1XXDjuao=
 github.com/klauspost/compress v1.18.6/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ=
 github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y=
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
-github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/lithammer/fuzzysearch v1.1.8 h1:/HIuJnjHuXS8bKaiTMeeDlW2/AyIWk2brx1V8LFgLN4=
@@ -49,15 +64,29 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pterm/pterm v0.12.83 h1:ie+YmGmA727VuhxBlyGr74Ks+7McV6kT99IB8EU80aA=
 github.com/pterm/pterm v0.12.83/go.mod h1:xlgc6bFWyJIMtmLJvGim+L7jhSReilOlOnodeIYe4Tk=
+github.com/quic-go/go-ossfuzz-seeds v0.1.0 h1:APacT+iIaNF6fd8AGEiN3bT/Jtkd2jz4v4TzM7MFjy0=
+github.com/quic-go/go-ossfuzz-seeds v0.1.0/go.mod h1:3IOHRbJIc+L6YKMwfDtJAM9Vj9k0YY4muhuyUYk5tbk=
+github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8=
+github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII=
+github.com/quic-go/quic-go v0.60.0 h1:xcQioE8OM66UQLeUMHltK1CCcOu3JbVB4JAQdDQSB+0=
+github.com/quic-go/quic-go v0.60.0/go.mod h1:wpKpjmPpftl30sL6pFh7REVpjbcCVy4zt2vDyK1TuJk=
+github.com/refraction-networking/utls v1.8.2 h1:j4Q1gJj0xngdeH+Ox/qND11aEfhpgoEvV+S9iJ2IdQo=
+github.com/refraction-networking/utls v1.8.2/go.mod h1:jkSOEkLqn+S/jtpEHPOsVv/4V4EVnelwbMQl4vCWXAM=
+github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
 github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
 github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
+github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZqKjWU=
+github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=
+go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -74,6 +103,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.55.0 h1:bcvxaJn3e1U6InsFWt1JUq1aSjnRxLzT2rtD2KfkDF8=
+golang.org/x/net v0.55.0/go.mod h1:L5U2KuzuOe1lY7Z+aWVIKK6qEeJXnXV9yzGA+WCHJww=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -108,7 +139,10 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
+gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=

main.go

@@ -25,6 +25,8 @@ import (
 	"time"
 
 	"github.com/codeclysm/extract/v4"
+	"github.com/ftbteam/keystone"
+	"github.com/imroc/req/v3"
 	"github.com/pterm/pterm"
 	"github.com/pterm/pterm/putils"
 	"golang.org/x/term"
@@ -134,6 +136,16 @@ func main() {
 	pterm.DefaultCenter.WithCenterEachLineSeparately().Printfln("Server installer version: %s(%s)\n%s", util.ReleaseVersion, util.GitCommit, time.Now().UTC().Format(time.RFC1123))
 	pterm.DefaultCenter.WithCenterEachLineSeparately().Println(pterm.Bold.Sprintf("Installer Issue tracker\nhttps://github.com/FTBTeam/FTB-Server-Installer/issues"))
 
+	// Set request client user agent
+	util.ReqClient.SetUserAgent(util.UserAgent)
+
+	util.ReqClient.OnBeforeRequest(func(c *req.Client, r *req.Request) (err error) {
+		if util.ApiKey != "public" && strings.HasPrefix(r.RawURL, "https://api.feed-the-beast.com") {
+			r.SetHeader("Authorization", fmt.Sprintf("Bearer %s", util.ApiKey))
+		}
+		return nil
+	})
+
 	versionInfo, err := checkForUpdate()
 	if err != nil {
 		pterm.Warning.Printfln("Error checking for installer update: %v", err)
@@ -689,11 +701,12 @@ func runValidation(manifest structs.Manifest) error {
 	var invalidFiles []structs.File
 	for _, f := range manifest.Files {
 		if f.HashType != "" && f.Hash != "" {
-			fileHash, err := util.FileHash(filepath.Join(installDir, f.Path, f.Name), f.HashType)
+			fileHash, err := processValidationFiles(f)
 			if err != nil {
 				pterm.Error.Println("Error getting file hash:", err.Error())
 				continue
 			}
+
 			if fileHash != f.Hash {
 				pterm.Warning.Printfln("Unexpected file hash from %s\nExpected: %s\nGot: %s", f.Name, f.Hash, fileHash)
 				invalidFiles = append(invalidFiles, f)
@@ -722,6 +735,21 @@ func runValidation(manifest structs.Manifest) error {
 	return nil
 }
 
+func processValidationFiles(f structs.File) (string, error) {
+	packFile, err := os.Open(filepath.Join(installDir, f.Path, f.Name))
+	if err != nil {
+		return "", err
+	}
+	defer packFile.Close()
+
+	hashType, err := keystone.CryptoFromString(f.HashType)
+	if err != nil {
+		return "", err
+	}
+
+	return keystone.FileHash(packFile, hashType)
+}
+
 func isSameModpack(currentManifest, newManifest structs.Manifest) bool {
 	if currentManifest.Id != newManifest.Id {
 		return false

modloaders/fabric.go

@@ -1,7 +1,6 @@
 package modloaders
 
 import (
-	"encoding/json"
 	"fmt"
 	"ftb-server-downloader/structs"
 	"ftb-server-downloader/util"
@@ -105,16 +104,17 @@ func (s Fabric) Install(useOwnJava bool) error {
 
 func getInstaller() ([]FabricInstaller, error) {
 	url := fmt.Sprintf("%s/v2/versions/installer", fabricMeta)
-	resp, err := util.DoGet(url)
+
+	var fabricInstaller []FabricInstaller
+	resp, err := util.ReqClient.R().
+		SetSuccessResult(&fabricInstaller).
+		Get(url)
 	if err != nil {
-		return []FabricInstaller{}, err
+		return nil, err
 	}
-	defer resp.Body.Close()
-	var fabricInstaller []FabricInstaller
 
-	err = json.NewDecoder(resp.Body).Decode(&fabricInstaller)
-	if err != nil {
-		return []FabricInstaller{}, err
+	if !resp.IsSuccessState() {
+		return nil, fmt.Errorf("error getting fabric installer from %s (%s)", url, resp.Status)
 	}
 
 	return fabricInstaller, nil

modloaders/forge.go

@@ -160,11 +160,12 @@ func (s Forge) Install(useOwnJava bool) error {
 }
 
 func doesForgeExist(url string) bool {
-	resp, err := util.DoHead(url)
-	if err != nil {
+	resp, err := util.ReqClient.R().
+		Head(url)
+	if err != nil || !resp.IsSuccessState() {
 		return false
 	}
-	defer resp.Body.Close()
+
 	return true
 }
 

modloaders/util.go

@@ -3,7 +3,6 @@ package modloaders
 import (
 	"fmt"
 	"ftb-server-downloader/util"
-	"io"
 	"os"
 	"path/filepath"
 
@@ -33,20 +32,21 @@ func Log4JFixer(installDir string, mcVersion string) (string, error) {
 
 	if mcSemVer.GreaterThanOrEqual(semVer.Must(semVer.NewVersion("1.7"))) && mcSemVer.LessThanOrEqual(semVer.Must(semVer.NewVersion("1.11.2"))) {
 		pterm.Info.Printfln("Downloading log4j fix log4j2_17-111.xml")
-		get, err := util.DoGet("https://launcher.mojang.com/v1/objects/4bb89a97a66f350bc9f73b3ca8509632682aea2e/log4j2_17-111.xml")
-		if err != nil {
-			return "", err
-		}
-		defer get.Body.Close()
 
-		out, err := os.Create(filepath.Join(installDir, patchesPath, "log4j2_17-111.xml"))
+		const log4JUrl = "https://launcher.mojang.com/v1/objects/4bb89a97a66f350bc9f73b3ca8509632682aea2e/log4j2_17-111.xml"
+		log4jPath := filepath.Join(installDir, patchesPath, "log4j2_17-111.xml")
+
+		resp, err := util.ReqClient.R().
+			SetOutputFile(log4jPath).
+			Get(log4JUrl)
+
 		if err != nil {
 			return "", err
 		}
-		defer out.Close()
-		_, err = io.Copy(out, get.Body)
-		if err != nil {
-			return "", err
+
+		if !resp.IsSuccessState() {
+			_ = os.Remove(log4jPath)
+			return "", fmt.Errorf("failed to download log4j fix: %s", resp.Status)
 		}
 
 		return fmt.Sprintf("-Dlog4j.configurationFile=%s", filepath.Join(patchesPath, "log4j2_17-111.xml")), nil
@@ -55,20 +55,20 @@ func Log4JFixer(installDir string, mcVersion string) (string, error) {
 
 	if mcSemVer.GreaterThanOrEqual(semVer.Must(semVer.NewVersion("1.12"))) && mcSemVer.LessThanOrEqual(semVer.Must(semVer.NewVersion("1.16.5"))) {
 		pterm.Info.Printfln("Downloading log4j fix log4j2_112-116.xml")
-		get, err := util.DoGet("https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml")
-		if err != nil {
-			return "", err
-		}
-		defer get.Body.Close()
+		const log4jUrl = "https://launcher.mojang.com/v1/objects/02937d122c86ce73319ef9975b58896fc1b491d1/log4j2_112-116.xml"
+		log4jPath := filepath.Join(installDir, patchesPath, "log4j2_112-116.xml")
+
+		resp, err := util.ReqClient.R().
+			SetOutputFile(log4jPath).
+			Get(log4jUrl)
 
-		out, err := os.Create(filepath.Join(installDir, patchesPath, "log4j2_112-116.xml"))
 		if err != nil {
 			return "", err
 		}
-		defer out.Close()
-		_, err = io.Copy(out, get.Body)
-		if err != nil {
-			return "", err
+
+		if !resp.IsSuccessState() {
+			_ = os.Remove(log4jPath)
+			return "", fmt.Errorf("failed to download log4j fix: %s", resp.Status)
 		}
 		return fmt.Sprintf("-Dlog4j.configurationFile=%s", filepath.Join(patchesPath, "log4j2_112-116.xml")), nil
 	}

modloaders/vanilla.go

@@ -1,7 +1,6 @@
 package modloaders
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"ftb-server-downloader/structs"
@@ -17,17 +16,16 @@ type Vanilla struct {
 }
 
 func GetVanilla(target structs.ModpackTargets, installDir string) (Vanilla, error) {
-
-	rawMeta, err := util.DoGet(launcherMeta)
+	var meta LauncherMeta
+	rawMeta, err := util.ReqClient.R().
+		SetSuccessResult(&meta).
+		Get(launcherMeta)
 	if err != nil {
 		return Vanilla{}, err
 	}
-	defer rawMeta.Body.Close()
 
-	var meta LauncherMeta
-	err = json.NewDecoder(rawMeta.Body).Decode(&meta)
-	if err != nil {
-		return Vanilla{}, err
+	if !rawMeta.IsSuccessState() {
+		return Vanilla{}, fmt.Errorf("failed to fetch launcher meta: %s", rawMeta.Status)
 	}
 
 	return Vanilla{
@@ -38,7 +36,6 @@ func GetVanilla(target structs.ModpackTargets, installDir string) (Vanilla, erro
 }
 
 func (v Vanilla) GetDownload() ([]structs.File, error) {
-	var mlFiles []structs.File
 
 	var servDlUrl string
 	for _, version := range v.Meta.Versions {
@@ -49,21 +46,23 @@ func (v Vanilla) GetDownload() ([]structs.File, error) {
 	}
 
 	if servDlUrl == "" {
-		return mlFiles, errors.New("version not found")
+		return nil, errors.New("version not found")
 	}
 
-	rawVer, err := util.DoGet(servDlUrl)
+	var version VanillaVersion
+	rawVer, err := util.ReqClient.R().
+		SetSuccessResult(&version).
+		Get(servDlUrl)
+
 	if err != nil {
-		return []structs.File{}, err
+		return nil, err
 	}
-	defer rawVer.Body.Close()
 
-	var version VanillaVersion
-	err = json.NewDecoder(rawVer.Body).Decode(&version)
-	if err != nil {
-		return []structs.File{}, err
+	if !rawVer.IsSuccessState() {
+		return nil, fmt.Errorf("failed to fetch vanilla version: %s", rawVer.Status)
 	}
 
+	var mlFiles []structs.File
 	mlFiles = append(mlFiles, structs.File{
 		Name:     fmt.Sprintf("minecraft_server.%s.jar", v.Version),
 		Url:      version.Downloads.Server.URL,