From b34709200ef837fdff2b22a2d1b1191246560967 Mon Sep 17 00:00:00 2001
From: Duy Tran Khanh <khanhduytran0@users.noreply.github.com>
Date: Sat, 13 Feb 2021 20:02:42 +0700
Subject: [PATCH] Cherry-pick 2af5d6176d48b98471e943582edcb2e19550af57

---
 .../ForgeInstallerHeadless/README.md          |   3 -
 .../forge-installer-headless-1.0.1.jar        | Bin 11295 -> 0 bytes
 .../src/main/assets/components/OptiInst.jar   | Bin 2954 -> 0 bytes
 .../pojavlaunch/JavaGUILauncherActivity.java  |  71 +-----------------
 .../pojavlaunch/installers/BaseInstaller.java |  24 ------
 .../installers/FabricInstaller.java           |  23 ------
 .../installers/InstallerDetector.java         |  37 ---------
 .../Legacy1p12p2ForgeInstaller.java           |  60 ---------------
 .../installers/LegacyForgeInstaller.java      |  61 ---------------
 .../installers/LegacyOptifineInstaller.java   |  19 -----
 .../installers/NewForgeInstaller.java         |  21 ------
 11 files changed, 2 insertions(+), 317 deletions(-)
 delete mode 100644 app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/README.md
 delete mode 100644 app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar
 delete mode 100644 app_pojavlauncher/src/main/assets/components/OptiInst.jar
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java
 delete mode 100644 app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java

