cleaning up the tweaker a bit, moving logic to separate StartupEnvironment class

Mumfrey
1 parent f2549841
Showing 7 changed files with 411 additions and 287 deletions
java/common/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/common/com/mumfrey/liteloader/launch/GameEnvironment.java
java/common/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
java/common/com/mumfrey/liteloader/launch/LiteLoaderTweakerServer.java
java/common/com/mumfrey/liteloader/launch/LoaderBootstrap.java
java/common/com/mumfrey/liteloader/launch/LoaderEnvironment.java
java/common/com/mumfrey/liteloader/launch/StartupEnvironment.java
@@ -30,6 +30,7 @@ import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
 import com.mumfrey.liteloader.launch.LoaderBootstrap;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
 import com.mumfrey.liteloader.launch.LoaderProperties;
+import com.mumfrey.liteloader.launch.StartupEnvironment;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
 /**
@@ -143,17 +144,17 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * @param assetsDirectory
 	 * @param profile
 	 */
-	public LiteLoaderBootstrap(int environmentTypeId, File gameDirectory, File assetsDirectory, String profile, List<String> apisToLoad)
+	public LiteLoaderBootstrap(StartupEnvironment env)
 	{
-		this.environmentType     = EnvironmentType.values()[environmentTypeId];
+		this.environmentType     = EnvironmentType.values()[env.getEnvironmentTypeId()];
-		this.apiRegistry         = new APIRegistry(this, this);
+		this.apiRegistry         = new APIRegistry(this.getEnvironment(), this.getProperties());
-		this.gameDirectory       = gameDirectory;
-		this.assetsDirectory     = assetsDirectory;
-		this.profile             = profile;
+		this.gameDirectory       = env.getGameDirectory();
+		this.assetsDirectory     = env.getAssetsDirectory();
+		this.profile             = env.getProfile();
+		this.modsFolder          = env.getModsFolder();
-		this.modsFolder          = new File(this.gameDirectory,    "mods");
 		this.versionedModsFolder = new File(this.modsFolder,       LiteLoaderVersion.CURRENT.getMinecraftVersion());
 		this.configBaseFolder    = new File(this.gameDirectory,    "liteconfig");
 		this.logFile             = new File(this.configBaseFolder, "liteloader.log");
@@ -169,7 +170,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 		if (!this.commonConfigFolder.exists()) this.commonConfigFolder.mkdirs();
 		if (!this.versionConfigFolder.exists()) this.versionConfigFolder.mkdirs();
-		this.initAPIs(apisToLoad);
+		this.initAPIs(env.getAPIsToLoad());
 		this.apiProvider = this.apiRegistry.getProvider();
 		this.apiAdapter = this.apiRegistry.getAdapter();
 	}
@@ -242,6 +243,18 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 		return this.environmentType;
 	}
+	@Override
+	public LoaderEnvironment getEnvironment()
+	{
+		return this;
+	}
+	
+	@Override
+	public LoaderProperties getProperties()
+	{
+		return this;
+	}
+	
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#preInit(net.minecraft.launchwrapper.LaunchClassLoader, boolean)
 	 */
@@ -307,7 +320,7 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 		// PreInit failed
 		if (this.enumerator == null) return;
-		LiteLoader.createInstance(this, this, classLoader);
+		LiteLoader.createInstance(this.getEnvironment(), this.getProperties(), classLoader);
 		LiteLoader.invokeInit();
 	}
+package com.mumfrey.liteloader.launch;
+
+import java.io.File;
+
+public interface GameEnvironment
+{
+	/**
+	 * Get the game directory, this is the root directory of the game profile specified by the user in the launcher
+	 */
+	public abstract File getGameDirectory();
+
+	/**
+	 * Get the assets directory
+	 */
+	public abstract File getAssetsDirectory();
+
+	/**
+	 * Get the active profile name
+	 */
+	public abstract String getProfile();
+	
+	/**
+	 * Get the "mods" folder, used to get the base path for enumerators and config for legacy mods
+	 */
+	public abstract File getModsFolder();
+}
@@ -5,19 +5,11 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
-import joptsimple.ArgumentAcceptingOptionSpec;
-import joptsimple.NonOptionArgumentSpec;
-import joptsimple.OptionParser;
-import joptsimple.OptionSet;
 import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
