clean up LiteLoaderTweaker a bit and don't rely on singleton for some public contracts

Mumfrey
1 parent 97de196e
Showing 7 changed files with 263 additions and 137 deletions
java/common/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/common/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
java/common/com/mumfrey/liteloader/core/LiteLoaderMods.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
@@ -17,6 +17,7 @@ import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.appender.FileAppender;
 import org.apache.logging.log4j.core.layout.PatternLayout;
+import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
@@ -120,6 +121,10 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	private String branding = null;
 	private boolean loadTweaks = true;
+	
+	private LaunchClassLoader classLoader; 
+	
+	private final ITweaker tweaker;
 	private final APIRegistry apiRegistry;
@@ -140,13 +145,13 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	private EnabledModsList enabledModsList;
 	/**
-	 * @param gameDirectory
-	 * @param assetsDirectory
-	 * @param profile
+	 * @param env
+	 * @param tweaker
 	 */
-	public LiteLoaderBootstrap(StartupEnvironment env)
+	public LiteLoaderBootstrap(StartupEnvironment env, ITweaker tweaker)
 	{
 		this.environmentType     = EnvironmentType.values()[env.getEnvironmentTypeId()];
+		this.tweaker             = tweaker;
 		this.apiRegistry         = new APIRegistry(this.getEnvironment(), this.getProperties());
@@ -255,12 +260,19 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 		return this;
 	}
+	@Override
+	public ITweaker getTweaker()
+	{
+		return this.tweaker;
+	}
+	
 	/* (non-Javadoc)
 	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#preInit(net.minecraft.launchwrapper.LaunchClassLoader, boolean)
 	 */
 	@Override
 	public void preInit(LaunchClassLoader classLoader, boolean loadTweaks, List<String> modsToLoad)
 	{
+		this.classLoader = classLoader;
 		this.loadTweaks = loadTweaks;
 		LiteLoaderLogger.info("LiteLoader begin PREINIT...");
@@ -315,12 +327,12 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
 	 * @see com.mumfrey.liteloader.launch.ILoaderBootstrap#init(java.util.List, net.minecraft.launchwrapper.LaunchClassLoader)
 	 */
 	@Override
-	public void init(LaunchClassLoader classLoader)
+	public void init()
 	{
 		// PreInit failed
 		if (this.enumerator == null) return;
-		LiteLoader.createInstance(this.getEnvironment(), this.getProperties(), classLoader);
+		LiteLoader.createInstance(this.getEnvironment(), this.getProperties(), this.classLoader);
 		LiteLoader.invokeInit();
 	}
@@ -69,6 +69,8 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	private final LoaderEnvironment environment;
 	private final LoaderProperties properties;
+	
+	private final LiteLoaderTweaker tweaker;
 	/**
 	 * Reference to the launch classloader
@@ -124,6 +126,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 	{
 		this.environment       = environment;
 		this.properties        = properties;
+		this.tweaker           = (LiteLoaderTweaker)environment.getTweaker();
 		this.classLoader       = classLoader;
 		this.supportedPrefixes = this.getSupportedPrefixes(environment);
@@ -548,7 +551,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 			String tweakClass = container.getTweakClassName();
 			int tweakPriority = container.getTweakPriority();
 			LiteLoaderLogger.info("Mod file '%s' provides tweakClass '%s', adding to Launch queue with priority %d", container.getName(), tweakClass, tweakPriority);
-			if (LiteLoaderTweaker.addCascadedTweaker(tweakClass, tweakPriority))
+			if (this.tweaker.addCascadedTweaker(tweakClass, tweakPriority))
 			{
 				LiteLoaderLogger.info("tweakClass '%s' was successfully added", tweakClass);
 				container.injectIntoClassPath(this.classLoader, true);
@@ -589,7 +592,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
 			for (String classTransformerClass : classTransformerClasses)
 			{
 				LiteLoaderLogger.info("Mod file '%s' provides classTransformer '%s', adding to class loader", container.getName(), classTransformerClass);
-				if (LiteLoaderTweaker.getTransformerManager().injectTransformer(classTransformerClass))
+				if (this.tweaker.getTransformerManager().injectTransformer(classTransformerClass))
 				{
 					LiteLoaderLogger.info("classTransformer '%s' was successfully added", classTransformerClass);
 					container.injectIntoClassPath(this.classLoader, true);
@@ -59,6 +59,11 @@ public class LiteLoaderMods
 	protected final LoaderEnumerator enumerator;
 	/**
+	 * Tweaker
+	 */
+	private final LiteLoaderTweaker tweaker;
+
+	/**
 	 * Configuration manager 
 	 */
 	private final ConfigManager configManager;
@@ -100,6 +105,7 @@ public class LiteLoaderMods
 		this.loader           = loader;
 		this.environment      = environment;
 		this.enumerator       = environment.getEnumerator();
+		this.tweaker          = (LiteLoaderTweaker)environment.getTweaker();
 		this.properties       = properties;
 		this.configManager    = configManager;
 	}
