Skip to content

Commit f665744

Browse files
committed
修复低版本Forge安装错误
1 parent 04832c5 commit f665744

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22
set -e
33
git_hash=$(git rev-parse --short HEAD 2>/dev/null)
4-
version="1.2.1-${git_hash}"
4+
version="1.2.2-${git_hash}"
55
echo "Build: AutoInstall-${version}"
66
go build -ldflags "-X main.gitversion=${version}" -o dist/$BUILD_NAME main.go
77
ls dist

core/installer.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,11 @@ func RunScript(Version string, Loader string, LoaderVersion string, simpfun bool
160160

161161
switch Loader {
162162
case "forge":
163-
scriptContent = fmt.Sprintf("%s %s @libraries/net/minecraftforge/forge/%s-%s/unix_args.txt \"$@\"", javaPath, modifiedArgsment, Version, LoaderVersion)
163+
if Version < "1.17" {
164+
scriptContent = fmt.Sprintf("%s %s -jar forge-%s-%s.jar", javaPath, modifiedArgsment, Version, LoaderVersion)
165+
} else {
166+
scriptContent = fmt.Sprintf("%s %s @libraries/net/minecraftforge/forge/%s-%s/unix_args.txt \"$@\"", javaPath, modifiedArgsment, Version, LoaderVersion)
167+
}
164168
case "neoforge":
165169
scriptContent = fmt.Sprintf("%s %s @libraries/net/neoforged/neoforge/%s/unix_args.txt \"$@\"", javaPath, modifiedArgsment, LoaderVersion)
166170
case "fabric":
@@ -169,7 +173,11 @@ func RunScript(Version string, Loader string, LoaderVersion string, simpfun bool
169173
} else {
170174
switch Loader {
171175
case "forge":
172-
scriptContent = fmt.Sprintf("java %s @libraries/net/minecraftforge/forge/%s-%s/unix_args.txt \"$@\"", modifiedArgsment, Version, LoaderVersion)
176+
if Version < "1.17" {
177+
scriptContent = fmt.Sprintf("java %s -jar forge-%s-%s.jar", modifiedArgsment, Version, LoaderVersion)
178+
} else {
179+
scriptContent = fmt.Sprintf("java %s @libraries/net/minecraftforge/forge/%s-%s/unix_args.txt \"$@\"", modifiedArgsment, Version, LoaderVersion)
180+
}
173181
case "neoforge":
174182
scriptContent = fmt.Sprintf("java %s @libraries/net/neoforged/neoforge/%s/unix_args.txt \"$@\"", modifiedArgsment, LoaderVersion)
175183
case "fabric":

pkg/vanilla.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ func DownloadServerJar(version, loader, librariesDir string) error {
1515
if loader == "forge" {
1616
if version >= "1.20.4" {
1717
serverFileName = fmt.Sprintf("server-%s-bundled.jar", version)
18+
} else if version <= "1.16.5" {
19+
serverFileName = fmt.Sprintf("minecraft_server.%s.jar", version)
1820
} else {
1921
serverFileName = fmt.Sprintf("server-%s.jar", version)
2022
}
@@ -27,6 +29,8 @@ func DownloadServerJar(version, loader, librariesDir string) error {
2729
var serverPath string
2830
if loader == "fabric" || loader == "vanilla" {
2931
serverPath = filepath.Join(".", serverFileName)
32+
} else if loader == "forge" && version <= "1.16.5" {
33+
serverPath = filepath.Join(".", serverFileName)
3034
} else {
3135
serverPath = filepath.Join(librariesDir, "net", "minecraft", "server", version, serverFileName)
3236
}

0 commit comments

Comments
 (0)