summaryrefslogtreecommitdiffstats
path: root/depends/launcher/org
diff options
context:
space:
mode:
authorJan Dalheimer <jan@dalheimer.de>2014-02-15 22:26:44 +0100
committerJan Dalheimer <jan@dalheimer.de>2014-02-15 22:26:44 +0100
commit8219dbf612f4e6f603d304348fc388e364602f98 (patch)
tree2d0bafeb9ff7019f5b9b19bbf034665285d836ae /depends/launcher/org
parent3b236483dfe00f87c5f3b03220d78620f0f99f4d (diff)
downloadMultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar
MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.gz
MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.lz
MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.tar.xz
MultiMC-8219dbf612f4e6f603d304348fc388e364602f98.zip
Underp. Don't depend on OneSix. Nicer "menu" style choosing.
Diffstat (limited to 'depends/launcher/org')
-rw-r--r--depends/launcher/org/multimc/EntryPoint.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/depends/launcher/org/multimc/EntryPoint.java b/depends/launcher/org/multimc/EntryPoint.java
index e2721ffa..9e4ea0c1 100644
--- a/depends/launcher/org/multimc/EntryPoint.java
+++ b/depends/launcher/org/multimc/EntryPoint.java
@@ -61,27 +61,31 @@ public class EntryPoint
private Action parseLine(String inData) throws ParseException
{
String[] pair = inData.split(" ", 2);
+
+ if(pair.length == 1 && pair[0].equals("launch"))
+ return Action.Launch;
+
if(pair.length != 2)
throw new ParseException();
String command = pair[0];
String param = pair[1];
- if(command.equals("launch"))
+ if(command.equals("launcher"))
{
if(param.equals("legacy"))
{
m_launcher = new LegacyLauncher();
Utils.log("Using legacy launcher.");
Utils.log();
- return Action.Launch;
+ return Action.Proceed;
}
if(param.equals("onesix"))
{
m_launcher = new OneSixLauncher();
Utils.log("Using onesix launcher.");
Utils.log();
- return Action.Launch;
+ return Action.Proceed;
}
else
throw new ParseException();