@@ -33,11 +25,13 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
  */
 public class LiteLoaderTweaker implements ITweaker
 {
-	public static final String VERSION = "1.7.10";
+	public static final int ENV_TYPE_CLIENT = 0;
+	public static final int ENV_TYPE_DEDICATEDSERVER = 1;
-	protected static final int ENV_TYPE_CLIENT = 0;
+	public static final String VERSION = "1.7.10";
-	protected static final int ENV_TYPE_DEDICATEDSERVER = 1;
+	protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap";
+	protected static final String genTransformerClassName = "com.mumfrey.liteloader.client.gen.GenProfilerTransformer";
 	/**
 	 * Loader startup state
@@ -170,172 +164,159 @@ public class LiteLoaderTweaker implements ITweaker
 	private static LiteLoaderTweaker instance;
-	private URL jarUrl;
-	
-	private List<String> singularLaunchArgs = new ArrayList<String>();
-	private Map<String, String> launchArgs;
-	
-	private ArgumentAcceptingOptionSpec<String> modsOption;
-	private ArgumentAcceptingOptionSpec<String> apisOption;
-	private OptionSet parsedOptions;
+	protected URL jarUrl;
-	private int tweakOrder = 0;
-	private Set<String> allCascadingTweaks = new HashSet<String>();
-	private Set<SortableValue<String>> sortedCascadingTweaks = new TreeSet<SortableValue<String>>();
+	protected int tweakOrder = 0;
+	protected Set<String> allCascadingTweaks = new HashSet<String>();
+	protected Set<SortableValue<String>> sortedCascadingTweaks = new TreeSet<SortableValue<String>>();
-	private boolean isPrimary;
+	protected boolean isPrimary;
+	
+	protected StartupEnvironment env;
 	/**
 	 * Loader bootstrap object
 	 */
-	private LoaderBootstrap bootstrap;
+	protected LoaderBootstrap bootstrap;
-	private LoaderProperties properties;
+	protected LoaderProperties properties;
 	/**
 	 * Transformer manager
 	 */
-	private ClassTransformerManager transformerManager;
-	
-	private static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap";
+	protected ClassTransformerManager transformerManager;
-	private static final String genTransformerClassName = "com.mumfrey.liteloader.client.gen.GenProfilerTransformer";
-
 	@Override
 	public void acceptOptions(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
 		Launch.classLoader.addClassLoaderExclusion("com.google.common.");
-		
 		LiteLoaderTweaker.instance = this;
-		this.initArgs(args, gameDirectory, assetsDirectory);
-
-		List<String> modsToLoad = this.getModFilterList();
-		List<String> apisToLoad = this.getAPIsToLoad();
-		
-		this.prepare(gameDirectory, assetsDirectory, profile, apisToLoad);
+		this.prepare(args, gameDirectory, assetsDirectory, profile);
-		this.preInit(modsToLoad);
+		this.preInit();
 	}
 	/**
-	 * @return
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 * @param profile
+	 * @param apisToLoad
 	 */
-	private List<String> getModFilterList()
+	private void prepare(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		return (this.parsedOptions.has(this.modsOption)) ? this.modsOption.values(this.parsedOptions) : null;
+		LiteLoaderLogger.info("Bootstrapping LiteLoader " + LiteLoaderTweaker.VERSION);
+		
+		try
+		{
+			this.initEnvironment(args, gameDirectory, assetsDirectory, profile);
+
+			this.bootstrap = this.spawnBootstrap(LiteLoaderTweaker.bootstrapClassName, Launch.classLoader);
+			this.properties = this.bootstrap.getProperties();
+			
+			this.transformerManager = new ClassTransformerManager(this.bootstrap.getRequiredTransformers());
+			this.transformerManager.injectTransformers(this.bootstrap.getPacketTransformers());
+			
+			StartupState.PREPARE.completed();
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.severe(th, "Error during LiteLoader PREPARE: %s %s", th.getClass().getName(), th.getMessage());
+		}
 	}
 	/**
-	 * @return
+	 * Do the first stage of loader startup, which enumerates mod sources and finds tweakers
 	 */
-	private List<String> getAPIsToLoad()
+	private void preInit()
 	{
-		List<String> apisToLoad = new ArrayList<String>();
-		this.registerCoreAPIs(apisToLoad);
-		if (this.parsedOptions.has(this.apisOption))
+		StartupState.PREINIT.gotoState();
+
+		try
+		{
+			this.bootstrap.preInit(Launch.classLoader, true, this.env.getModFilterList());
+			
+			this.injectDiscoveredTweakClasses();
+			StartupState.PREINIT.completed();
+		}
+		catch (Throwable th)
 		{
-			apisToLoad.addAll(this.apisOption.values(this.parsedOptions));
+			LiteLoaderLogger.severe(th, "Error during LiteLoader PREINIT: %s %s", th.getClass().getName(), th.getMessage());
 		}
-		
-		return apisToLoad;
 	}
-	protected void registerCoreAPIs(List<String> apisToLoad)
-	{
-		apisToLoad.add(0, "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient");
-	}
-
-	private void initJar()
+	public static void preBeginGame()
 	{
-		URL[] urls = Launch.classLoader.getURLs();
-		this.jarUrl = urls[urls.length - 1]; // probably?
+		StartupState.BEGINGAME.gotoState();
+		try
+		{
+			LiteLoaderTweaker.instance.transformerManager.injectDownstreamTransformers(Launch.classLoader);
+			LiteLoaderTweaker.instance.bootstrap.preBeginGame();
+			StartupState.BEGINGAME.completed();
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.severe(th, "Error during LiteLoader BEGINGAME: %s %s", th.getClass().getName(), th.getMessage());
+		}
 	}
 	/**
-	 * @param args
-	 * @param gameDirectory
-	 * @param assetsDirectory
+	 * Do the second stage of loader startup
 	 */
-	@SuppressWarnings("unchecked")
-	public void initArgs(List<String> args, File gameDirectory, File assetsDirectory)
+	public static void init()
 	{
-		OptionParser optionParser = new OptionParser();
-		this.modsOption = optionParser.accepts("mods", "Comma-separated list of mods to load").withRequiredArg().ofType(String.class).withValuesSeparatedBy(',');
-		this.apisOption = optionParser.accepts("api", "Additional API classes to load").withRequiredArg().ofType(String.class);
-		optionParser.allowsUnrecognizedOptions();
-		NonOptionArgumentSpec<String> nonOptions = optionParser.nonOptions();
+		StartupState.INIT.gotoState();
-		this.parsedOptions = optionParser.parse(args.toArray(new String[args.size()]));
-		this.launchArgs = (Map<String, String>)Launch.blackboard.get("launchArgs");
-		if (this.launchArgs == null)
+		try
 		{
-			this.launchArgs = new HashMap<String, String>();			
-			Launch.blackboard.put("launchArgs", this.launchArgs);
+			LiteLoaderTweaker.instance.bootstrap.init(Launch.classLoader);
+			StartupState.INIT.completed();
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.severe(th, "Error during LiteLoader INIT: %s %s", th.getClass().getName(), th.getMessage());
 		}
-		
-		// Parse out the arguments ourself because joptsimple doesn't really provide a good way to
-		// add arguments to the unparsed argument list after parsing
-		this.parseArgs(this.parsedOptions.valuesOf(nonOptions));
-		
-		// Put required arguments to the blackboard if they don't already exist there
-		this.provideRequiredArgs(gameDirectory, assetsDirectory);
 	}
-
+	
 	/**
-	 * @param gameDirectory
-	 * @param assetsDirectory
+	 * Do the second stage of loader startup
 	 */
-	public void provideRequiredArgs(File gameDirectory, File assetsDirectory)
+	public static void postInit()
 	{
-		if (!this.launchArgs.containsKey("--version"))
-			this.addClassifiedArg("--version", LiteLoaderTweaker.VERSION);
-		
-		if (!this.launchArgs.containsKey("--gameDir") && gameDirectory != null)
-			this.addClassifiedArg("--gameDir", gameDirectory.getAbsolutePath());
-		
-		if (!this.launchArgs.containsKey("--assetsDir") && assetsDirectory != null)
-			this.addClassifiedArg("--assetsDir", assetsDirectory.getAbsolutePath());
+		StartupState.POSTINIT.gotoState();
+
+		try
+		{
+			LiteLoaderTweaker.instance.bootstrap.postInit();
+			StartupState.POSTINIT.completed();
+
+			StartupState.DONE.gotoState();
+		}
+		catch (Throwable th)
+		{
+			LiteLoaderLogger.severe(th, "Error during LiteLoader POSTINIT: %s %s", th.getClass().getName(), th.getMessage());
+		}
 	}
-	private void parseArgs(List<String> args)
+	protected void initEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		String classifier = null;
-		
-		for (String arg : args)
+		this.env = new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
 		{
-			if (arg.startsWith("-"))
+			@Override
+			public void registerCoreAPIs(List<String> apisToLoad)
 			{
-				if (classifier != null)
-				{
-					this.addClassifiedArg(classifier, "");
-					classifier = null;
-				}
-				else if (arg.contains("="))
-				{
-					this.addClassifiedArg(arg.substring(0, arg.indexOf('=')), arg.substring(arg.indexOf('=') + 1));
-				}
-				else
-				{
-					classifier = arg;
-				}
+				apisToLoad.add(0, "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient");
 			}
-			else
+
+			@Override
+			public int getEnvironmentTypeId()
 			{
-				if (classifier != null)
-				{
-					this.addClassifiedArg(classifier, arg);
-					classifier = null;
-				}
-				else
-					this.singularLaunchArgs.add(arg);
+				return LiteLoaderTweaker.ENV_TYPE_CLIENT;
 			}
-		}
-	}
+		};
-	private void addClassifiedArg(String classifiedArg, String arg)
-	{
-		this.launchArgs.put(classifiedArg, arg);
+		URL[] urls = Launch.classLoader.getURLs();
+		this.jarUrl = urls[urls.length - 1]; // probably?
 	}
 	@Override
