Refactor script parsing

libraries/launcher/org/multimc/EntryPoint.java

@@ -51,8 +51,6 @@ public final class EntryPoint {
 
     private final Parameters params = new Parameters();
 
-    private String launcherType;
-
     public static void main(String[] args) {
         EntryPoint listener = new EntryPoint();
 
@@ -80,15 +78,6 @@ public final class EntryPoint {
                 return Action.Abort;
             }
 
-            case "launcher": {
-                if (tokens.length != 2)
-                    throw new ParseException("Expected 2 tokens, got " + tokens.length);
-
-                launcherType = tokens[1];
-
-                return Action.Proceed;
-            }
-
             default: {
                 if (tokens.length != 2)
                     throw new ParseException("Error while parsing:" + inData);
@@ -129,12 +118,11 @@ public final class EntryPoint {
             return 1;
         }
 
-        if (launcherType != null) {
         try {
             Launcher launcher =
                     LauncherFactory
                             .getInstance()
-                                .createLauncher(launcherType, params);
+                            .createLauncher(params);
 
             launcher.launch();
 
@@ -150,11 +138,6 @@ public final class EntryPoint {
         }
     }
 
-        LOGGER.log(Level.SEVERE, "No valid launcher implementation specified.");
-
-        return 1;
-    }
-
     private enum Action {
         Proceed,
         Launch,

libraries/launcher/org/multimc/LauncherFactory.java

@@ -39,7 +39,9 @@ public final class LauncherFactory {
         });
     }
 
-    public Launcher createLauncher(String name, Parameters parameters) {
+    public Launcher createLauncher(Parameters parameters) {
+        String name = parameters.first("launcher");
+
         LauncherProvider launcherProvider = launcherRegistry.get(name);
 
         if (launcherProvider == null)