Added getLaunchCommand for all launchers

Author: tomsik68

src/sk/tomsik68/mclauncher/api/versions/IVersionLauncher.java

@@ -1,24 +1,39 @@
 package sk.tomsik68.mclauncher.api.versions;
 
+import java.util.List;
+
 import sk.tomsik68.mclauncher.api.common.ILaunchSettings;
 import sk.tomsik68.mclauncher.api.common.mc.IMinecraftInstance;
 import sk.tomsik68.mclauncher.api.login.ISession;
 import sk.tomsik68.mclauncher.api.servers.ISavedServer;
+
 /**
  * Launcher can run one type of version
+ * 
  * @author Tomsik68
- *
+ * 
  */
 public interface IVersionLauncher {
+
+    public List<String> getLaunchCommand(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion version, ILaunchSettings settings)
+            throws Exception;
+
     /**
      * Launches minecraft
-     * @param session Login session
-     * @param mc Target minecraft instance
-     * @param server Server to connect to
-     * @param version Version to launch
-     * @param settings Launch settings
+     * 
+     * @param session
+     *            Login session
+     * @param mc
+     *            Target minecraft instance
+     * @param server
+     *            Server to connect to
+     * @param version
+     *            Version to launch
+     * @param settings
+     *            Launch settings
      * @return Process which was created
-     * @throws Exception various errors
+     * @throws Exception
+     *             various errors
      */
     public Process launch(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion version, ILaunchSettings settings) throws Exception;
 }

src/sk/tomsik68/mclauncher/impl/versions/mcassets/MCAssetsVersionLauncher.java

@@ -19,6 +19,15 @@ public class MCAssetsVersionLauncher implements IVersionLauncher {
 
     @Override
     public Process launch(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion version, ILaunchSettings settings) throws Exception {
+        ProcessBuilder pb = new ProcessBuilder(getLaunchCommand(session, mc, server, version, settings));
+        pb.redirectErrorStream(settings.isErrorStreamRedirected());
+        Process result = pb.start();
+        return result;
+    }
+
+    @Override
+    public List<String> getLaunchCommand(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion version, ILaunchSettings settings)
+            throws Exception {
         String pathToJar = Relauncher.class.getProtectionDomain().getCodeSource().getLocation().getFile();
         List<String> command = new ArrayList<String>();
         if (settings.getCommandPrefix() != null && !settings.getCommandPrefix().isEmpty())
@@ -68,10 +77,7 @@ public Process launch(ISession session, IMinecraftInstance mc, ISavedServer serv
         command.add(mc.getLibraryProvider().getNativesDirectory(version).getAbsolutePath());
         command.add("-jlibpath");
         command.add(mc.getLibraryProvider().getNativesDirectory(version).getAbsolutePath());
-        ProcessBuilder pb = new ProcessBuilder(command);
-        pb.redirectErrorStream(settings.isErrorStreamRedirected());
-        Process result = pb.start();
-        return result;
+        return command;
     }
 
 }

src/sk/tomsik68/mclauncher/impl/versions/mcdownload/MCDownloadVersionLauncher.java

@@ -55,6 +55,16 @@ public String[] getMinecraftArguments(IMinecraftInstance mc, ISession session, I
 
     @Override
     public Process launch(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion v, ILaunchSettings settings) throws Exception {
+
+        ProcessBuilder pb = new ProcessBuilder(getLaunchCommand(session, mc, server, v, settings));
+        pb.redirectErrorStream(settings.isErrorStreamRedirected());
+        pb.directory(mc.getLocation());
+        return pb.start();
+    }
+
+    @Override
+    public List<String> getLaunchCommand(ISession session, IMinecraftInstance mc, ISavedServer server, IVersion v, ILaunchSettings settings)
+            throws Exception {
         // get JSON information about the version
         File jsonFile = new File(mc.getJarProvider().getVersionFile(v.getUniqueID()).getParent(), "info.json");
         System.out.println("Looking for " + jsonFile.getAbsolutePath());
@@ -106,10 +116,7 @@ public Process launch(ISession session, IMinecraftInstance mc, ISavedServer serv
             command.add("--port");
             command.add("" + server.getPort());
         }
-        ProcessBuilder pb = new ProcessBuilder(command);
-        pb.redirectErrorStream(settings.isErrorStreamRedirected());
-        pb.directory(mc.getLocation());
-        System.out.println(command.toString());
-        return pb.start();
+
+        return command;
     }
 }