@@ -681,7 +687,7 @@ public class LiteLoaderMods
 	 */
 	private void validateModTransformers()
 	{
-		ClassTransformerManager transformerManager = LiteLoaderTweaker.getTransformerManager();
+		ClassTransformerManager transformerManager = this.tweaker.getTransformerManager();
 		Set<String> injectedTransformers = transformerManager.getInjectedTransformers();
 		for (Mod mod : this.loadedMods)
@@ -737,7 +743,7 @@ public class LiteLoaderMods
 	{
 		if (!mod.hasClassTransformers()) return false;
-		Set<String> injectedTransformers = LiteLoaderTweaker.getTransformerManager().getInjectedTransformers();
+		Set<String> injectedTransformers = this.tweaker.getTransformerManager().getInjectedTransformers();
 		List<String> modTransformers = ((TweakContainer<?>)mod.getContainer()).getClassTransformerClassNames();
 		for (String modTransformer : modTransformers)
@@ -14,7 +14,6 @@ import net.minecraft.launchwrapper.ITweaker;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.launchwrapper.LaunchClassLoader;
-import com.google.common.base.Throwables;
 import com.mumfrey.liteloader.util.SortableValue;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -162,16 +161,39 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 	}
-	private static LiteLoaderTweaker instance;
+	/**
+	 * Singleton instance, mainly for delegating from injected callbacks which need a static method to call
+	 */
+	protected static LiteLoaderTweaker instance;
-	protected URL jarUrl;
+	/**
+	 * Approximate location of the minecraft jar, used for "base" injection position in ClassPathUtilities
+	 */
+	protected static URL jarUrl;
+	/**
+	 * "Order" value for inserted tweakers, used as disambiguating sort criteria for injected tweakers which have the same priority 
+	 */
 	protected int tweakOrder = 0;
+	
+	/**
+	 * All tweakers, used to avoid injecting duplicates
+	 */
 	protected Set<String> allCascadingTweaks = new HashSet<String>();
+	
+	/**
+	 * Sorted list of tweakers, used to sort tweakers before injecting
+	 */
 	protected Set<SortableValue<String>> sortedCascadingTweaks = new TreeSet<SortableValue<String>>();
+	/**
+	 * True if this is the primary tweak, not known until at least PREJOINGAME
+	 */
 	protected boolean isPrimary;
+	/**
+	 * Startup environment information, used to store info about the current startup in one place, also handles parsing command line arguments
+	 */
 	protected StartupEnvironment env;
 	/**
@@ -179,22 +201,78 @@ public class LiteLoaderTweaker implements ITweaker
 	 */
 	protected LoaderBootstrap bootstrap;
-	protected LoaderProperties properties;
-	
 	/**
 	 * Transformer manager
 	 */
 	protected ClassTransformerManager transformerManager;
+	/* (non-Javadoc)
+	 * @see net.minecraft.launchwrapper.ITweaker#acceptOptions(java.util.List, java.io.File, java.io.File, java.lang.String)
+	 */
 	@Override
 	public void acceptOptions(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
 		Launch.classLoader.addClassLoaderExclusion("com.google.common.");
 		LiteLoaderTweaker.instance = this;
-		this.prepare(args, gameDirectory, assetsDirectory, profile);
+		this.onPrepare(args, gameDirectory, assetsDirectory, profile);
-		this.preInit();
+		this.onPreInit();
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.launchwrapper.ITweaker#injectIntoClassLoader(net.minecraft.launchwrapper.LaunchClassLoader)
+	 */
+	@Override
+	public void injectIntoClassLoader(LaunchClassLoader classLoader)
+	{
+		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Obf");
+		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Packets");
+
+		this.transformerManager.injectUpstreamTransformers(classLoader);
+
+		for (String transformerClassName : this.bootstrap.getRequiredDownstreamTransformers())
+		{
+			LiteLoaderLogger.info("Queuing required class transformer '%s'", transformerClassName);
+			this.transformerManager.injectTransformer(transformerClassName);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see net.minecraft.launchwrapper.ITweaker#getLaunchTarget()
+	 */
+	@Override
+	public String getLaunchTarget()
+	{
+		this.isPrimary = true;
+		this.onPreBeginGame();
+		
+		return "net.minecraft.client.main.Main";
+	}
+
+	/* (non-Javadoc)
+	 * @see net.minecraft.launchwrapper.ITweaker#getLaunchArguments()
+	 */
+	@Override
+	public String[] getLaunchArguments()
+	{
+		return this.env.getLaunchArguments();
+	}
+
+	/**
+	 * Return true if this is the primary tweaker
+	 */
+	public boolean isPrimary()
+	{
+		return this.isPrimary;
+	}
+	
+	/**
+	 * Get the class transformer manager
+	 */
+	public ClassTransformerManager getTransformerManager()
+	{
+		return this.transformerManager;
 	}
 	/**
@@ -203,7 +281,7 @@ public class LiteLoaderTweaker implements ITweaker
 	 * @param profile
 	 * @param apisToLoad
 	 */
-	private void prepare(List<String> args, File gameDirectory, File assetsDirectory, String profile)
+	private void onPrepare(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
 		LiteLoaderLogger.info("Bootstrapping LiteLoader " + LiteLoaderTweaker.VERSION);
@@ -212,7 +290,6 @@ public class LiteLoaderTweaker implements ITweaker
 			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());
@@ -228,7 +305,7 @@ public class LiteLoaderTweaker implements ITweaker
 	/**
 	 * Do the first stage of loader startup, which enumerates mod sources and finds tweakers
 	 */
-	private void preInit()
+	private void onPreInit()
 	{
 		StartupState.PREINIT.gotoState();
@@ -245,13 +322,16 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 	}
-	public static void preBeginGame()
+	/**
+	 * 
+	 */
+	private void onPreBeginGame()
 	{
 		StartupState.BEGINGAME.gotoState();
 		try
 		{
-			LiteLoaderTweaker.instance.transformerManager.injectDownstreamTransformers(Launch.classLoader);
-			LiteLoaderTweaker.instance.bootstrap.preBeginGame();
+			this.transformerManager.injectDownstreamTransformers(Launch.classLoader);
+			this.bootstrap.preBeginGame();
 			StartupState.BEGINGAME.completed();
 		}
 		catch (Throwable th)
@@ -263,13 +343,13 @@ public class LiteLoaderTweaker implements ITweaker
 	/**
 	 * Do the second stage of loader startup
 	 */
-	public static void init()
+	private void onInit()
 	{
 		StartupState.INIT.gotoState();
 		try
 		{
-			LiteLoaderTweaker.instance.bootstrap.init(Launch.classLoader);
+			this.bootstrap.init();
 			StartupState.INIT.completed();
 		}
 		catch (Throwable th)
@@ -281,13 +361,13 @@ public class LiteLoaderTweaker implements ITweaker
 	/**
 	 * Do the second stage of loader startup
 	 */
-	public static void postInit()
+	private void onPostInit()
 	{
 		StartupState.POSTINIT.gotoState();
 		try
 		{
-			LiteLoaderTweaker.instance.bootstrap.postInit();
+			this.bootstrap.postInit();
 			StartupState.POSTINIT.completed();
 			StartupState.DONE.gotoState();
@@ -298,81 +378,25 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 	}
-	protected void initEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
+	/**
+	 * Set up the startup environment
+	 * 
+	 * @param args
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 * @param profile
+	 */
+	private void initEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		this.env = new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
-		{
-			@Override
-			public void registerCoreAPIs(List<String> apisToLoad)
-			{
-				apisToLoad.add(0, "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient");
-			}
-
-			@Override
-			public int getEnvironmentTypeId()
-			{
-				return LiteLoaderTweaker.ENV_TYPE_CLIENT;
-			}
-		};
+		this.env = this.spawnStartupEnvironment(args, gameDirectory, assetsDirectory, profile);
 		URL[] urls = Launch.classLoader.getURLs();
-		this.jarUrl = urls[urls.length - 1]; // probably?
-	}
-
-	@Override
-	public void injectIntoClassLoader(LaunchClassLoader classLoader)
-	{
-		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Obf");
-		classLoader.addClassLoaderExclusion("com.mumfrey.liteloader.core.runtime.Packets");
-
-		LiteLoaderTweaker.instance.transformerManager.injectUpstreamTransformers(classLoader);
-
-		for (String transformerClassName : this.bootstrap.getRequiredDownstreamTransformers())
-		{
-			LiteLoaderLogger.info("Queuing required class transformer '%s'", transformerClassName);
-			LiteLoaderTweaker.instance.transformerManager.injectTransformer(transformerClassName);
-		}
-	}
-	
-	@Override
-	public String getLaunchTarget()
-	{
-		this.isPrimary = true;
-		LiteLoaderTweaker.preBeginGame();
-		
-		return "net.minecraft.client.main.Main";
-	}
-
-	@Override
-	public String[] getLaunchArguments()
-	{
-		return this.env.getLaunchArguments();
-	}
-	
-	public static boolean addCascadedTweaker(String tweakClass, int priority)
-	{
-		return LiteLoaderTweaker.instance.addTweakToSortedList(tweakClass, priority);
-	}
-
-	private boolean addTweakToSortedList(String tweakClass, int priority)
-	{
-		if (tweakClass != null && !this.allCascadingTweaks.contains(tweakClass))
-		{
-			if (this.getClass().getName().equals(tweakClass))
-				return false;
-			
-			if (LiteLoaderTweaker.isTweakAlreadyEnqueued(tweakClass))
-				return false;
-			
-			this.allCascadingTweaks.add(tweakClass);
-			this.sortedCascadingTweaks.add(new SortableValue<String>(priority, this.tweakOrder++, tweakClass));
-			return true;
-		}
-		
-		return false;
+		LiteLoaderTweaker.jarUrl = urls[urls.length - 1]; // probably?
 	}
-	@SuppressWarnings("unchecked")
+	/**
+	 * Injects discovered tweak classes
+	 */
 	private void injectDiscoveredTweakClasses()
 	{
 		if (this.sortedCascadingTweaks.size() > 0)
@@ -385,7 +409,9 @@ public class LiteLoaderTweaker implements ITweaker
 			LiteLoaderLogger.info("Injecting cascaded tweakers...");
+			@SuppressWarnings("unchecked")
 			List<String> tweakClasses = (List<String>)Launch.blackboard.get("TweakClasses");
+			@SuppressWarnings("unchecked")
 			List<ITweaker> tweakers = (List<ITweaker>)Launch.blackboard.get("Tweaks");
 			if (tweakClasses != null && tweakers != null)
 			{
@@ -420,32 +446,37 @@ public class LiteLoaderTweaker implements ITweaker
 			tweakClasses.add(tweakClass);
 		}
 	}
-
+	
 	/**
-	 * @param url URL to add
+	 * @param tweakClass
+	 * @param priority
+	 * @return
 	 */
-	public static boolean addURLToParentClassLoader(URL url)
+	public boolean addCascadedTweaker(String tweakClass, int priority)
 	{
-		if (StartupState.getCurrent() == StartupState.PREINIT && StartupState.PREINIT.isInState())
+		if (tweakClass != null && !this.allCascadingTweaks.contains(tweakClass))
 		{
-			try
-			{
-				URLClassLoader classLoader = (URLClassLoader)Launch.class.getClassLoader();
-				Method mAddUrl = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
-				mAddUrl.setAccessible(true);
-				mAddUrl.invoke(classLoader, url);
-				
-				return true;
-			}
-			catch (Exception ex)
-			{
-				LiteLoaderLogger.warning(ex, "addURLToParentClassLoader failed: %s", ex.getMessage());
-			}
-		}
+			if (this.getClass().getName().equals(tweakClass))
+				return false;
+			if (LiteLoaderTweaker.isTweakAlreadyEnqueued(tweakClass))
+				return false;
+			
+			this.allCascadingTweaks.add(tweakClass);
+			this.sortedCascadingTweaks.add(new SortableValue<String>(priority, this.tweakOrder++, tweakClass));
+			return true;
+		}
+		
 		return false;
 	}
+	/**
+	 * The bootstrap object has to be spawned using reflection for obvious reasons, 
+	 * 
+	 * @param bootstrapClassName
+	 * @param classLoader
+	 * @return
+	 */
 	protected LoaderBootstrap spawnBootstrap(String bootstrapClassName, ClassLoader classLoader)
 	{
 		if (!StartupState.PREPARE.isInState())
@@ -464,27 +495,72 @@ public class LiteLoaderTweaker implements ITweaker
 		}
 		catch (Throwable th)
 		{
-			Throwables.propagate(th);
+			throw new RuntimeException(th);
 		}
-		
-		return null;
 	}
-	
-	public static URL getJarUrl()
+
+	/**
+	 * @param args
+	 * @param gameDirectory
+	 * @param assetsDirectory
+	 * @param profile
+	 * @return
+	 */
+	protected StartupEnvironment spawnStartupEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		return LiteLoaderTweaker.instance.jarUrl;
+		return new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
+		{
+			@Override
+			public void registerCoreAPIs(List<String> apisToLoad)
+			{
+				apisToLoad.add(0, "com.mumfrey.liteloader.client.api.LiteLoaderCoreAPIClient");
+			}
+
+			@Override
+			public int getEnvironmentTypeId()
+			{
+				return LiteLoaderTweaker.ENV_TYPE_CLIENT;
+			}
+		};
 	}
-	
-	public static boolean isPrimary()
+
+	/**
+	 * @return
+	 */
+	public static URL getJarUrl()
 	{
-		return LiteLoaderTweaker.instance.isPrimary;
+		return LiteLoaderTweaker.jarUrl;
 	}
-	public static ClassTransformerManager getTransformerManager()
+	/**
+	 * @param url URL to add
+	 */
+	public static boolean addURLToParentClassLoader(URL url)
 	{
-		return LiteLoaderTweaker.instance.transformerManager;
+		if (StartupState.getCurrent() == StartupState.PREINIT && StartupState.PREINIT.isInState())
+		{
+			try
+			{
+				URLClassLoader classLoader = (URLClassLoader)Launch.class.getClassLoader();
+				Method mAddUrl = URLClassLoader.class.getDeclaredMethod("addURL", URL.class);
+				mAddUrl.setAccessible(true);
+				mAddUrl.invoke(classLoader, url);
+				
+				return true;
+			}
+			catch (Exception ex)
+			{
+				LiteLoaderLogger.warning(ex, "addURLToParentClassLoader failed: %s", ex.getMessage());
+			}
+		}
+			
+		return false;
 	}
-	
+
+	/**
+	 * @param clazz
+	 * @return
+	 */
 	@SuppressWarnings("unchecked")
 	private static boolean isTweakAlreadyEnqueued(String clazz)
 	{
@@ -510,8 +586,36 @@ public class LiteLoaderTweaker implements ITweaker
 		return false;
 	}
+	/**
+	 * @return
+	 */
 	public static boolean loadingBarEnabled()
 	{
-		return LiteLoaderTweaker.instance.properties != null ? LiteLoaderTweaker.instance.properties.getBooleanProperty("loadingbar") : false; 
+		LoaderProperties properties = LiteLoaderTweaker.instance.bootstrap.getProperties();
+		return properties != null && properties.getBooleanProperty("loadingbar"); 
+	}
+
+	/**
+	 * Callback from the "Main" class, do the PREBEGINGAME steps (inject "downstream" transformers)
+	 */
+	public static void preBeginGame()
+	{
+		LiteLoaderTweaker.instance.onPreBeginGame();
+	}
+
+	/**
+	 * Callback from Minecraft::startGame() do early mod initialisation
+	 */
+	public static void init()
+	{
+		LiteLoaderTweaker.instance.onInit();
+	}
+
+	/**
+	 * Callback from Minecraft::startGame() do late mod initialisation
+	 */
+	public static void postInit()
+	{
+		LiteLoaderTweaker.instance.onPostInit();
 	}
 }
 \ No newline at end of file
 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 initEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
+	protected StartupEnvironment spawnStartupEnvironment(List<String> args, File gameDirectory, File assetsDirectory, String profile)
 	{
-		this.env = new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
+		return new StartupEnvironment(args, gameDirectory, assetsDirectory, profile)
 		{
 			@Override
 			public void registerCoreAPIs(List<String> apisToLoad)
@@ -25,9 +22,6 @@ public class LiteLoaderTweakerServer extends LiteLoaderTweaker
 				return LiteLoaderTweaker.ENV_TYPE_DEDICATEDSERVER;
 			}
 		};
-
-		URL[] urls = Launch.classLoader.getURLs();
-		this.jarUrl = urls[urls.length - 1]; // probably?
 	}
 	@Override
@@ -30,7 +30,7 @@ public interface LoaderBootstrap
 	/**
 	 * Init, create the loader instance and load mods
 	 */
-	public abstract void init(LaunchClassLoader classLoader);
+	public abstract void init();
 	/**
 	 * Post-init, initialise loaded mods
@@ -2,6 +2,8 @@ package com.mumfrey.liteloader.launch;
 import java.io.File;
+import net.minecraft.launchwrapper.ITweaker;
+
 import com.mumfrey.liteloader.api.manager.APIAdapter;
 import com.mumfrey.liteloader.api.manager.APIProvider;
 import com.mumfrey.liteloader.core.EnabledModsList;
@@ -73,4 +75,9 @@ public interface LoaderEnvironment extends GameEnvironment
 	 * @return
 	 */
 	public abstract File inflectVersionedConfigPath(LiteLoaderVersion version);
+	
+	/**
+	 * Get the tweaker 
+	 */
+	public abstract ITweaker getTweaker();
 }