LiteLoader 1.6.4_02 - experimental - allow mods to provide tweaks and transformers

Mumfrey
1 parent f5f17094
Showing 6 changed files with 395 additions and 137 deletions
java/com/mumfrey/liteloader/core/ClassPathMod.java
java/com/mumfrey/liteloader/core/LiteLoader.java
java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
java/com/mumfrey/liteloader/core/ModFile.java
java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
 package com.mumfrey.liteloader.core;
 import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
 import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import net.minecraft.launchwrapper.LaunchClassLoader;
+
+import com.google.common.base.Charsets;
+import com.google.common.io.Files;
 import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.resources.ModResourcePackDir;
@@ -17,39 +25,86 @@ public class ClassPathMod extends ModFile
 	private static final Logger logger = Logger.getLogger("liteloader");
-	ClassPathMod(File file, String name, String version)
+	ClassPathMod(File file, String fallbackName)
 	{
-		super(file, "");
+		super(file, ClassPathMod.getVersionMetaDataString(file));
-		this.modName = name;
-		this.version = version;
+		if (this.modName == null) this.modName = fallbackName;
+		if (this.targetVersion == null) this.targetVersion = LiteLoaderBootstrap.VERSION.getMinecraftVersion();
 	}
-
+	
 	@Override
-	protected void parseVersionFile(String strVersionData)
+	protected String getDefaultName()
 	{
-		// Nope
+		return null;
 	}
 	@Override
-	public boolean canRegisterAsResourcePack(String name)
+	public void initResourcePack(String name)
 	{
 		if (this.resourcePack == null)
 		{
 			if (this.isDirectory())
 			{
-				ClassPathMod.logger.info(String.format("Registering \"%s/%s\" as mod resource pack with identifier \"%s\"", this.getParentFile().getName(), this.getName(), name));
+				ClassPathMod.logger.info(String.format("Setting up \"%s/%s\" as mod resource pack with identifier \"%s\"", this.getParentFile().getName(), this.getName(), name));
 				this.resourcePack = new ModResourcePackDir(name, this);
 			}
 			else
 			{
-				ClassPathMod.logger.info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
+				ClassPathMod.logger.info(String.format("Setting up \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
 				this.resourcePack = new ModResourcePack(name, this);
 			}
-			
-			return true;
 		}
-		
+	}
+	
+	@Override
+	public boolean injectIntoClassPath(LaunchClassLoader classLoader, boolean injectIntoParent) throws MalformedURLException
+	{
+		// Can't inject a class path entry into the class path!
 		return false;
 	}
+	
+	@Override
+	public boolean isInjected()
+	{
+		return true;
+	}
+	
+	private static String getVersionMetaDataString(File file)
+	{
+		try
+		{
+			if (file.isDirectory())
+			{
+				File versionMetaFile = new File(file, "litemod.json");
+				if (versionMetaFile.exists())
+				{
+					return Files.toString(versionMetaFile, Charsets.UTF_8);
+				}
+			}
+			else
+			{
+				String strVersion = null;
+				ZipFile modZip = new ZipFile(file);
+				ZipEntry versionEntry = modZip.getEntry("litemod.json");
+				if (versionEntry != null)
+				{
+					try
+					{
+						strVersion = ModFile.zipEntryToString(modZip, versionEntry);
+					}
+					catch (IOException ex) {}
+				}
+				
+				modZip.close();
+				return strVersion;
+			}
+		}
+		catch (IOException ex)
+		{
+			ex.printStackTrace();
+		}
+		
+		return null;
+	}
 }
@@ -756,9 +756,11 @@ public final class LiteLoader
 						this.disabledMods.remove(modFile);
 						LiteLoader.logInfo("Adding \"%s\" to active resource pack set", modFile.getAbsolutePath());
-						if (modName != null && modFile.canRegisterAsResourcePack(modName))
+						if (modName != null)
 						{
-							if (this.registerModResourcePack((ResourcePack)modFile.getResourcePack()))
+							modFile.initResourcePack(modName);
+							
+							if (modFile.hasResourcePack() && this.registerModResourcePack((ResourcePack)modFile.getResourcePack()))
 							{
 								LiteLoader.logInfo("Successfully added \"%s\" to active resource pack set", modFile.getAbsolutePath());
 							}
@@ -1060,9 +1062,16 @@ public final class LiteLoader
 		LiteLoader.logger.warning(String.format(string, args));
 	}
-	public static void populateCrashReport(CrashReport crashReport)
+	/**
+	 * @param objCrashReport This is an object so that we don't need to transform the obfuscated name in the transformer
+	 */
+	public static void populateCrashReport(Object objCrashReport)
 	{
-		crashReport.getCategory().addCrashSectionCallable("Mod Pack",        new CallableLiteLoaderBrand(crashReport));
-		crashReport.getCategory().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(crashReport));
+		if (objCrashReport instanceof CrashReport)
+		{
+			CrashReport crashReport = (CrashReport)objCrashReport;
+			crashReport.getCategory().addCrashSectionCallable("Mod Pack",        new CallableLiteLoaderBrand(crashReport));
+			crashReport.getCategory().addCrashSectionCallable("LiteLoader Mods", new CallableLiteLoaderMods(crashReport));
+		}
 	}
 }
 \ No newline at end of file
