Changes

- Cleaned some unused codes
- Set client brand name
- Set window size correctly(?)

JavaApp/src/main/java/net/kdt/pojavlaunch/PLaunchApp.java

@@ -30,6 +30,8 @@ public class PLaunchApp {
                 Tools.write(mcDir.getAbsolutePath() + "/launcher_profiles.json",
                   Tools.read(Tools.DIR_DATA + "/launcher_profiles.json"));
             }
+
+            LauncherPreferences.loadPreferences();
         } catch (IOException e) {
             e.printStackTrace();
         }
@@ -40,8 +42,6 @@ public class PLaunchApp {
         } else {
             return;
         }
-
-        LauncherPreferences.loadPreferences();
     }
 
     // Called from SurfaceViewController

JavaApp/src/main/java/net/kdt/pojavlaunch/Tools.java

@@ -137,61 +137,6 @@ public final class Tools
         
         // JREUtils.launchJavaVM(javaArgList);
     }
-    
-    public static void getJavaArgs(List<String> javaArgList) {
-        List<String> overrideableArgList = new ArrayList<String>();
-/*
-        overrideableArgList.add("-Djava.home=" + Tools.DIR_HOME_JRE);
-        overrideableArgList.add("-Djava.io.tmpdir=" + System.getProperty("java.io.tmpdir"));
-        
-        overrideableArgList.add("-Duser.home=" + Tools.DIR_GAME_HOME);
-        overrideableArgList.add("-Duser.language=" + System.getProperty("user.language"));
-        overrideableArgList.add("-Duser.timezone=GMT");
-
-        overrideableArgList.add("-Dos.name=Darwin");
-        overrideableArgList.add("-Dos.version=iOS-" + System.getProperty("os.version"));
-*/
-        overrideableArgList.add("-Dpojav.path.minecraft=" + Tools.DIR_GAME_NEW);
-        overrideableArgList.add("-Dpojav.path.private.account=" + Tools.DIR_ACCOUNT_NEW);
-        
-        // javaArgList.add("-Dorg.lwjgl.libname=liblwjgl3.so");
-        // javaArgList.add("-Dorg.lwjgl.system.jemalloc.libname=libjemalloc.so");
-       
-        overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl4es_114.dylib");
-        // overrideableArgList.add("-Dorg.lwjgl.opengl.libname=libgl4es_115.so");
-        
-        // javaArgList.add("-Dorg.lwjgl.opengl.libname=libRegal.so");
-
-        // Enable LWJGL3 debug
-        // overrideableArgList.add("-Dorg.lwjgl.util.Debug=true");
-        // overrideableArgList.add("-Dorg.lwjgl.util.DebugFunctions=true");
-        // overrideableArgList.add("-Dorg.lwjgl.util.DebugLoader=true");
-
-        // GLFW Stub width height
-        overrideableArgList.add("-Dglfwstub.windowWidth=" + GLFW.mGLFWWindowWidth);
-        overrideableArgList.add("-Dglfwstub.windowHeight=" + GLFW.mGLFWWindowHeight);
-        overrideableArgList.add("-Dglfwstub.initEgl=false");
-
-        overrideableArgList.add("-Dnet.minecraft.clientmodname=" + Tools.APP_NAME);
-        
-        // Disable FML Early Loading Screen to get Forge 1.14+ works
-        overrideableArgList.add("-Dfml.earlyprogresswindow=false");
-        
-        // Override args
-        for (String argOverride : LauncherPreferences.PREF_CUSTOM_JAVA_ARGS.split(" ")) {
-            for (int i = 0; i < overrideableArgList.size(); i++) {
-                String arg = overrideableArgList.get(i);
-                if (arg.startsWith("-D") && argOverride.startsWith(arg.substring(0, arg.indexOf('=') + 1))) {
-                    overrideableArgList.set(i, argOverride);
-                    break;
-                } else if (i+1 == overrideableArgList.size()) {
-                    javaArgList.add(argOverride);
-                }
-            }
-        }
-
-        javaArgList.addAll(overrideableArgList);
-    }
 
     public static String[] getMinecraftArgs(MinecraftAccount profile, JMinecraftVersionList.Version versionInfo) {
         String username = profile.username;
@@ -241,6 +186,14 @@ public final class Tools
                 }
             }
         }
+        minecraftArgs.add("--width");
+        minecraftArgs.add(Integer.toString(GLFW.mGLFWWindowWidth));
+        minecraftArgs.add("--height");
+        minecraftArgs.add(Integer.toString(GLFW.mGLFWWindowHeight));
+        minecraftArgs.add("--fullscreenWidth");
+        minecraftArgs.add(Integer.toString(GLFW.mGLFWWindowWidth));
+        minecraftArgs.add("--fullscreenHeight");
+        minecraftArgs.add(Integer.toString(GLFW.mGLFWWindowHeight));
         
         String[] argsFromJson = JSONUtils.insertJSONValueList(
             splitAndFilterEmpty(

JavaApp/src/main/java/net/kdt/pojavlaunch/utils/JREUtils.java

@@ -124,56 +124,6 @@ public class JREUtils
         
         // return ldLibraryPath;
     }
-    
-    public static int launchJavaVM(final List<String> args) throws Throwable {
-        JREUtils.relocateLibPath();
-        // ctx.appendlnToLog("LD_LIBRARY_PATH = " + JREUtils.LD_LIBRARY_PATH);
-
-        List<String> javaArgList = new ArrayList<String>();
-        javaArgList.add(Tools.DIR_HOME_JRE + "/bin/java");
-        Tools.getJavaArgs(javaArgList);
-
-        javaArgList.addAll(args);
-        
-        // For debugging only!
-/*
-        StringBuilder sbJavaArgs = new StringBuilder();
-        for (String s : javaArgList) {
-            sbJavaArgs.append(s + " ");
-        }
-        ctx.appendlnToLog("Executing JVM: \"" + sbJavaArgs.toString() + "\"");
-*/
-
-        redirectLogcat(Tools.DIR_APP_DATA + "/latestlog.txt");
-
-        setJavaEnvironment();
-        initJavaRuntime();
-        chdir(Tools.DIR_GAME_NEW);
-
-        final int exitCode = VMLauncher.launchJVM(true /* JLI_Launch */, javaArgList);
-        System.out.println("Java Exit code: " + exitCode);
-        if (exitCode != 0) {
-            Tools.showError(new Exception("Java exited with code " + exitCode));
-/*
-            ctx.runOnUiThread(new Runnable(){
-                    @Override
-                    public void run() {
-                        AlertDialog.Builder dialog = new AlertDialog.Builder(ctx);
-                        dialog.setMessage(ctx.getString(R.string.mcn_exit_title, exitCode));
-                        dialog.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener(){
-
-                                @Override
-                                public void onClick(DialogInterface p1, int p2){
-                                    BaseMainActivity.fullyExit();
-                                }
-                            });
-                        dialog.show();
-                    }
-                });
-*/
-        }
-        return exitCode;
-    }
 
     public static native int chdir(String path);
     public static native boolean dlopen(String libPath);