Merge branch 'dev'

FTBTeam · Nov 26, 2024 · f1f067f · f1f067f
2 parents c3c9051 + 029a331
commit f1f067f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/modloaders/fabric.go b/modloaders/fabric.go
@@ -69,11 +69,12 @@ func (s Fabric) Install(useOwnJava bool) error {
 		jrePath, err = util.GetJavaPath(s.Targets.JavaVersion)
 		if err != nil {
 			jrePath = "java"
+		} else {
+			jrePath = filepath.Join(s.InstallDir, jrePath)
 		}
 	}
 
-	jrePath = filepath.Join(s.InstallDir, jrePath)
-
+	pterm.Debug.Printfln("JRE Path: %s", jrePath)
 	cmd := exec.Command(jrePath, "-jar", installerName, "server", "-mcversion", s.Targets.McVersion, "-loader", s.Targets.ModLoader.Version, "-downloadMinecraft")
 	cmd.Dir = s.InstallDir
 	cmd.Stdout = os.Stdout

diff --git a/modloaders/forge.go b/modloaders/forge.go
@@ -80,11 +80,12 @@ func (s Forge) Install(useOwnJava bool) error {
 			jrePath, err = util.GetJavaPath(s.Targets.JavaVersion)
 			if err != nil {
 				jrePath = "java"
+			} else {
+				jrePath = filepath.Join(s.InstallDir, jrePath)
 			}
 		}
 
-		jrePath = filepath.Join(s.InstallDir, jrePath)
-
+		pterm.Debug.Printfln("JRE Path: %s", jrePath)
 		cmd := exec.Command(jrePath, "-jar", jarName, "--installServer")
 		cmd.Dir = s.InstallDir
 		cmd.Stdout = os.Stdout

diff --git a/modloaders/neoforge.go b/modloaders/neoforge.go
@@ -76,11 +76,12 @@ func (s NeoForge) Install(useOwnJava bool) error {
 		jrePath, err = util.GetJavaPath(s.Targets.JavaVersion)
 		if err != nil {
 			jrePath = "java"
+		} else {
+			jrePath = filepath.Join(s.InstallDir, jrePath)
 		}
 	}
 
-	jrePath = filepath.Join(s.InstallDir, jrePath)
-
+	pterm.Debug.Printfln("JRE Path: %s", jrePath)
 	cmd := exec.Command(jrePath, "-jar", installerName, "--installServer")
 	cmd.Dir = s.InstallDir
 	cmd.Stdout = os.Stdout