@@ -148,7 +148,7 @@ class LiteLoaderBootstrap implements ILoaderBootstrap
 		LiteLoaderBootstrap.logInfo("Java reports OS=\"%s\"", System.getProperty("os.name").toLowerCase());
 		this.enumerator = new LiteLoaderEnumerator(this, classLoader, loadTweaks);
-		this.enumerator.discoverModFiles();
+		this.enumerator.discoverMods();
 		LiteLoaderBootstrap.logInfo("LiteLoader PreInit completed");
 	}
 package com.mumfrey.liteloader.core;
-import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
@@ -70,6 +67,11 @@ class LiteLoaderEnumerator implements FilenameFilter
 	private final LaunchClassLoader classLoader;
 	/**
+	 * Array of class path entries specified to the JVM instance 
+	 */
+	private final String[] classPathEntries;
+
+	/**
 	 * Classes to load, mapped by class name 
 	 */
 	private final Map<String, Class<? extends LiteMod>> modsToLoad = new HashMap<String, Class<? extends LiteMod>>();
@@ -102,7 +104,7 @@ class LiteLoaderEnumerator implements FilenameFilter
 	private boolean searchModsFolder = true;
 	private boolean searchProtectionDomain = true;
 	private boolean searchClassPath = true;
-
+	
 	/**
 	 * @param properties
 	 * @param gameFolder
@@ -114,6 +116,9 @@ class LiteLoaderEnumerator implements FilenameFilter
 		this.bootstrap   = bootstrap;
 		this.classLoader = classLoader;
 		this.loadTweaks  = loadTweaks;
+
+		// Read the JVM class path into the local array
+		this.classPathEntries = this.readClassPath();
 		// Read the discovery settings from the properties 
 		this.readSettings();
@@ -218,8 +223,13 @@ class LiteLoaderEnumerator implements FilenameFilter
 	/**
 	 * Enumerate the "mods" folder to find mod files
 	 */
