fix api installer

Author: Tungstend

.idea/deploymentTargetDropDown.xml

@@ -1 +1 @@
-15
+16

HMCLPE/src/main/assets/app_runtime/java/JRE17/version

@@ -1 +1 @@
-15
+16

HMCLPE/src/main/assets/app_runtime/java/default/version

@@ -7,14 +7,14 @@
 
 import com.tungsten.hmclpe.manifest.AppManifest;
 
+import net.kdt.pojavlaunch.PojavApiService;
+
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetSocketAddress;
 import java.util.ArrayList;
 
-import cosine.boat.BoatApiService;
-
-public class ApiService extends BoatApiService {
+public class ApiService extends PojavApiService {
 
     public static final int API_SERVICE_PORT = 6868;
 

HMCLPE/src/main/java/com/tungsten/hmclpe/launcher/download/ApiService.java

@@ -0,0 +1,44 @@
+package net.kdt.pojavlaunch;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+
+import net.kdt.pojavlaunch.function.ApiInstallerCallback;
+import net.kdt.pojavlaunch.utils.JREUtils;
+
+import java.util.ArrayList;
+
+public class PojavApiService extends Service {
+
+    public ApiInstallerCallback callback;
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    public void startApiInstaller(String javaPath, ArrayList<String> commands, String debugDir, ApiInstallerCallback callback) {
+        this.callback = callback;
+        new Thread(() -> {
+            int exitCode = JREUtils.launchAPIInstaller(getApplicationContext(), javaPath, commands, debugDir);
+            onExit(PojavApiService.this,exitCode);
+        }).start();
+    }
+
+    public static void onExit(Context context, int exitCode) {
+        ((PojavApiService) context).callback.onExit(exitCode);
+        ((PojavApiService) context).stopSelf();
+    }
+
+    @Override
+    public void onDestroy() {
+        android.os.Process.killProcess(android.os.Process.myPid());
+        super.onDestroy();
+    }
+
+}

PojavLauncher/src/main/java/net/kdt/pojavlaunch/PojavApiService.java

@@ -0,0 +1,5 @@
+package net.kdt.pojavlaunch.function;
+
+public interface ApiInstallerCallback {
+    void onExit(int code);
+}

PojavLauncher/src/main/java/net/kdt/pojavlaunch/function/ApiInstallerCallback.java

@@ -272,25 +272,25 @@ public static int launchJavaVM(final Activity activity,String javaPath,String ho
         return exitCode;
     }
 
-    public static int launchAPIInstaller(Activity activity,String javaPath, Vector<String> args, String home) {
+    public static int launchAPIInstaller(Context context,String javaPath, ArrayList<String> args, String home) {
         try {
-            redirectAndPrintJRELog(activity);
-            relocateLibPath(activity,javaPath);
+            args.remove(0);
+            redirectAndPrintJRELog(context);
+            relocateLibPath(context,javaPath);
             Os.setenv("HOME", home, true);
             Os.setenv("JAVA_HOME" , javaPath, true);
             File serverFile = new File(javaPath + "/lib/server/libjvm.so");
             jvmLibraryPath = javaPath + "/lib/" + (serverFile.exists() ? "server" : "client");
             Log.d("DynamicLoader","Base LD_LIBRARY_PATH: " + LD_LIBRARY_PATH);
             Log.d("DynamicLoader","Internal LD_LIBRARY_PATH: " + jvmLibraryPath + ":" + LD_LIBRARY_PATH);
             setLdLibraryPath(jvmLibraryPath + ":" + LD_LIBRARY_PATH);
-            List<String> userArgs = new ArrayList<>();
-            userArgs.addAll(args);
+            List<String> userArgs = new ArrayList<>(args);
             initJavaRuntime(javaPath);
-            setupExitTrap(activity.getApplication());
+            setupExitTrap(context);
             chdir(home);
             userArgs.add(0,"java");
             final int exitCode = VMLauncher.launchJVM((String[]) userArgs.toArray(new String[0]));
-            Logger.getInstance(activity).appendToLog("Java Exit code: " + exitCode);
+            Logger.getInstance(context).appendToLog("Java Exit code: " + exitCode);
             return exitCode;
         } catch (ErrnoException | IOException e) {
             e.printStackTrace();
@@ -391,92 +391,6 @@ public static String findInLdLibPath(String libName) {
         return libName;
     }
 
-    /**
-     * Remove the argument from the list, if it exists
-     * If the argument exists multiple times, they will all be removed.
-     * @param argList The argument list to purge
-     * @param argStart The argument to purge from the list.
-     */
-    private static void purgeArg(List<String> argList, String argStart) {
-        for(int i = 0; i < argList.size(); i++) {
-            final String arg = argList.get(i);
-            if(arg.startsWith(argStart)) {
-                argList.remove(i);
-            }
-        }
-    }
-    private static final int EGL_OPENGL_ES_BIT = 0x0001;
-    private static final int EGL_OPENGL_ES2_BIT = 0x0004;
-    private static final int EGL_OPENGL_ES3_BIT_KHR = 0x0040;
-    private static boolean hasExtension(String extensions, String name) {
-        int start = extensions.indexOf(name);
-        while (start >= 0) {
-            // check that we didn't find a prefix of a longer extension name
-            int end = start + name.length();
-            if (end == extensions.length() || extensions.charAt(end) == ' ') {
-                return true;
-            }
-            start = extensions.indexOf(name, end);
-        }
-        return false;
-    }
-    private static int getDetectedVersion() {
-        /*
-         * Get all the device configurations and check the EGL_RENDERABLE_TYPE attribute
-         * to determine the highest ES version supported by any config. The
-         * EGL_KHR_create_context extension is required to check for ES3 support; if the
-         * extension is not present this test will fail to detect ES3 support. This
-         * effectively makes the extension mandatory for ES3-capable devices.
-         */
-        EGL10 egl = (EGL10) EGLContext.getEGL();
-        EGLDisplay display = egl.eglGetDisplay(EGL10.EGL_DEFAULT_DISPLAY);
-        int[] numConfigs = new int[1];
-        if (egl.eglInitialize(display, null)) {
-            try {
-                boolean checkES3 = hasExtension(egl.eglQueryString(display, EGL10.EGL_EXTENSIONS),
-                        "EGL_KHR_create_context");
-                if (egl.eglGetConfigs(display, null, 0, numConfigs)) {
-                    EGLConfig[] configs = new EGLConfig[numConfigs[0]];
-                    if (egl.eglGetConfigs(display, configs, numConfigs[0], numConfigs)) {
-                        int highestEsVersion = 0;
-                        int[] value = new int[1];
-                        for (int i = 0; i < numConfigs[0]; i++) {
-                            if (egl.eglGetConfigAttrib(display, configs[i],
-                                    EGL10.EGL_RENDERABLE_TYPE, value)) {
-                                if (checkES3 && ((value[0] & EGL_OPENGL_ES3_BIT_KHR) ==
-                                        EGL_OPENGL_ES3_BIT_KHR)) {
-                                    if (highestEsVersion < 3) highestEsVersion = 3;
-                                } else if ((value[0] & EGL_OPENGL_ES2_BIT) == EGL_OPENGL_ES2_BIT) {
-                                    if (highestEsVersion < 2) highestEsVersion = 2;
-                                } else if ((value[0] & EGL_OPENGL_ES_BIT) == EGL_OPENGL_ES_BIT) {
-                                    if (highestEsVersion < 1) highestEsVersion = 1;
-                                }
-                            } else {
-                                Log.w("glesDetect", "Getting config attribute with "
-                                        + "EGL10#eglGetConfigAttrib failed "
-                                        + "(" + i + "/" + numConfigs[0] + "): "
-                                        + egl.eglGetError());
-                            }
-                        }
-                        return highestEsVersion;
-                    } else {
-                        Log.e("glesDetect", "Getting configs with EGL10#eglGetConfigs failed: "
-                                + egl.eglGetError());
-                        return -1;
-                    }
-                } else {
-                    Log.e("glesDetect", "Getting number of configs with EGL10#eglGetConfigs failed: "
-                            + egl.eglGetError());
-                    return -2;
-                }
-            } finally {
-                egl.eglTerminate(display);
-            }
-        } else {
-            Log.e("glesDetect", "Couldn't initialize EGL.");
-            return -3;
-        }
-    }
     public static native int chdir(String path);
     public static native void logToLogger(final Logger logger);
     public static native boolean dlopen(String libPath);