diff --git a/app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/README.md b/app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/README.md
deleted file mode 100644
index 6de0d0432..000000000
--- a/app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-From https://github.com/xfl03/ForgeInstallerHeadless
-No changes on source code.
-
diff --git a/app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar b/app_pojavlauncher/src/main/assets/components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar
deleted file mode 100644
index 0449086d0bc9427fe136adda35418adcbaadbc4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11295
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
Vop1e1_KOJN@_R}$|5_gq{|BFeXaoQN

diff --git a/app_pojavlauncher/src/main/assets/components/OptiInst.jar b/app_pojavlauncher/src/main/assets/components/OptiInst.jar
deleted file mode 100644
index 94b951bc7a99e11904863348e3dfdecc848e10ff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2954
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
XAClmxH+3PVikCb^@fYv!kptjAz(@A;

diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
index 01ca524f5..28be20c6d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@@ -11,7 +11,6 @@ import android.widget.*;
 import androidx.appcompat.app.*;
 import java.io.*;
 import java.util.*;
-import net.kdt.pojavlaunch.installers.*;
 import net.kdt.pojavlaunch.prefs.*;
 import net.kdt.pojavlaunch.utils.*;
 import org.lwjgl.glfw.*;
@@ -270,46 +269,6 @@ public class JavaGUILauncherActivity extends LoggableActivity implements View.On
         this.mousePointer.setTranslationY(y);
     }
 
-    
-    public String dialogInput(final String title, final int message) {
-        final StringBuilder str = new StringBuilder();
-        
-        runOnUiThread(new Runnable(){
-                @Override
-                public void run() {
-                    final EditText editText = new EditText(JavaGUILauncherActivity.this);
-                    editText.setHint(message);
-                    editText.setSingleLine();
-                    
-                    AlertDialog.Builder d = new AlertDialog.Builder(JavaGUILauncherActivity.this);
-                    d.setCancelable(false);
-                    d.setTitle(title);
-                    d.setView(editText);
-                    d.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-
-                            @Override
-                            public void onClick(DialogInterface i, int id) {
-                                str.append(editText.getText().toString());
-                                synchronized (mDialogLock) {
-                                    mDialogLock.notifyAll();
-                                }
-                            }
-                        });
-                    d.show();
-                }
-            });
-
-        try {
-            synchronized (mDialogLock) {
-                mDialogLock.wait();
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        
-        return str.toString();
-    }
-
     public void forceClose(View v) {
         BaseMainActivity.dialogForceClose(this);
     }
@@ -328,32 +287,8 @@ public class JavaGUILauncherActivity extends LoggableActivity implements View.On
     
     private int doCustomInstall(File modFile, String javaArgs) throws IOException {
         isLogAllow = true;
-        
-        // Attempt to detects some mod installers 
-        BaseInstaller installer = new BaseInstaller();
-        installer.setInput(modFile);
-        
-        if (InstallerDetector.isForgeLegacy(installer)) {
-            appendlnToLog("Detected Forge Installer 1.12.1 or below!");
-            return new LegacyForgeInstaller(installer).install(this);
-        } else if (InstallerDetector.isForge1p12p2(installer)) {
-            appendlnToLog("Detected Forge Installer 1.12.2!");
-            return new Legacy1p12p2ForgeInstaller(installer).install(this);
-        } else if (InstallerDetector.isForgeNew(installer)) {
-            appendlnToLog("Detected Forge Installer 1.13 or above!");
-            return new NewForgeInstaller(installer).install(this);
-        } else if (InstallerDetector.isFabric(installer)) {
-            appendlnToLog("Detected Fabric Installer!");
-            return new FabricInstaller(installer).install(this);
-        }else if (InstallerDetector.isOptiFine(installer)) {
-            appendlnToLog("Detected OptiFine Installer!");
-            return new LegacyOptifineInstaller(installer).install(this);
-        } else {
-            appendlnToLog("No mod detected. Starting JVM");
-            isLogAllow = false;
-            mSkipDetectMod = true;
-            return launchJavaRuntime(modFile, javaArgs);
-        }
+        mSkipDetectMod = true;
+        return launchJavaRuntime(modFile, javaArgs);
     }
 
     public int launchJavaRuntime(File modFile, String javaArgs) {
@@ -370,8 +305,6 @@ public class JavaGUILauncherActivity extends LoggableActivity implements View.On
                 javaArgList.add("-jar");
                 javaArgList.add(modFile.getAbsolutePath());
             }
-            
-            // System.out.println(Arrays.toString(javaArgList.toArray(new String[0])));
 
             appendlnToLog("Info: Java arguments: " + Arrays.toString(javaArgList.toArray(new String[0])));
             
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java
deleted file mode 100644
index 879aa53c7..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/BaseInstaller.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-import java.io.*;
-import java.util.zip.*;
-import net.kdt.pojavlaunch.*;
-
-public class BaseInstaller {
-    protected File mFile;
-    protected ZipFile mJarFile;
-
-    public void setInput(File file) throws IOException {
-        mFile = file;
-        mJarFile = new ZipFile(file);
-    }
-    
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        return 0;
-    }
-    
-    public void from(BaseInstaller base) {
-        mFile = base.mFile;
-        mJarFile = base.mJarFile;
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java
deleted file mode 100644
index a7c6f31f1..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/FabricInstaller.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-
-import java.io.*;
-import net.kdt.pojavlaunch.*;
-
-public class FabricInstaller extends BaseInstaller {
-    public FabricInstaller(BaseInstaller i) {
-        from(i);
-    }
-
-    @Override
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        // Unused ZipFile
-        mJarFile.close();
-        
-        String mcversion = ctx.dialogInput("Fabric installer", R.string.main_version);
-        
-        ctx.appendlnToLog("Launching JVM");
-        return ctx.launchJavaRuntime(null,
-            "-jar " + mFile.getAbsolutePath() + " client -dir . -mcversion " + mcversion);
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java
deleted file mode 100644
index 154da56fb..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-import java.io.*;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-
-import com.google.gson.*;
-import net.kdt.pojavlaunch.value.*;
-
-public class InstallerDetector
-{
-    public static boolean isFabric(BaseInstaller installer) {
-        return installer.mJarFile.getEntry("net/fabricmc/installer/Main.class") != null;
-    }
-    public static boolean isOptiFine(BaseInstaller installer) {
-        Enumeration e = installer.mJarFile.entries();
-        return installer.mJarFile.getEntry("optifine/Installer.class") != null;
-    }
-    // Forge Legacy: for 1.12.1 and below
-    public static boolean isForgeLegacy(BaseInstaller installer) throws IOException, JsonSyntaxException {
-        ForgeInstallProfile profile = LegacyForgeInstaller.readInstallProfile(installer);
-        return profile != null && profile.versionInfo != null;
-    }
-    
-    // Forge for 1.12.2 only
-    public static boolean isForge1p12p2(BaseInstaller installer) throws IOException, JsonSyntaxException {
-        ForgeInstallProfile profile = LegacyForgeInstaller.readInstallProfile(installer);
-        // Forge 1.12.2 install_profile.json has same format as Forge 1.13+
-        return isForgeNew(installer) && profile.minecraft.equals("1.12.2");
-    }
-    
-    // Forge New: for 1.13 and above
-    public static boolean isForgeNew(BaseInstaller installer) throws IOException, JsonSyntaxException {
-        ForgeInstallProfile profile = LegacyForgeInstaller.readInstallProfile(installer);
-        return profile != null && profile.version != null;
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java
deleted file mode 100644
index 41e9d1e08..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/Legacy1p12p2ForgeInstaller.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-import android.content.*;
-import java.io.*;
-import java.util.jar.*;
-import net.kdt.pojavlaunch.*;
-import java.nio.charset.*;
-import net.kdt.pojavlaunch.value.*;
-import org.apache.commons.io.*;
-import com.google.gson.*;
-import java.util.zip.*;
-
-public class Legacy1p12p2ForgeInstaller extends BaseInstaller {
-    public Legacy1p12p2ForgeInstaller(BaseInstaller i) {
-        from(i);
-    }
-
-    @Override
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        String target;
-
-        ctx.appendlnToLog("Reading install_profile.json");
-        ForgeInstallProfile profile = readInstallProfile(this);
-
-        // Write the json file
-        File versionFile = new File(Tools.DIR_HOME_VERSION, profile.version);
-        versionFile.mkdir();
-        target = versionFile.getAbsolutePath() + "/" + profile.version + ".json";
-        ctx.appendlnToLog("Writing " + target + " from " + profile.json);
-        ZipEntry versionJson = mJarFile.getEntry(profile.json==null ? "version.json" : profile.json.substring(profile.json.indexOf("/")+1,profile.json.length()));
-        Tools.write(
-            target,
-            Tools.convertStream(mJarFile.getInputStream(versionJson))
-        );
-
-        // Forge 1.12.2+ installer does not include universal, so download
-        // Users are already go throught Forge ads to download installer, so not again.
-        String[] libInfos = profile.path.split(":");
-        File libraryFile = new File(Tools.DIR_HOME_LIBRARY, Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2]));
-        libraryFile.getParentFile().mkdirs();
-        target = libraryFile.getAbsolutePath();
-        String downloadPath = "https://files.minecraftforge.net/maven/" + profile.path.replace(":", "/").replace("net.minecraftforge","net/minecraftforge") + "/forge-" + libInfos[2] + "-universal.jar";
-        ctx.appendlnToLog("Downloading " + target);
-        Tools.downloadFile(downloadPath, target);
-        
-        mJarFile.close();
-        
-        return 0;
-    }
-
-    public static ForgeInstallProfile readInstallProfile(BaseInstaller base) throws IOException, JsonSyntaxException {
-        ZipEntry entry = base.mJarFile.getEntry("install_profile.json");
-        return entry == null ? null : Tools.GLOBAL_GSON.fromJson(
-            Tools.convertStream(
-                base.mJarFile.getInputStream(entry)
-            ),
-            ForgeInstallProfile.class
-        );
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java
deleted file mode 100644
index c5c6604c8..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyForgeInstaller.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-import android.content.*;
-import java.io.*;
-import java.util.jar.*;
-import net.kdt.pojavlaunch.*;
-import java.nio.charset.*;
-import net.kdt.pojavlaunch.value.*;
-import org.apache.commons.io.*;
-import com.google.gson.*;
-import java.util.zip.*;
-
-public class LegacyForgeInstaller extends BaseInstaller {
-    public LegacyForgeInstaller(BaseInstaller i) {
-        from(i);
-    }
-    
-    @Override
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        String target;
-        
-        ctx.appendlnToLog("Reading install_profile.json");
-        ForgeInstallProfile profile = readInstallProfile(this);
-            
-        // Write the json file
-        File versionFile = new File(Tools.DIR_HOME_VERSION, profile.install.target);
-        versionFile.mkdir();
-        target = versionFile.getAbsolutePath() + "/" + profile.install.target + ".json";
-        ctx.appendlnToLog("Writing " + target);
-        Tools.write(
-            target,
-            Tools.GLOBAL_GSON.toJson(profile.versionInfo)
-        );
-        
-        // Extract Forge universal
-        String[] libInfos = profile.install.path.split(":");
-        File libraryFile = new File(Tools.DIR_HOME_LIBRARY, Tools.artifactToPath(libInfos[0], libInfos[1], libInfos[2]));
-        libraryFile.getParentFile().mkdirs();
-        target = libraryFile.getAbsolutePath().replace("-universal", "");
-        ctx.appendlnToLog("Writing " + target);
-        InputStream in = mJarFile.getInputStream(mJarFile.getEntry(profile.install.filePath));
-        FileOutputStream out = new FileOutputStream(target);
-        IOUtils.copy(in, out);
-        in.close();
-        out.close();
-        
-        mJarFile.close();
-        
-        return 0;
-    }
-    
-    public static ForgeInstallProfile readInstallProfile(BaseInstaller base) throws IOException, JsonSyntaxException {
-        ZipEntry entry = base.mJarFile.getEntry("install_profile.json");
-        return entry == null ? null : Tools.GLOBAL_GSON.fromJson(
-                Tools.convertStream(
-                    base.mJarFile.getInputStream(entry),
-                    Charset.forName("UTF-8")
-                ),
-            ForgeInstallProfile.class
-        );
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java
deleted file mode 100644
index bfebcfeb2..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-
-import java.io.*;
-import net.kdt.pojavlaunch.*;
-
-public class LegacyOptifineInstaller extends BaseInstaller {
-    public LegacyOptifineInstaller(BaseInstaller i) {
-        from(i);
-    }
-
-    @Override
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        mJarFile.close();
-        ctx.appendlnToLog("Launching JVM");
-        return ctx.launchJavaRuntime(null,
-                "-jar "+Tools.DIR_GAME_NEW+"/config/OptiInst.jar " + mFile.getAbsolutePath() +" .");
-    }
-}
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java
deleted file mode 100644
index cb2d107f3..000000000
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/NewForgeInstaller.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package net.kdt.pojavlaunch.installers;
-
-import java.io.*;
-import net.kdt.pojavlaunch.*;
-
-public class NewForgeInstaller extends BaseInstaller
- {
-    public NewForgeInstaller(BaseInstaller i) {
-        from(i);
-    }
-
-    @Override
-    public int install(JavaGUILauncherActivity ctx) throws IOException {
-        // Unused ZipFile
-        mJarFile.close();
-
-        ctx.appendlnToLog("Launching JVM");
-        return ctx.launchJavaRuntime(null,
-            "-cp " + Tools.DIR_GAME_NEW + "/config/forge-installer-headless.jar:" + mFile.getAbsolutePath() + " me.xfl03.HeadlessInstaller --installClient .");
-    }
-}