-	protected void discoverModFiles()
+	protected void discoverMods()
 	{
+		if (this.searchClassPath)
+		{
+			this.findTweaksInClassPath();
+		}
+		
 		if (this.searchModsFolder)
 		{
 			// Find and enumerate the "mods" folder
@@ -249,13 +259,10 @@ class LiteLoaderEnumerator implements FilenameFilter
 		try
 		{
 			// Inject mod files discovered earlier into the class loader
-			this.injectIntoClassPath();
-			
-			// Split the environment classpath into entries
-			String[] classPathEntries = this.readClassPath();
+			this.injectDiscoveredModFiles();
 			// then search through all sources to find mod classes
-			this.findModClasses(classPathEntries);
+			this.findModClasses();
 		}
 		catch (Throwable th)
 		{
@@ -267,7 +274,7 @@ class LiteLoaderEnumerator implements FilenameFilter
 	/**
 	 * Injects all external mod files into the launch classloader's class path
 	 */
-	private void injectIntoClassPath()
+	private void injectDiscoveredModFiles()
 	{
 		LiteLoaderEnumerator.logInfo("Injecting external mods into class path...");
@@ -275,10 +282,12 @@ class LiteLoaderEnumerator implements FilenameFilter
 		{
 			try
 			{
-				LiteLoaderEnumerator.logInfo("Injecting mod file '%s' into classpath", file.getAbsolutePath());
-				this.classLoader.addURL(file.toURI().toURL());
+				if (file.injectIntoClassPath(this.classLoader, false))
+				{
+					LiteLoaderEnumerator.logInfo("Successfully injected mod file '%s' into classpath", file.getAbsolutePath());
+				}
 			}
-			catch (Exception ex)
+			catch (MalformedURLException ex)
 			{
 				LiteLoaderEnumerator.logWarning("Error injecting '%s' into classPath. The mod will not be loaded", file.getAbsolutePath());
 			}
@@ -302,6 +311,25 @@ class LiteLoaderEnumerator implements FilenameFilter
 	}
 	/**
+	 * Search class path entries for mod class path entries which contain tweaks, mainly for dev environment purposes
+	 */
+	private void findTweaksInClassPath()
+	{
+		LiteLoaderEnumerator.logInfo("Discovering tweaks on class path...");
+
+		for (String classPathPart : this.classPathEntries)
+		{
+			File packagePath = new File(classPathPart);
+			ClassPathMod classPathMod = new ClassPathMod(packagePath, null);
+			
+			if (classPathMod.hasTweakClass() || classPathMod.hasClassTransformer())
+			{
+				this.addTweaksFromMod(classPathMod);
+			}
+		}
+	}
+	
+	/**
 	 * For FilenameFilter interface
 	 * 
 	 * @see java.io.FilenameFilter#accept(java.io.File, java.lang.String)
@@ -336,7 +364,15 @@ class LiteLoaderEnumerator implements FilenameFilter
 				// Check for a version file
 				if (versionEntry != null)
 				{
-					String strVersion = this.readVersion(modZip, versionEntry);
+					String strVersion = null;
+					try
+					{
+						strVersion = ModFile.zipEntryToString(modZip, versionEntry);
+					}
+					catch (IOException ex)
+					{
+						LiteLoaderEnumerator.logWarning("Error reading version data from %s", modZip.getName());
+					}
 					if (strVersion != null)
 					{
@@ -369,14 +405,13 @@ class LiteLoaderEnumerator implements FilenameFilter
 				}
 				else if (isVersionedModFolder && this.loadTweaks && this.readJarFiles && modFile.getName().toLowerCase().endsWith(".jar"))
 				{
-					this.addTweaksFrom(modFile);
+					this.addTweaksFromJar(modFile);
 				}
 				modZip.close();
 			}
 			catch (Exception ex)
 			{
-				ex.printStackTrace(System.err);
 				LiteLoaderEnumerator.logInfo("Error enumerating '%s': Invalid zip file or error reading file", modFile.getAbsolutePath());
 			}
 		}
@@ -393,8 +428,7 @@ class LiteLoaderEnumerator implements FilenameFilter
 			{
 				try
 				{
-					this.addTweaksFrom(newestVersion);
-
+					this.addTweaksFromMod(newestVersion);
 				}
 				catch (Throwable th)
 				{
@@ -403,81 +437,51 @@ class LiteLoaderEnumerator implements FilenameFilter
 			}
 		}
 	}
-
-	/**
-	 * @param strVersion
-	 * @param modZip
-	 * @param versionEntry
-	 * @return
-	 * @throws IOException
-	 */
-	public String readVersion(ZipFile modZip, ZipEntry versionEntry) throws IOException
+	
+	private void addTweaksFromMod(ModFile modFile)
 	{
-		String strVersion = null;
-		BufferedReader versionReader = null; 
-		StringBuilder versionBuilder = new StringBuilder();
-		
-		try
+		if (modFile.hasTweakClass())
 		{
-			// Read the version string
-			InputStream versionStream = modZip.getInputStream(versionEntry);
-			versionReader = new BufferedReader(new InputStreamReader(versionStream));
-
-			String versionFileLine;
-			while ((versionFileLine = versionReader.readLine()) != null)
-				versionBuilder.append(versionFileLine);
-			
-			strVersion = versionBuilder.toString();
+			this.addTweakFrom(modFile, modFile.getTweakClassName(), null);
 		}
-		catch (Exception ex)
+		else if (modFile.isFile())
 		{
-			LiteLoaderEnumerator.logWarning("Error reading version data from %s", modZip.getName());
+			this.addTweaksFromJar(modFile);
 		}
-		finally
+		
+		if (modFile.hasClassTransformer())
 		{
-			if (versionReader != null) versionReader.close();
+			this.addClassTransformerFrom(modFile, modFile.getClassTransformerClassName());
 		}
-		return strVersion;
 	}
 	/**
 	 * @param jarFile
 	 * @throws IOException
 	 */
-	private void addTweaksFrom(File jarFile)
+	private void addTweaksFromJar(File jarFile)
 	{
 		JarFile jar = null;
-		LiteLoaderEnumerator.logInfo("Searching for tweaks in '%s'", jarFile.getName());
 		try
 		{
 			jar = new JarFile(jarFile);
-			Attributes manifestAttributes = jar.getManifest().getMainAttributes();
-			
-			String tweakClass = manifestAttributes.getValue("TweakClass");
-			if (tweakClass != null)
+			if (jar.getManifest() != null)
 			{
-				LiteLoaderEnumerator.logInfo("Mod file '%s' provides tweakClass '%s', adding to Launch queue", jarFile.getName(), tweakClass);
+				LiteLoaderEnumerator.logInfo("Searching for tweaks in '%s'", jarFile.getName());
+				Attributes manifestAttributes = jar.getManifest().getMainAttributes();
-				if (LiteLoaderTweaker.addTweaker(jarFile.toURI().toURL(), tweakClass))
+				String tweakClass = manifestAttributes.getValue("TweakClass");
+				if (tweakClass != null)
 				{
-					LiteLoaderEnumerator.logInfo("tweakClass '%s' was successfully added", tweakClass);
-					this.classLoader.addURL(jarFile.toURI().toURL());
-				}
-			}
-			
-			String classPath = manifestAttributes.getValue("Class-Path");
-			if (classPath != null)
-			{
-				String[] classPathEntries = classPath.split(" ");
-				for (String classPathEntry : classPathEntries)
-				{
-					File classPathJar = new File(this.bootstrap.getGameDirectory(), classPathEntry);
-					URL jarUrl = classPathJar.toURI().toURL();
+					String[] classPathEntries = null;
+					String classPath = manifestAttributes.getValue("Class-Path");
+					if (classPath != null)
+					{
+						classPathEntries = classPath.split(" ");
+					}
-					LiteLoaderEnumerator.logInfo("Adding Class-Path entry: %s", classPathEntry); 
-					LiteLoaderTweaker.addURLToParentClassLoader(jarUrl);
-					this.classLoader.addURL(jarUrl);
+					this.addTweakFrom(jarFile, tweakClass, classPathEntries);
 				}
 			}
 		}
@@ -494,12 +498,78 @@ class LiteLoaderEnumerator implements FilenameFilter
 			catch (IOException ex) {}
 		}
 	}
+	
+	private void addTweakFrom(File jarFile, String tweakClass, String[] classPathEntries)
+	{
+		try
+		{
+			LiteLoaderEnumerator.logInfo("Mod file '%s' provides tweakClass '%s', adding to Launch queue", jarFile.getName(), tweakClass);
+			if (LiteLoaderTweaker.addTweaker(tweakClass))
+			{
+				LiteLoaderEnumerator.logInfo("tweakClass '%s' was successfully added", tweakClass);
+				this.injectIntoClassLoader(jarFile);
+				
+				if (classPathEntries != null)
+				{
+					for (String classPathEntry : classPathEntries)
+					{
+						try
+						{
+							File classPathJar = new File(this.bootstrap.getGameDirectory(), classPathEntry);
+							URL classPathJarUrl = classPathJar.toURI().toURL();
+							
+							LiteLoaderEnumerator.logInfo("Adding Class-Path entry: %s", classPathEntry); 
+							LiteLoaderTweaker.addURLToParentClassLoader(classPathJarUrl);
+							this.classLoader.addURL(classPathJarUrl);
+						}
+						catch (MalformedURLException ex) {}
+					}
+				}
+			}
+		}
+		catch (MalformedURLException ex)
+		{
+		}
+	}
+	private void addClassTransformerFrom(File jarFile, String classTransformerClass)
+	{
+		try
+		{
+			LiteLoaderEnumerator.logInfo("Mod file '%s' provides classTransformer '%s', adding to class loader", jarFile.getName(), classTransformerClass);
+			if (LiteLoaderTweaker.addClassTransformer(classTransformerClass))
+			{
+				LiteLoaderEnumerator.logInfo("classTransformer '%s' was successfully added", classTransformerClass);
+				this.injectIntoClassLoader(jarFile);
+			}
+		}
+		catch (MalformedURLException ex)
+		{
+		}
+	}
+	
+	/**
+	 * @param jarFile
+	 * @throws MalformedURLException
+	 */
+	private void injectIntoClassLoader(File jarFile) throws MalformedURLException
+	{
+		if (jarFile instanceof ModFile)
+		{
+			((ModFile)jarFile).injectIntoClassPath(this.classLoader, true);
+		}
+		else
+		{
+			LiteLoaderTweaker.addURLToParentClassLoader(jarFile.toURI().toURL());
+			this.classLoader.addURL(jarFile.toURI().toURL());
+		}
+	}
+	
 	/**
 	 * Find mod classes in the class path and enumerated mod files list
 	 * @param classPathEntries Java class path split into string entries
 	 */
-	private void findModClasses(String[] classPathEntries)
+	private void findModClasses()
 	{
 		if (this.searchProtectionDomain || this.searchClassPath)
 			LiteLoaderEnumerator.logInfo("Discovering mods on class path...");
@@ -519,7 +589,7 @@ class LiteLoaderEnumerator implements FilenameFilter
 		if (this.searchClassPath)
 		{
 			// Search through the class path and find mod classes
-			this.findModsInClassPath(classPathEntries);
+			this.findModsInClassPath();
 		}
 		// Search through mod files and find mod classes
@@ -582,14 +652,10 @@ class LiteLoaderEnumerator implements FilenameFilter
 		}
 	}
-	/**
-	 * @param classPathEntries
-	 * @param modsToLoad
-	 */
 	@SuppressWarnings("unchecked")
-	private void findModsInClassPath(String[] classPathEntries)
+	private void findModsInClassPath()
 	{
-		for (String classPathPart : classPathEntries)
+		for (String classPathPart : this.classPathEntries)
 		{
 			LiteLoaderEnumerator.logInfo("Searching %s...", classPathPart);
@@ -604,7 +670,7 @@ class LiteLoaderEnumerator implements FilenameFilter
 				}
 				this.modsToLoad.put(mod.getSimpleName(), (Class<? extends LiteMod>)mod);
-				this.modFiles.put(mod.getSimpleName(), new ClassPathMod(packagePath, mod.getSimpleName().substring(7), LiteLoaderBootstrap.VERSION.getLoaderVersion()));
+				this.modFiles.put(mod.getSimpleName(), new ClassPathMod(packagePath, mod.getSimpleName().substring(7).toLowerCase()));
 			}
 			if (modClasses.size() > 0)
 package com.mumfrey.liteloader.core;
+import java.io.BufferedReader;
 import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import net.minecraft.launchwrapper.LaunchClassLoader;
+import joptsimple.internal.Strings;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
+import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
 import com.mumfrey.liteloader.resources.ModResourcePack;
 /**
@@ -33,11 +44,6 @@ public class ModFile extends File
 	protected boolean valid = false;
 	/**
-	 * True if parsed from JSON, false if fallback mode using legacy version.txt
-	 */
-//	protected boolean json = false;
-	
-	/**
 	 * Name of the mod specified in the JSON file, this can be any string but should be the same between mod versions
 	 */
 	protected String modName;
@@ -45,7 +51,17 @@ public class ModFile extends File
 	/**
 	 * Loader version
 	 */
-	protected String version;
+	protected String targetVersion;
+	
+	/**
+	 * Name of the tweak class
+	 */
+	protected String tweakClassName;
+	
+	/**
+	 * Name of the class transof
+	 */
+	protected String classTransformerClassName;
 	/**
 	 * File time stamp, used as sorting criteria when no revision information is found
@@ -70,7 +86,12 @@ public class ModFile extends File
 	/**
 	 * ALL of the parsed metadata from the file, associated with the mod later on for retrieval via the loader
 	 */
-	protected HashMap<String, String> metaData = new HashMap<String, String>();
+	protected Map<String, String> metaData = new HashMap<String, String>();
+
+	/**
+	 * True once this file has been injected into the class path 
+	 */
+	private boolean injected;
 	/**
 	 * @param file
@@ -81,29 +102,29 @@ public class ModFile extends File
 		super(file.getAbsolutePath());
 		this.timeStamp = this.lastModified();
-		
 		this.parseVersionFile(strVersion);
 	}
 	@SuppressWarnings("unchecked")
 	protected void parseVersionFile(String strVersionData)
 	{
+		if (Strings.isNullOrEmpty(strVersionData)) return;
+		
 		try
 		{
 			this.metaData = ModFile.gson.fromJson(strVersionData, HashMap.class);
 		}
 		catch (JsonSyntaxException jsx)
 		{
-			ModFile.logger.warning("Error reading litemod.json in " + this.getName() + ", JSON syntax exception: " + jsx.getMessage());
+			ModFile.logger.warning("Error reading litemod.json in " + this.getAbsolutePath() + ", JSON syntax exception: " + jsx.getMessage());
 			return;
 		}
 		this.modName = this.metaData.get("name");
-		
-		this.version = this.metaData.get("mcversion");
-		if (this.version == null)
+		this.targetVersion = this.metaData.get("mcversion");
+		if (this.targetVersion == null)
 		{
-			ModFile.logger.warning("Mod in " + this.getName() + " has no loader version number reading litemod.json");
+			ModFile.logger.warning("Mod in " + this.getAbsolutePath() + " has no loader version number reading litemod.json");
 			return;
 		}
@@ -112,17 +133,26 @@ public class ModFile extends File
 			this.revision = Float.parseFloat(this.metaData.get("revision"));
 			this.hasRevision = true;
 		}
+		catch (NullPointerException ex) {}
 		catch (Exception ex)
 		{
-			ModFile.logger.warning("Mod in " + this.getName() + " has an invalid revision number reading litemod.json");
+			ModFile.logger.warning("Mod in " + this.getAbsolutePath() + " has an invalid revision number reading litemod.json");
 		}
 		this.valid = true;
 		if (this.modName == null)
 		{
-			this.modName = this.getName().replaceAll("[^a-zA-Z]", "");
+			this.modName = this.getDefaultName();
 		}
+		
+		this.tweakClassName = this.metaData.get("tweakClass");
+		this.classTransformerClassName = this.metaData.get("classTransformerClass");
+	}
+
+	protected String getDefaultName()
+	{
+		return this.getName().replaceAll("[^a-zA-Z]", "");
 	}
 	public String getModName()
@@ -137,7 +167,7 @@ public class ModFile extends File
 	public String getVersion()
 	{
-		return this.version;
+		return this.targetVersion;
 	}
 	public float getRevision()
@@ -155,6 +185,48 @@ public class ModFile extends File
 		return this.metaData;
 	}
+	public boolean hasTweakClass()
+	{
+		return this.tweakClassName != null;
+	}
+	
+	public String getTweakClassName()
+	{
+		return this.tweakClassName;
+	}
+	
+	public boolean hasClassTransformer()
+	{
+		return this.classTransformerClassName != null;
+	}
+	
+	public String getClassTransformerClassName()
+	{
+		return this.classTransformerClassName;
+	}
+	
+	public boolean isInjected()
+	{
+		return this.injected;
+	}
+	
+	public boolean injectIntoClassPath(LaunchClassLoader classLoader, boolean injectIntoParent) throws MalformedURLException
+	{
+		if (!this.injected)
+		{
+			if (injectIntoParent)
+			{
+				LiteLoaderTweaker.addURLToParentClassLoader(this.toURI().toURL());
+			}
+			
+			classLoader.addURL(this.toURI().toURL());
+			this.injected = true;
+			return true;
+		}
+		
+		return false;
+	}
+	
 	@SuppressWarnings("unchecked")
 	public <T> T getResourcePack()
 	{
@@ -162,21 +234,28 @@ public class ModFile extends File
 	}
 	/**
-	 * Registers this file as a minecraft resource pack 
+	 * Initialise the mod resource pack
 	 * 
 	 * @param name
-	 * @return true if the pack was added
 	 */
-	public boolean canRegisterAsResourcePack(String name)
+	public void initResourcePack(String name)
 	{
 		if (this.resourcePack == null)
 		{
-			ModFile.logger.info(String.format("Registering \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
+			ModFile.logger.info(String.format("Setting up \"%s\" as mod resource pack with identifier \"%s\"", this.getName(), name));
 			this.resourcePack = new ModResourcePack(name, this);
-			return true;
 		}
-		
-		return false;
+	}
+	
+	/**
+	 * Registers this file as a minecraft resource pack 
+	 * 
+	 * @param name
+	 * @return true if the pack was added
+	 */
+	public boolean hasResourcePack()
+	{
+		return (this.resourcePack != null);
 	}
 	@Override
@@ -201,4 +280,33 @@ public class ModFile extends File
 		// Give up and use timestamp
 		return (int)(otherMod.timeStamp - this.timeStamp);
 	}
+
+
+	/**
+	 * @param zip
+	 * @param entry
+	 * @return
+	 * @throws IOException
+	 */
+	public static String zipEntryToString(ZipFile zip, ZipEntry entry) throws IOException
+	{
+		BufferedReader reader = null; 
+		StringBuilder sb = new StringBuilder();
+		
+		try
+		{
+			InputStream stream = zip.getInputStream(entry);
+			reader = new BufferedReader(new InputStreamReader(stream));
+
+			String versionFileLine;
+			while ((versionFileLine = reader.readLine()) != null)
+				sb.append(versionFileLine);
+		}
+		finally
+		{
+			if (reader != null) reader.close();
+		}
+		
+		return sb.toString();
+	}
 }
@@ -8,9 +8,11 @@ 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.logging.Level;
 import java.util.logging.Logger;
@@ -48,6 +50,8 @@ public class LiteLoaderTweaker implements ITweaker
 	private static ILoaderBootstrap bootstrap;
+	private static Set<String> modTransformers = new HashSet<String>();
+	
 	private List<String> singularLaunchArgs = new ArrayList<String>();
 	private Map<String, String> launchArgs;
@@ -145,8 +149,16 @@ public class LiteLoaderTweaker implements ITweaker
 	@Override
 	public void injectIntoClassLoader(LaunchClassLoader classLoader)
 	{
-		LiteLoaderTweaker.logger.info("Injecting LiteLoader Class Transformer");
+		LiteLoaderTweaker.logger.info("Injecting LiteLoader class transformer");
 		classLoader.registerTransformer(LiteLoaderTransformer.class.getName());
+		
+		for (String transformerClassName : LiteLoaderTweaker.modTransformers)
+		{
+			LiteLoaderTweaker.logger.info(String.format("Injecting additional class transformer class '%s'", transformerClassName));
+			classLoader.registerTransformer(transformerClassName);
+		}
+		
+		LiteLoaderTweaker.modTransformers.clear();
 	}
 	@Override
@@ -175,29 +187,37 @@ public class LiteLoaderTweaker implements ITweaker
 		return args.toArray(new String[args.size()]);
 	}
-	public static boolean addTweaker(URL tweakSource, String tweakClass)
+	@SuppressWarnings("unchecked")
+	public static boolean addTweaker(String tweakClass)
 	{
-		if (LiteLoaderTweaker.preInit)
+		if (!LiteLoaderTweaker.preInit)
 		{
-			@SuppressWarnings("unchecked")
-			List<String> tweakers = (List<String>)Launch.blackboard.get("TweakClasses");
-			if (tweakers != null)
-			{
-				if (LiteLoaderTweaker.addURLToParentClassLoader(tweakSource))
-				{
-					tweakers.add(tweakClass);
-					return true;
-				}
-			}
+			LiteLoaderTweaker.logger.warning(String.format("Failed to add tweak class %s because preInit is already complete", tweakClass));
+			return false;
 		}
-		else
+		
+		List<String> tweakers = (List<String>)Launch.blackboard.get("TweakClasses");
+		if (tweakers != null)
 		{
-			LiteLoaderTweaker.logger.warning(String.format("Failed to add tweak class %s from %s because preInit is already complete", tweakClass, tweakSource));
+			tweakers.add(tweakClass);
+			return true;
 		}
 		return false;
 	}
+	public static boolean addClassTransformer(String transfomerClass)
+	{
+		if (!LiteLoaderTweaker.preInit)
+		{
+			LiteLoaderTweaker.logger.warning(String.format("Failed to add transformer class %s because preInit is already complete", transfomerClass));
+			return false;
+		}
+			
+		LiteLoaderTweaker.modTransformers.add(transfomerClass);
+		return true;
+	}
+	
 	/**
 	 * @param url URL to add
 	 */