@@ -371,21 +352,7 @@ public class LiteLoaderTweaker implements ITweaker
 	@Override
 	public String[] getLaunchArguments()
 	{
-		List<String> args = new ArrayList<String>();
-		
-		for (String singularArg : this.singularLaunchArgs)
-			args.add(singularArg);
-		
-		for (Entry<String, String> launchArg : this.launchArgs.entrySet())
-		{
-			args.add(launchArg.getKey().trim());
-			args.add(launchArg.getValue().trim());
-		}
-		
-		this.singularLaunchArgs.clear();
-		this.launchArgs.clear();
-		
-		return args.toArray(new String[args.size()]);
+		return this.env.getLaunchArguments();
 	}
 	public static boolean addCascadedTweaker(String tweakClass, int priority)
@@ -485,21 +452,21 @@ public class LiteLoaderTweaker implements ITweaker
 		return false;
 	}
-	protected LoaderBootstrap spawnBootstrap(String bootstrapClassName, ClassLoader classLoader, File gameDirectory, File assetsDirectory, String profile, List<String> apisToLoad)
+	protected LoaderBootstrap spawnBootstrap(String bootstrapClassName, ClassLoader classLoader)
 	{
 		if (!StartupState.PREPARE.isInState())
 		{
-			throw new IllegalStateException("spawnBootstrap is not valid outside constructor");
+			throw new IllegalStateException("spawnBootstrap is not valid outside PREPARE");
 		}
 		try
 		{
 			@SuppressWarnings("unchecked")
 			Class<? extends LoaderBootstrap> bootstrapClass = (Class<? extends LoaderBootstrap>)Class.forName(bootstrapClassName, false, classLoader);
-			Constructor<? extends LoaderBootstrap> bootstrapCtor = bootstrapClass.getDeclaredConstructor(Integer.TYPE, File.class, File.class, String.class, List.class);
+			Constructor<? extends LoaderBootstrap> bootstrapCtor = bootstrapClass.getDeclaredConstructor(StartupEnvironment.class);
 			bootstrapCtor.setAccessible(true);
-			return bootstrapCtor.newInstance(this.getEnvironmentTypeId(), gameDirectory, assetsDirectory, profile, apisToLoad);
+			return bootstrapCtor.newInstance(this.env);
 		}
 		catch (Throwable th)
 		{
@@ -508,113 +475,6 @@ public class LiteLoaderTweaker implements ITweaker
 		return null;
 	}
-
-	protected int getEnvironmentTypeId()
-	{
-		return LiteLoaderTweaker.ENV_TYPE_CLIENT;
-	}
-
-	/**
-	 * @param gameDirectory
-	 * @param assetsDirectory
-	 * @param profile
-	 * @param apisToLoad
-	 */
-	private void prepare(File gameDirectory, File assetsDirectory, String profile, List<String> apisToLoad)
-	{
-		LiteLoaderLogger.info("Bootstrapping LiteLoader " + LiteLoaderTweaker.VERSION);
-		
-		try
-		{
-			this.registerCoreAPIs(apisToLoad);
-			this.initJar();
-
-			this.bootstrap = this.spawnBootstrap(LiteLoaderTweaker.bootstrapClassName, Launch.classLoader, gameDirectory, assetsDirectory, profile, apisToLoad);
-			this.properties = this.bootstrap instanceof LoaderProperties ? (LoaderProperties)this.bootstrap : null;
-			
-			this.transformerManager = new ClassTransformerManager(this.bootstrap.getRequiredTransformers());
-			this.transformerManager.injectTransformers(this.bootstrap.getPacketTransformers());
-			
-			StartupState.PREPARE.completed();
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.severe(th, "Error during LiteLoader PREPARE: %s %s", th.getClass().getName(), th.getMessage());
-		}
-	}
-
-	/**
-	 * Do the first stage of loader startup, which enumerates mod sources and finds tweakers
-	 */
-	private void preInit(List<String> modsToLoad)
-	{
-		StartupState.PREINIT.gotoState();
-
-		try
-		{
-			this.bootstrap.preInit(Launch.classLoader, true, modsToLoad);
-			
-			this.injectDiscoveredTweakClasses();
-			StartupState.PREINIT.completed();
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.severe(th, "Error during LiteLoader PREINIT: %s %s", th.getClass().getName(), th.getMessage());
-		}
-	}
-	
-	public static void preBeginGame()
-	{
-		StartupState.BEGINGAME.gotoState();
-		try
-		{
-			LiteLoaderTweaker.instance.transformerManager.injectDownstreamTransformers(Launch.classLoader);
-			LiteLoaderTweaker.instance.bootstrap.preBeginGame();
-			StartupState.BEGINGAME.completed();
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.severe(th, "Error during LiteLoader BEGINGAME: %s %s", th.getClass().getName(), th.getMessage());
-		}
-	}
-
-	/**
-	 * Do the second stage of loader startup
-	 */
-	public static void init()
-	{
-		StartupState.INIT.gotoState();
-		
-		try
-		{
-			LiteLoaderTweaker.instance.bootstrap.init(Launch.classLoader);
-			StartupState.INIT.completed();
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.severe(th, "Error during LiteLoader INIT: %s %s", th.getClass().getName(), th.getMessage());
-		}
-	}
-	
-	/**
-	 * Do the second stage of loader startup
-	 */
-	public static void postInit()
-	{
-		StartupState.POSTINIT.gotoState();
-
-		try
-		{
-			LiteLoaderTweaker.instance.bootstrap.postInit();
-			StartupState.POSTINIT.completed();
-
-			StartupState.DONE.gotoState();
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.severe(th, "Error during LiteLoader POSTINIT: %s %s", th.getClass().getName(), th.getMessage());
-		}
-	}
 	public static URL getJarUrl()
 	{
 package com.mumfrey.liteloader.launch;
+import java.io.File;
+import java.net.URL;
 import java.util.List;
+import net.minecraft.launchwrapper.Launch;
+
 public class LiteLoaderTweakerServer extends LiteLoaderTweaker
 {
 	@Override
-	protected void registerCoreAPIs(List<String> apisToLoad)
+	protected void initEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		apisToLoad.add(0, "com.mumfrey.liteloader.server.api.LiteLoaderCoreAPIServer");
+		this.env = new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
+		{
+			@Override
+			public void registerCoreAPIs(List<String> apisToLoad)
+			{
+				apisToLoad.add(0, "com.mumfrey.liteloader.server.api.LiteLoaderCoreAPIServer");
+			}
+
+			@Override
+			public int getEnvironmentTypeId()
+			{
+				return LiteLoaderTweaker.ENV_TYPE_DEDICATEDSERVER;
+			}
+		};
+
+		URL[] urls = Launch.classLoader.getURLs();
+		this.jarUrl = urls[urls.length - 1]; // probably?
 	}
-	
+
 	@Override
 	public String getLaunchTarget()
 	{
@@ -17,10 +37,4 @@ public class LiteLoaderTweakerServer extends LiteLoaderTweaker
 		return "net.minecraft.server.MinecraftServer";
 	}
-	
-	@Override
-	protected int getEnvironmentTypeId()
-	{
-		return LiteLoaderTweaker.ENV_TYPE_DEDICATEDSERVER;
-	}
 }
@@ -42,4 +42,8 @@ public interface LoaderBootstrap
 	public abstract List<String> getRequiredDownstreamTransformers();
 	public abstract List<String> getPacketTransformers();
+	
+	public abstract LoaderEnvironment getEnvironment();
+	
+	public abstract LoaderProperties getProperties();
 }
