From 7a148a58d5284eee1b83feba9f069943bd9cd05f Mon Sep 17 00:00:00 2001 From: khanhduytran0 Date: Sun, 22 Nov 2020 13:35:21 +0700 Subject: [PATCH] [Forge installer] bug fixes --- .../main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java | 3 +++ .../java/net/kdt/pojavlaunch/installers/ForgeInstaller.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java index 7ee90fb6a..57d860cbe 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java +++ b/app/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java @@ -108,6 +108,8 @@ public class JavaGUILauncherActivity extends LoggableActivity { } private void doCustomInstall(File modFile, String javaArgs) throws IOException { + isLogAllow = true; + // Attempt to detects some mod installers BaseInstaller installer = new BaseInstaller(); installer.setInput(modFile); @@ -116,6 +118,7 @@ public class JavaGUILauncherActivity extends LoggableActivity { appendlnToLog("Detected Forge installer!"); new ForgeInstaller(installer).install(this); } else { + isLogAllow = false; mIsCustomInstall = false; launchJavaRuntime(modFile, javaArgs); } diff --git a/app/src/main/java/net/kdt/pojavlaunch/installers/ForgeInstaller.java b/app/src/main/java/net/kdt/pojavlaunch/installers/ForgeInstaller.java index 4f2eaf7d5..2e8b6d9c5 100644 --- a/app/src/main/java/net/kdt/pojavlaunch/installers/ForgeInstaller.java +++ b/app/src/main/java/net/kdt/pojavlaunch/installers/ForgeInstaller.java @@ -35,7 +35,7 @@ public class ForgeInstaller extends BaseInstaller { String[] libInfos = profile.install.path.split(":"); File libraryFile = new File(Tools.libraries, Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2])); libraryFile.mkdirs(); - target = libraryFile.getAbsolutePath() + "/" + profile.install.filePath.replace("-universal", ""); + target = libraryFile.getAbsolutePath().replace("-universal", ""); ctx.appendlnToLog("Writing " + target); FileOutputStream out = new FileOutputStream(target); IOUtils.copy(mJarFile.getInputStream(mJarFile.getEntry(profile.install.filePath)), out);