From aabc278f0571e2b116a665833decada35451ac48 Mon Sep 17 00:00:00 2001
From: artdeell <ultramaksim@gmail.com>
Date: Wed, 30 Dec 2020 14:51:10 +0300
Subject: [PATCH] Optifine Installer added

---
 .../src/main/assets/components/OptiInst.jar      | Bin 0 -> 2954 bytes
 .../kdt/pojavlaunch/JavaGUILauncherActivity.java |   3 +++
 .../net/kdt/pojavlaunch/PojavLoginActivity.java  |   2 ++
 .../installers/InstallerDetector.java            |   8 +++++++-
 .../installers/LegacyOptifineInstaller.java      |   6 ++++--
 5 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 app_pojavlauncher/src/main/assets/components/OptiInst.jar

diff --git a/app_pojavlauncher/src/main/assets/components/OptiInst.jar b/app_pojavlauncher/src/main/assets/components/OptiInst.jar
new file mode 100644
index 0000000000000000000000000000000000000000..94b951bc7a99e11904863348e3dfdecc848e10ff
GIT binary patch
literal 2954
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
XAClmxH+3PVikCb^@fYv!kptjAz(@A;

literal 0
HcmV?d00001

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 9c1bb7c93..45bd32faa 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/JavaGUILauncherActivity.java
@@ -172,6 +172,9 @@ public class JavaGUILauncherActivity extends LoggableActivity {
         } 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;
diff --git a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
index 5742501b5..712aba67f 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/PojavLoginActivity.java
@@ -332,6 +332,8 @@ public class PojavLoginActivity extends BaseActivity
 
             Tools.copyAssetFile(this, "components/ForgeInstallerHeadless/forge-installer-headless-1.0.1.jar",
                 Tools.DIR_GAME_NEW + "/config", "forge-installer-headless.jar", true);
+            Tools.copyAssetFile(this, "components/OptiInst.jar",
+                    Tools.DIR_GAME_NEW + "/config", "OptiInst.jar", true);
             Tools.copyAssetFile(this, "components/security/pro-grade.jar", Tools.DIR_DATA, true);
             Tools.copyAssetFile(this, "components/security/java_sandbox.policy", Tools.DIR_DATA, true);
             Tools.copyAssetFile(this, "options.txt", Tools.DIR_GAME_NEW, false);
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
index 98af7ac90..154da56fb 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/InstallerDetector.java
@@ -1,6 +1,9 @@
 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.*;
 
@@ -9,7 +12,10 @@ 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);
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
index 99b316bd2..ced61373d 100644
--- a/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java
+++ b/app_pojavlauncher/src/main/java/net/kdt/pojavlaunch/installers/LegacyOptifineInstaller.java
@@ -17,7 +17,9 @@ public class LegacyOptifineInstaller extends BaseInstaller {
 
     @Override
     public int install(JavaGUILauncherActivity ctx) throws IOException {
-        
-        return 0;
+        mJarFile.close();
+        ctx.appendlnToLog("Launching JVM");
+        return ctx.launchJavaRuntime(null,
+                "-jar "+Tools.DIR_GAME_NEW+"/config/OptiInst.jar " + mFile.getAbsolutePath() +" .");
     }
 }