@@ -16,7 +16,7 @@ import com.mumfrey.liteloader.interfaces.LoaderEnumerator;
  * 
  * @author Adam Mummery-Smith
  */
-public interface LoaderEnvironment
+public interface LoaderEnvironment extends GameEnvironment
 {
 	public enum EnvironmentType
 	{
@@ -47,26 +47,6 @@ public interface LoaderEnvironment
 	public abstract LoaderEnumerator getEnumerator();
 	/**
-	 * Get the game directory, this is the root directory of the game profile specified by the user in the launcher
-	 */
-	public abstract File getGameDirectory();
-
-	/**
-	 * Get the assets directory
-	 */
-	public abstract File getAssetsDirectory();
-
-	/**
-	 * Get the active profile name
-	 */
-	public abstract String getProfile();
-	
-	/**
-	 * Get the "mods" folder, used to get the base path for enumerators and config for legacy mods
-	 */
-	public abstract File getModsFolder();
-
-	/**
 	 * Get the version-specific mods folder
 	 */
 	public abstract File getVersionedModsFolder();
+package com.mumfrey.liteloader.launch;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import net.minecraft.launchwrapper.Launch;
+import joptsimple.ArgumentAcceptingOptionSpec;
+import joptsimple.NonOptionArgumentSpec;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+
+/**
+ * Container for startup environment state which also parses the command line options
+ * 
+ * @author Adam Mummery-Smith
+ */
+public abstract class StartupEnvironment implements GameEnvironment
+{	
+	private List<String> singularLaunchArgs = new ArrayList<String>();
+	private Map<String, String> launchArgs;
+	
+	private ArgumentAcceptingOptionSpec<String> modsDirOption;
+	private ArgumentAcceptingOptionSpec<String> modsOption;
+	private ArgumentAcceptingOptionSpec<String> apisOption;
+	private NonOptionArgumentSpec<String> unparsedOptions;
+	private OptionSet parsedOptions;
+	
+	private final File gameDirectory;
+	private final File assetsDirectory;
+	private final String profile;
+	
+	public StartupEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
+	{
+		this.initArgs(args);
+		
+		this.gameDirectory = gameDirectory;
+		this.assetsDirectory = assetsDirectory;
+		this.profile = profile;
+	}
+
+	public abstract void registerCoreAPIs(List<String> apisToLoad);
+
+	public abstract int getEnvironmentTypeId();
+
+	/**
+	 * @param args
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 */
+	@SuppressWarnings("unchecked")
+	public void initArgs(List<String> args)
+	{
+		// Get the launchArgs map from the blackboard, or create it if it's not there
+		this.launchArgs = (Map<String, String>)Launch.blackboard.get("launchArgs");
+		if (this.launchArgs == null)
+		{
+			this.launchArgs = new HashMap<String, String>();			
+			Launch.blackboard.put("launchArgs", this.launchArgs);
+		}
+
+		// Parse liteloader options using joptsimple
+		this.parseOptions(args.toArray(new String[args.size()]));
+		
+		// Parse out the arguments ourself because joptsimple doesn't really provide a good way to
+		// add arguments to the unparsed argument list after parsing
+		this.parseArgs(this.parsedOptions.valuesOf(this.unparsedOptions));
+		
+		// Put required arguments to the blackboard if they don't already exist there
+		this.provideRequiredArgs();
+	}
+
+	private void parseOptions(String[] args)
+	{
+		OptionParser optionParser = new OptionParser();
+		optionParser.allowsUnrecognizedOptions();
+		
+		this.modsOption = optionParser.accepts("mods", "Comma-separated list of mods to load").withRequiredArg().ofType(String.class).withValuesSeparatedBy(',');
+		this.apisOption = optionParser.accepts("api", "Additional API classes to load").withRequiredArg().ofType(String.class);
+		this.modsDirOption = optionParser.accepts("modsDir", "Path to 'mods' folder to use instead of default").withRequiredArg().ofType(String.class);
+		
+		this.unparsedOptions = optionParser.nonOptions();
+		this.parsedOptions = optionParser.parse(args);
+	}
+
+	private void parseArgs(List<String> args)
+	{
+		String classifier = null;
+		
+		for (String arg : args)
+		{
+			if (arg.startsWith("-"))
+			{
+				if (classifier != null)
+				{
+					this.addClassifiedArg(classifier, "");
+					classifier = null;
+				}
+				else if (arg.contains("="))
+				{
+					this.addClassifiedArg(arg.substring(0, arg.indexOf('=')), arg.substring(arg.indexOf('=') + 1));
+				}
+				else
+				{
+					classifier = arg;
+				}
+			}
+			else
+			{
+				if (classifier != null)
+				{
+					this.addClassifiedArg(classifier, arg);
+					classifier = null;
+				}
+				else
+					this.singularLaunchArgs.add(arg);
+			}
+		}
+		
+		if (classifier != null) this.singularLaunchArgs.add(classifier);
+	}
+
+	public void addClassifiedArg(String classifiedArg, String arg)
+	{
+		this.launchArgs.put(classifiedArg, arg);
+	}
+
+	/**
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 */
+	public void provideRequiredArgs()
+	{
+		if (!this.launchArgs.containsKey("--version"))
+			this.addClassifiedArg("--version", LiteLoaderTweaker.VERSION);
+		
+		if (!this.launchArgs.containsKey("--gameDir") && this.gameDirectory != null)
+			this.addClassifiedArg("--gameDir", this.gameDirectory.getAbsolutePath());
+		
+		if (!this.launchArgs.containsKey("--assetsDir") && this.assetsDirectory != null)
+			this.addClassifiedArg("--assetsDir", this.assetsDirectory.getAbsolutePath());
+	}
+
+	public String[] getLaunchArguments()
+	{
+		List<String> args = new ArrayList<String>();
+		
+		for (String singularArg : this.singularLaunchArgs)
+			args.add(singularArg);
+		
+		for (Entry<String, String> launchArg : this.launchArgs.entrySet())
+		{
+			args.add(launchArg.getKey().trim());
+			args.add(launchArg.getValue().trim());
+		}
+		
+		this.singularLaunchArgs.clear();
+		this.launchArgs.clear();
+		
+		return args.toArray(new String[args.size()]);
+	}
+
+	/**
+	 * @return
+	 */
+	public List<String> getModFilterList()
+	{
+		return (this.parsedOptions.has(this.modsOption)) ? this.modsOption.values(this.parsedOptions) : null;
+	}
+
+	/**
+	 * @return
+	 */
+	public List<String> getAPIsToLoad()
+	{
+		List<String> apisToLoad = new ArrayList<String>();
+		this.registerCoreAPIs(apisToLoad);
+		if (this.parsedOptions.has(this.apisOption))
+		{
+			apisToLoad.addAll(this.apisOption.values(this.parsedOptions));
+		}
+		
+		return apisToLoad;
+	}
+	
+	public File getOptionalDirectory(File baseDirectory, ArgumentAcceptingOptionSpec<String> option, String defaultDir)
+	{
+		if (this.parsedOptions.has(option))
+		{
+			String path = option.value(this.parsedOptions);
+			File dir = new File(path);
+			if (dir.isAbsolute())
+				return dir;
+			
+			return new File(baseDirectory, path);
+		}
+		
+		return new File(baseDirectory, defaultDir);
+	}
+
+	@Override
+	public File getGameDirectory()
+	{
+		return this.gameDirectory;
+	}
+
+	@Override
+	public File getAssetsDirectory()
+	{
+		return this.assetsDirectory;
+	}
+
+	@Override
+	public String getProfile()
+	{
+		return this.profile;
+	}
+
+	@Override
+	public File getModsFolder()
+	{
+		return this.getOptionalDirectory(this.gameDirectory, this.modsDirOption, "mods");
+	}
+}