removing jarfile.ref functionality since it's no longer needed

Mumfrey
1 parent 792cf5b9
Showing 1 changed file with 37 additions and 101 deletions
java/common/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
 package com.mumfrey.liteloader.launch;
 import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -26,9 +23,6 @@ import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
 import com.google.common.base.Throwables;
-import com.google.gson.Gson;
-import com.google.gson.JsonIOException;
-import com.google.gson.JsonSyntaxException;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -52,7 +46,7 @@ public class LiteLoaderTweaker implements ITweaker
 	 */
 	enum StartupState
 	{
-		CONSTRUCT,
+		PREPARE,
 		PREINIT,
 		BEGINGAME,
 		INIT,
@@ -62,7 +56,7 @@ public class LiteLoaderTweaker implements ITweaker
 		/**
 		 * Current state
 		 */
-		private static StartupState currentState = StartupState.CONSTRUCT.gotoState();
+		private static StartupState currentState = StartupState.PREPARE.gotoState();
 		/**
 		 * Whether this state is active
@@ -102,7 +96,7 @@ public class LiteLoaderTweaker implements ITweaker
 					if (otherState.canGotoState(this))
 						otherState.leaveState();
 					else
-						throw new IllegalStateException(String.format("Cannot go to state \"%s\" as %s %s", this.name(), otherState, otherState.getNextState() == this ? "" : "and expects \""  + otherState.getNextState().name() + "\" instead"), LiteLoaderLogger.getLastThrowable());
+						throw new IllegalStateException(String.format("Cannot go to state <%s> as %s %s", this.name(), otherState, otherState.getNextState() == this ? "" : "and expects \""  + otherState.getNextState().name() + "\" instead"), LiteLoaderLogger.getLastThrowable());
 				}
 			}
@@ -121,7 +115,7 @@ public class LiteLoaderTweaker implements ITweaker
 		@Override
 		public String toString()
 		{
-			return String.format("\"%s\" is %s %s", this.name(), this.inState ? "[ACTIVE]" : "[INACTIVE]", this.completed ? "and [COMPLETED]" : "but [INCOMPLETE]");
+			return String.format("<%s> is %s %s", this.name(), this.inState ? "[ACTIVE]" : "[INACTIVE]", this.completed ? "and [COMPLETED]" : "but [INCOMPLETE]");
 		}
 		/**
@@ -181,7 +175,6 @@ public class LiteLoaderTweaker implements ITweaker
 	private List<String> singularLaunchArgs = new ArrayList<String>();
 	private Map<String, String> launchArgs;
-	private ArgumentAcceptingOptionSpec<String> jarOption;
 	private ArgumentAcceptingOptionSpec<String> modsOption;
 	private ArgumentAcceptingOptionSpec<String> apisOption;
 	private OptionSet parsedOptions;
@@ -216,30 +209,11 @@ public class LiteLoaderTweaker implements ITweaker
 		LiteLoaderTweaker.instance = this;
 		this.initArgs(args, gameDirectory, assetsDirectory);
-		
+
 		List<String> modsToLoad = this.getModFilterList();
 		List<String> apisToLoad = this.getAPIsToLoad();
-		this.registerCoreAPIs(apisToLoad);
-		
-		if (this.parsedOptions.has(this.jarOption))
-		{
-			this.initJarUsing(this.jarOption.value(this.parsedOptions));
-		}
-		else
-		{
-			this.initJar();
-		}
-
-		LiteLoaderLogger.info("Bootstrapping LiteLoader " + LiteLoaderTweaker.VERSION);
-		
-		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.CONSTRUCT.completed();
+		this.prepare(gameDirectory, assetsDirectory, profile, apisToLoad);
 		this.preInit(modsToLoad);
 	}
@@ -272,79 +246,13 @@ public class LiteLoaderTweaker implements ITweaker
 		apisToLoad.add(0, "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient");
 	}
-	/**
-	 * 
-	 */
-	private void initJarUsing(String jarPath)
+	private void initJar()
 	{
-		try
-		{
-			if (jarPath.matches("^[0-9\\.]+$")) jarPath = String.format("versions/%1$s/%1$s.jar", jarPath);
-			LiteLoaderLogger.info("Version jar '%s' was specified on the command line", jarPath);
-			File jarFile = new File(jarPath);
-			this.jarUrl = jarFile.toURI().toURL();
-			this.injectVersionJar(jarFile);
-		}
-		catch (Exception ex)
-		{
-			ex.printStackTrace();
-		}
-	}
-
-	/**
-	 * @throws JsonSyntaxException
-	 * @throws JsonIOException
-	 */
-	private void initJar() throws JsonSyntaxException, JsonIOException
-	{
-		String resource = "/jarfile.ref";
-		InputStream refResource = LiteLoaderTweaker.class.getResourceAsStream(resource);
-		File refContainer = ClassPathUtilities.getPathToResource(LiteLoaderTweaker.class, resource);
-		if (refResource != null && refContainer != null)
-		{
-			InputStreamReader refReader = new InputStreamReader(refResource);
-			
-			try
-			{
-				@SuppressWarnings("unchecked")
-				Map<String, String> refMap = new Gson().fromJson(refReader, HashMap.class);
-				if (refMap.containsKey("jarfile"))
-				{
-					String jarPath = refMap.get("jarfile");
-					LiteLoaderLogger.info("Version jar '%s' specified via jarfile.ref", jarPath);
-					File jarFile = new File(refContainer.getParentFile(), jarPath);
-					this.jarUrl = jarFile.toURI().toURL();
-					this.injectVersionJar(jarFile);
-					return;
-				}
-			}
-			catch (IOException ex) {}
-			finally
-			{
-				try
-				{
-					refReader.close();
-					refResource.close();
-				}
-				catch (IOException ex) {}
-			}
-		}
-			
 		URL[] urls = Launch.classLoader.getURLs();
 		this.jarUrl = urls[urls.length - 1]; // probably?
 	}
 	/**
-	 * @param jarFile
-	 */
-	private void injectVersionJar(File jarFile)
-	{
-		LiteLoaderLogger.info("Injecting version jar '%s'", jarFile.getAbsolutePath());
-		Launch.classLoader.addURL(this.jarUrl);
-		LiteLoaderTweaker.addURLToParentClassLoader(this.jarUrl);
-	}
-
-	/**
 	 * @param args
 	 * @param gameDirectory
 	 * @param assetsDirectory
@@ -353,7 +261,6 @@ public class LiteLoaderTweaker implements ITweaker
 	public void initArgs(List<String> args, File gameDirectory, File assetsDirectory)
 	{
 		OptionParser optionParser = new OptionParser();
-		this.jarOption = optionParser.accepts("versionJar", "Minecraft version jar to use").withRequiredArg().ofType(String.class);
 		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();
@@ -580,7 +487,7 @@ public class LiteLoaderTweaker implements ITweaker
 	protected LoaderBootstrap spawnBootstrap(String bootstrapClassName, ClassLoader classLoader, File gameDirectory, File assetsDirectory, String profile, List<String> apisToLoad)
 	{
-		if (!StartupState.CONSTRUCT.isInState())
+		if (!StartupState.PREPARE.isInState())
 		{
 			throw new IllegalStateException("spawnBootstrap is not valid outside constructor");
 		}
@@ -608,6 +515,35 @@ public class LiteLoaderTweaker implements ITweaker
 	}
 	/**
+	 * @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)