updating enumeration, adding support for "ModType" META entry, removing support …

…for .zip, code cleanup

updating enumeration, adding support for "ModType" META entry, removing support …
…for .zip, code cleanup
Mumfrey
1 parent d634cd86
Showing 8 changed files with 326 additions and 304 deletions
java/common/com/mumfrey/liteloader/core/api/EnumeratorModuleFolder.java
java/common/com/mumfrey/liteloader/core/api/EnumeratorModuleProtectionDomain.java
java/common/com/mumfrey/liteloader/core/api/LiteLoaderCoreAPI.java
java/common/com/mumfrey/liteloader/core/api/LoadableModClassPath.java
java/common/com/mumfrey/liteloader/core/api/LoadableModFile.java
java/common/com/mumfrey/liteloader/interfaces/LoadableFile.java
java/common/com/mumfrey/liteloader/interfaces/LoadableMod.java
java/common/com/mumfrey/liteloader/launch/LoaderProperties.java
@@ -2,19 +2,18 @@ package com.mumfrey.liteloader.core.api;
 import java.io.File;
 import java.io.FilenameFilter;
-import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
 import java.util.Map.Entry;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import java.util.Set;
+import java.util.TreeSet;
 import net.minecraft.launchwrapper.LaunchClassLoader;
+import com.google.common.base.Charsets;
 import com.mumfrey.liteloader.api.EnumeratorModule;
 import com.mumfrey.liteloader.common.LoadingProgress;
 import com.mumfrey.liteloader.core.LiteLoaderVersion;
@@ -47,27 +46,25 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	protected File directory;
-	protected boolean readZipFiles;
 	protected boolean readJarFiles;
 	protected boolean loadTweaks;
 	/**
-	 * True if this is a general, unversioned folder and the enumerator should only add files which have valid version metadata
+	 * True if this is a versioned folder and the enumerator should also try to load tweak jars which would normally be ignored
 	 */
-	private final boolean requireMetaData;
+	protected final boolean loadTweakJars;
-	public EnumeratorModuleFolder(LiteLoaderCoreAPI coreAPI, File directory, boolean requireMetaData)
+	public EnumeratorModuleFolder(LiteLoaderCoreAPI coreAPI, File directory, boolean loadTweakJars)
 	{
 		this.coreAPI         = coreAPI;
 		this.directory       = directory;
-		this.requireMetaData = requireMetaData;
+		this.loadTweakJars   = loadTweakJars;
 	}
 	@Override
 	public void init(LoaderEnvironment environment, LoaderProperties properties)
 	{
 		this.loadTweaks = properties.loadTweaksEnabled();
-		this.readZipFiles = properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_ZIPFILES, false);
 		this.readJarFiles = properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_JARFILES, true);
 		this.coreAPI.writeDiscoverySettings();
@@ -79,7 +76,6 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	@Override
 	public void writeSettings(LoaderEnvironment environment, LoaderProperties properties)
 	{
-		properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_ZIPFILES, this.readZipFiles);
 		properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_JARFILES, this.readJarFiles);
 	}
@@ -118,14 +114,12 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 	{
 		fileName = fileName.toLowerCase();
-		if (fileName.endsWith(".litemod.zip") && !this.readZipFiles)
+		if (fileName.endsWith(".litemod.zip"))
 		{
 			LiteLoaderLogger.warning("Found %s with unsupported extension .litemod.zip. Please change file extension to .litemod to allow this file to be loaded!", fileName);
 		}
-		return                       fileName.endsWith(".litemod")
-			|| (this.readZipFiles && fileName.endsWith(".zip"))
-			|| (this.readJarFiles && fileName.endsWith(".jar"));
+		return fileName.endsWith(".litemod") || fileName.endsWith(".jar");
 	}
 	/* (non-Javadoc)
@@ -139,97 +133,137 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 			LiteLoaderLogger.info("Discovering valid mod files in folder %s", this.directory.getPath());
 			this.findValidFiles(enumerator);
-			this.sortAndAllocateFiles(enumerator);
-			this.versionOrderingSets.clear();
+			this.sortAndRegisterFiles(enumerator);
 		}
 	}
 	/**
+	 * Search the folder for (potentially) valid files
 	 */
 	private void findValidFiles(ModularEnumerator enumerator)
 	{
-		for (File candidateFile : this.directory.listFiles(this.getFilenameFilter()))
+		for (File file : this.directory.listFiles(this.getFilenameFilter()))
 		{
-			ZipFile candidateZip = null;
-			
+			LoadableFile candidateFile = new LoadableFile(file);
 			try
 			{
-				candidateZip = new ZipFile(candidateFile);
-				ZipEntry versionEntry = candidateZip.getEntry(LoadableMod.METADATA_FILENAME);
-				ZipEntry legacyVersionEntry = candidateZip.getEntry(LoadableMod.LEGACY_METADATA_FILENAME);
-
-				// Check for a version file
-				if (versionEntry != null)
-				{
-					String strVersion = null;
-					try
-					{
-						strVersion = LoadableModFile.zipEntryToString(candidateZip, versionEntry);
-					}
-					catch (IOException ex)
-					{
-						LiteLoaderLogger.warning("Error reading version data from %s", candidateZip.getName());
-					}
-					
-					if (strVersion != null)
-					{
-						this.addModFile(candidateFile, strVersion);
-					}
-				}
-				else if (legacyVersionEntry != null)
-				{
-					LiteLoaderLogger.warning("%s is no longer supported, ignoring outdated mod file: %s", LoadableMod.LEGACY_METADATA_FILENAME, candidateFile.getAbsolutePath());
-				}
-				else if (!this.requireMetaData && this.loadTweaks && this.readJarFiles && candidateFile.getName().toLowerCase().endsWith(".jar"))
-				{
-					LoadableFile container = new LoadableFile(candidateFile);
-					enumerator.registerTweakContainer(container);
-				}
+				this.inspectFile(enumerator, candidateFile);
 			}
 			catch (Exception ex)
 			{
-				LiteLoaderLogger.info("Error enumerating '%s': Invalid zip file or error reading file", candidateFile.getAbsolutePath());
+				LiteLoaderLogger.warning(ex, "An error occurred whilst inspecting %s", candidateFile);
+			}
+		}
+	}
+
+	/**
+	 * Check whether a particular file is valid, and add it to the candiates list if it appears to be acceptable
+	 * 
+	 * @param enumerator
+	 * @param candidateFile
+	 */
+	protected void inspectFile(ModularEnumerator enumerator, LoadableFile candidateFile)
+	{
+		if (this.isValidFile(candidateFile))
+		{
+			String metaData = candidateFile.getFileContents(LoadableMod.METADATA_FILENAME, Charsets.UTF_8);
+			if (metaData != null)
+			{
+				LoadableMod<File> modFile = this.getModFile(candidateFile, metaData);
+				this.addModFile(enumerator, modFile);
+				return;
 			}
-			finally
+			else if (this.isValidTweakContainer(candidateFile))
 			{
-				if (candidateZip != null)
-				{
-					try
-					{
-						candidateZip.close();
-					}
-					catch (IOException ex) {}
-				}
+				TweakContainer<File> container = this.getTweakFile(candidateFile);
+				this.addTweakFile(enumerator, container);
+				return;
+			}
+			else
+			{
+				LiteLoaderLogger.info("Ignoring %s", candidateFile);
 			}
 		}
 	}
 	/**
+	 * Check whether the specified file is a valid mod container
+	 * 
+	 * @param candidateFile
+	 */
+	protected boolean isValidFile(LoadableFile candidateFile)
+	{
+		String filename = candidateFile.getName().toLowerCase();
+		if (filename.endsWith(".litemod"))
+		{
+			return true;
+		}
+		else if (filename.endsWith(".jar"))
+		{
+			Set<String> modSystems = candidateFile.getModSystems();
+			boolean hasLiteLoader = modSystems.contains("LiteLoader");
+			if (modSystems.size() > 0)
+			{
+				LiteLoaderLogger.info("%s supports mod systems %s", candidateFile, modSystems);
+				if (!hasLiteLoader) return false;
+			}
+			
+			return this.loadTweakJars || this.readJarFiles || hasLiteLoader;
+		}
+		
+		return false;
+	}
+
+	/**
+	 * Called only if the file is not a valid mod container (has no mod metadata) to check whether it
+	 * could instead be a potential tweak container
+	 * 
+	 * @param candidateFile
+	 */
+	protected boolean isValidTweakContainer(LoadableFile candidateFile)
+	{
+		return this.loadTweakJars && this.loadTweaks && candidateFile.getName().toLowerCase().endsWith(".jar");
+	}
+
+	/**
 	 * Get the {@link FilenameFilter} to use to filter candidate files
 	 */
 	protected FilenameFilter getFilenameFilter()
 	{
-		// Stub for subclasses
 		return this;
 	}
 	/**
 	 * @param modFile
 	 */
-	protected boolean isFileSupported(LoadableModFile modFile)
+	protected boolean isFileSupported(LoadableMod<File> modFile)
 	{
-		// Stub for subclasses
 		return LiteLoaderVersion.CURRENT.isVersionSupported(modFile.getTargetVersion());
 	}
 	/**
 	 * @param candidateFile
-	 * @param strVersion
+	 * @param metaData
 	 */
-	protected void addModFile(File candidateFile, String strVersion)
+	protected LoadableMod<File> getModFile(LoadableFile candidateFile, String metaData)
+	{
+		return new LoadableModFile(candidateFile, metaData);
+	}
+
+	/**
+	 * @param candidateFile
+	 */
+	protected TweakContainer<File> getTweakFile(LoadableFile candidateFile)
+	{
+		return candidateFile;
+	}
+
+	/**
+	 * @param enumerator 
+	 * @param modFile
+	 */
+	protected void addModFile(ModularEnumerator enumerator, LoadableMod<File> modFile)
 	{
-		LoadableModFile modFile = new LoadableModFile(candidateFile, strVersion);
-		
 		if (modFile.hasValidMetaData())
 		{
 			// Only add the mod if the version matches, we add candidates to the versionOrderingSets in
@@ -241,51 +275,70 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 					this.versionOrderingSets.put(modFile.getModName(), new TreeSet<LoadableMod<File>>());
 				}
-				LiteLoaderLogger.info("Considering valid mod file: %s", modFile.getAbsolutePath());
+				LiteLoaderLogger.info("Considering valid mod file: %s", modFile);
 				this.versionOrderingSets.get(modFile.getModName()).add(modFile);
 			}
 			else
 			{
-				LiteLoaderLogger.info("Not adding invalid or outdated mod file: %s", candidateFile.getAbsolutePath());
+				LiteLoaderLogger.info("Not adding invalid or version-mismatched mod file: %s", modFile);
 			}
 		}
 	}
 	/**
+	 * @param enumerator
+	 * @param container
+	 */
+	protected void addTweakFile(ModularEnumerator enumerator, TweakContainer<File> container)
+	{
+		enumerator.registerTweakContainer(container);
+	}
+
+	/**
 	 * @param enumerator 
 	 */
-	@SuppressWarnings("unchecked")
-	protected void sortAndAllocateFiles(ModularEnumerator enumerator)
+	protected void sortAndRegisterFiles(ModularEnumerator enumerator)
 	{
 		// Copy the first entry in every version set into the modfiles list
 		for (Entry<String, TreeSet<LoadableMod<File>>> modFileEntry : this.versionOrderingSets.entrySet())
 		{
 			LoadableMod<File> newestVersion = modFileEntry.getValue().iterator().next();
+			this.registerFile(enumerator, newestVersion);
+		}
+		
+		this.versionOrderingSets.clear();
+	}
-			if (enumerator.registerModContainer(newestVersion))
-			{
-				LiteLoaderLogger.info("Adding newest valid mod file '%s' at revision %.4f", newestVersion.getLocation(), newestVersion.getRevision());
-				this.loadableMods.add(newestVersion);
-			}
-			else
-			{
-				LiteLoaderLogger.info("Not adding valid mod file '%s', the specified mod is disabled or missing a required dependency", newestVersion.getLocation());
-			}
-			
-			if (this.loadTweaks)
+	/**
+	 * @param enumerator
+	 * @param modFile
+	 */
+	@SuppressWarnings("unchecked")
+	protected void registerFile(ModularEnumerator enumerator, LoadableMod<File> modFile)
+	{
+		if (enumerator.registerModContainer(modFile))
+		{
+			LiteLoaderLogger.info("Adding newest valid mod file '%s' at revision %.4f", modFile, modFile.getRevision());
+			this.loadableMods.add(modFile);
+		}
+		else
+		{
+			LiteLoaderLogger.info("Not adding valid mod file '%s', the specified mod is disabled or missing a required dependency", modFile);
+		}
+		
+		if (this.loadTweaks)
+		{
+			try
 			{
-				try
-				{
-					if (newestVersion instanceof TweakContainer)
-					{
-						enumerator.registerTweakContainer((TweakContainer<File>)newestVersion);
-					}
-				}
-				catch (Throwable th)
+				if (modFile instanceof TweakContainer)
 				{
-					LiteLoaderLogger.warning("Error adding tweaks from '%s'", newestVersion.getLocation());
+					this.addTweakFile(enumerator, (TweakContainer<File>)modFile);
 				}
 			}
+			catch (Throwable th)
+			{
+				LiteLoaderLogger.warning("Error adding tweaks from '%s'", modFile);
+			}
 		}
 	}
@@ -300,12 +353,12 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 			{
 				if (loadableMod.injectIntoClassPath(classLoader, false))
 				{
-					LiteLoaderLogger.info("Successfully injected mod file '%s' into classpath", loadableMod.getLocation());
+					LiteLoaderLogger.info("Successfully injected mod file '%s' into classpath", loadableMod);
 				}
 			}
 			catch (MalformedURLException ex)
 			{
-				LiteLoaderLogger.warning("Error injecting '%s' into classPath. The mod will not be loaded", loadableMod.getLocation());
+				LiteLoaderLogger.warning("Error injecting '%s' into classPath. The mod will not be loaded", loadableMod);
 			}
 		}
 	}
@@ -319,14 +372,14 @@ public class EnumeratorModuleFolder implements FilenameFilter, EnumeratorModule
 		for (LoadableMod<?> modFile : this.loadableMods)
 		{
 			LoadingProgress.incLiteLoaderProgress("Searching for mods in " + modFile.getModName() + "...");
-			LiteLoaderLogger.info("Searching %s...", modFile.getLocation());
+			LiteLoaderLogger.info("Searching %s...", modFile);
 			try
 			{
 				enumerator.registerModsFrom(modFile, true);
 			}
 			catch (Exception ex)
 			{
-				LiteLoaderLogger.warning("Error encountered whilst searching in %s...", modFile.getLocation());
+				LiteLoaderLogger.warning("Error encountered whilst searching in %s...", modFile);
 			}
 		}
 	}
-package com.mumfrey.liteloader.core.api;
-
-import java.io.File;
-import java.net.URL;
-import java.net.URLDecoder;
-
-import net.minecraft.launchwrapper.LaunchClassLoader;
-
-import com.mumfrey.liteloader.api.EnumeratorModule;
-import com.mumfrey.liteloader.interfaces.LoadableMod;
-import com.mumfrey.liteloader.interfaces.ModularEnumerator;
-import com.mumfrey.liteloader.launch.LoaderEnvironment;
-import com.mumfrey.liteloader.launch.LoaderProperties;
-import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
-
-/**
- * Enumerator module which searches for mods on the classpath
- * 
- * @author Adam Mummery-Smith
- */
-public class EnumeratorModuleProtectionDomain implements EnumeratorModule
-{
-	private LoadableMod<File> codeSource;
-
-	public EnumeratorModuleProtectionDomain(boolean loadTweaks)
-	{
-		this.initPackagePath();
-	}
-	
-	@Override
-	public String toString()
-	{
-		return this.codeSource != null ? this.codeSource.getName() : "<None>";
-	}
-	
-	private void initPackagePath()
-	{
-		try
-		{
-			URL protectionDomainLocation = EnumeratorModuleProtectionDomain.class.getProtectionDomain().getCodeSource().getLocation();
-			if (protectionDomainLocation != null)
-			{
-				LiteLoaderLogger.info("Determining code source using protection domain");
-				if (protectionDomainLocation.toString().indexOf('!') > -1 && protectionDomainLocation.toString().startsWith("jar:"))
-				{
-					LiteLoaderLogger.info("Protection domain references a jar file");
-					protectionDomainLocation = new URL(protectionDomainLocation.toString().substring(4, protectionDomainLocation.toString().indexOf('!')));
-				}
-				
-				File packagePath = new File(protectionDomainLocation.toURI());
-				if (packagePath.isFile() && packagePath.getName().endsWith(".class"))
-				{
-					packagePath = packagePath.getParentFile();
-				}
-				
-				this.codeSource = new LoadableModClassPath(packagePath);
-			}
-			else
-			{
-				LiteLoaderLogger.info("Determining code source using resource");
-				String reflectionClassPath = EnumeratorModuleProtectionDomain.class.getResource("/net/minecraft/client/main/Main.class").getPath();
-				
-				if (reflectionClassPath.indexOf('!') > -1)
-				{
-					reflectionClassPath = URLDecoder.decode(reflectionClassPath, "UTF-8");
-					this.codeSource = new LoadableModClassPath(new File(reflectionClassPath.substring(5, reflectionClassPath.indexOf('!'))));
-				}
-			}
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.warning("Error determining local protection domain: %s", th.getMessage());
-		}
-	}
-	
-	
-	@Override
-	public void init(LoaderEnvironment environment, LoaderProperties properties)
-	{
-	}
-
-	@Override
-	public void writeSettings(LoaderEnvironment environment, LoaderProperties properties)
-	{
-	}
-
-	@Override
-	public void enumerate(ModularEnumerator enumerator, String profile)
-	{
-	}
-	
-	@Override
-	public void injectIntoClassLoader(ModularEnumerator enumerator, LaunchClassLoader classLoader)
-	{
-	}
-
-	/**
-	 * @param classLoader
-	 */
-	@Override
-	public void registerMods(ModularEnumerator enumerator, LaunchClassLoader classLoader)
-	{
-		LiteLoaderLogger.info("Discovering mods in protection domain...");
-
-		try
-		{
-			if (this.codeSource != null)
-			{
-				enumerator.registerModsFrom(this.codeSource, false);
-			}
-		}
-		catch (Throwable th)
-		{
-			LiteLoaderLogger.warning("Error loading from local class path: %s", th.getMessage());
-		}
-	}
-}
@@ -28,7 +28,6 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
 	protected LoaderProperties properties;
 	protected boolean searchClassPath;
-	protected boolean searchProtectionDomain;
 	protected boolean searchModsFolder;
 	/* (non-Javadoc)
@@ -92,10 +91,9 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
 	void readDiscoverySettings()
 	{
 		this.searchModsFolder       = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_MODS,      true);
-		this.searchProtectionDomain = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_JAR,       false);
 		this.searchClassPath        = this.properties.getAndStoreBooleanProperty(LoaderProperties.OPTION_SEARCH_CLASSPATH, true);
-		if (!this.searchModsFolder && !this.searchProtectionDomain && !this.searchClassPath)
+		if (!this.searchModsFolder && !this.searchClassPath)
 		{
 			LiteLoaderLogger.warning("Invalid configuration, no search locations defined. Enabling all search locations.");
@@ -110,7 +108,6 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
 	void writeDiscoverySettings()
 	{
 		this.properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_MODS,      this.searchModsFolder);
-		this.properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_JAR,       this.searchProtectionDomain);
 		this.properties.setBooleanProperty(LoaderProperties.OPTION_SEARCH_CLASSPATH, this.searchClassPath);
 	}
@@ -129,19 +126,13 @@ public abstract class LiteLoaderCoreAPI implements LiteAPI
 			enumeratorModules.add(new EnumeratorModuleClassPath());
 		}
-		if (this.searchProtectionDomain)
-		{
-			LiteLoaderLogger.warning("Protection domain searching is no longer required or supported, protection domain search has been disabled");
-			this.searchProtectionDomain = false;
-		}
-		
 		if (this.searchModsFolder)
 		{
 			File modsFolder = this.environment.getModsFolder();
-			enumeratorModules.add(new EnumeratorModuleFolder(this, modsFolder, true));
+			enumeratorModules.add(new EnumeratorModuleFolder(this, modsFolder, false));
 			File versionedModsFolder = this.environment.getVersionedModsFolder();
-			enumeratorModules.add(new EnumeratorModuleFolder(this, versionedModsFolder, false));
+			enumeratorModules.add(new EnumeratorModuleFolder(this, versionedModsFolder, true));
 		}
 		return Collections.unmodifiableList(enumeratorModules);
@@ -5,9 +5,7 @@ import java.net.MalformedURLException;
 import net.minecraft.launchwrapper.LaunchClassLoader;
-import com.google.common.base.Charsets;
 import com.mumfrey.liteloader.core.LiteLoaderVersion;
-import com.mumfrey.liteloader.interfaces.LoadableMod;
 import com.mumfrey.liteloader.resources.ModResourcePack;
 import com.mumfrey.liteloader.resources.ModResourcePackDir;
 import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
@@ -30,7 +28,7 @@ public class LoadableModClassPath extends LoadableModFile
 	LoadableModClassPath(File file, String fallbackName)
 	{
-		super(file, LoadableModClassPath.getVersionMetaDataString(file));
+		super(file, LoadableModFile.getVersionMetaDataString(file));
 		if (this.modName == null)
 		{
@@ -53,6 +51,12 @@ public class LoadableModClassPath extends LoadableModFile
 	}
 	@Override
+	protected void readJarMetaData()
+	{
+		// Nope
+	}
+	
+	@Override
 	protected String getDefaultName()
 	{
 		return null;
@@ -104,9 +108,4 @@ public class LoadableModClassPath extends LoadableModFile
 			this.modName = modName;
 		}
 	}
-
-	private static String getVersionMetaDataString(File file)
-	{
-		return LoadableModFile.getFileContents(file, LoadableMod.METADATA_FILENAME, Charsets.UTF_8);
-	}
 }
@@ -22,7 +22,6 @@ import net.minecraft.client.resources.I18n;
 import com.google.common.base.Charsets;
 import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
 import com.google.gson.Gson;
 import com.google.gson.JsonSyntaxException;
 import com.mumfrey.liteloader.api.manager.APIProvider;
@@ -126,21 +125,38 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 	/**
 	 * @param file
-	 * @param strVersion
+	 * @param metaData
 	 */
-	@SuppressWarnings("unchecked")
-	protected LoadableModFile(File file, String strVersion)
+	protected LoadableModFile(File file, String metaData)
 	{
 		super(file.getAbsolutePath());
-		
+		this.init(metaData);
+	}
+	
+	/**
+	 * @param file
+	 * @param metaData
+	 */
+	protected LoadableModFile(LoadableFile file, String metaData)
+	{
+		super(file);
+		this.init(metaData);
+	}
+
+	/**
+	 * @param metaData
+	 */
+	@SuppressWarnings("unchecked")
+	protected void init(String metaData)
+	{
 		this.timeStamp = this.lastModified();
 		this.tweakPriority = 0;
-		if (!Strings.isNullOrEmpty(strVersion))
+		if (!Strings.isNullOrEmpty(metaData))
 		{
 			try
 			{
-				this.metaData = LoadableModFile.gson.fromJson(strVersion, HashMap.class);
+				this.metaData = LoadableModFile.gson.fromJson(metaData, HashMap.class);
 			}
 			catch (JsonSyntaxException jsx)
 			{
@@ -148,11 +164,11 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 				return;
 			}
-			this.valid = this.parseVersionFile(strVersion);
+			this.valid = this.parseMetaData();
 		}
 	}
-	protected boolean parseVersionFile(String strVersionData)
+	protected boolean parseMetaData()
 	{
 		try
 		{
@@ -165,7 +181,7 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 			this.injectionStrategy = InjectionStrategy.parseStrategy(this.getMetaValue("injectAt", null));
-			this.tweakClassName = this.getMetaValue("tweakClass", null);
+			this.tweakClassName = this.getMetaValue("tweakClass", this.tweakClassName);
 			this.getMetaValuesInto(this.classTransformerClassNames, "classTransformerClasses", ",");
 			this.getMetaValuesInto(this.dependencies, "dependsOn", ",");
@@ -477,15 +493,6 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 		// Give up and use timestamp
 		return (int)(otherMod.timeStamp - this.timeStamp);
 	}
-	
-	/**
-	 * @param name
-	 * @param charset
-	 */
-	public String getFileContents(String name, Charset charset)
-	{
-		return LoadableModFile.getFileContents(this, name, charset);
-	}
 	protected static List<String> enumerateZipFile(File file)
 	{
@@ -598,46 +605,8 @@ public class LoadableModFile extends LoadableFile implements LoadableMod&lt;File&gt;
 		return new String(bytes, bomOffset, bytes.length - bomOffset, charset);
 	}
-	/**
-	 * @param parent
-	 * @param name
-	 * @param charset
-	 */
-	public static String getFileContents(File parent, String name, Charset charset)
+	protected static String getVersionMetaDataString(File file)
 	{
-		try
-		{
-			if (parent.isDirectory())
-			{
-				File file = new File(parent, name);
-				if (file.isFile())
-				{
-					return Files.toString(file, charset);
-				}
-			}
-			else
-			{
-				String content = null;
-				ZipFile zipFile = new ZipFile(parent);
-				ZipEntry zipEntry = zipFile.getEntry(name);
-				if (zipEntry != null)
-				{
-					try
-					{
-						content = LoadableModFile.zipEntryToString(zipFile, zipEntry);
-					}
-					catch (IOException ex) {}
-				}
-				
-				zipFile.close();
-				return content;
-			}
-		}
-		catch (IOException ex)
-		{
-			ex.printStackTrace();
-		}
-		
-		return null;
+		return LoadableFile.getFileContents(file, LoadableMod.METADATA_FILENAME, Charsets.UTF_8);
 	}
 }
@@ -4,14 +4,22 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+import com.google.common.io.Files;
 import com.google.common.primitives.Ints;
+import com.mumfrey.liteloader.core.api.LoadableModFile;
 import com.mumfrey.liteloader.launch.ClassPathUtilities;
 import com.mumfrey.liteloader.launch.InjectionStrategy;
 import com.mumfrey.liteloader.launch.LiteLoaderTweaker;
@@ -37,6 +45,8 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	 * inject above a specified other library matching "name".
 	 */
 	protected InjectionStrategy injectionStrategy = null;
+	
+	protected Set<String> modSystems = new HashSet<String>();
 	/**
 	 * Name of the tweak class
@@ -67,7 +77,17 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 		super(parent.getAbsolutePath());
 		this.displayName = this.getName();
 		this.guessVersionFromName();
-		this.readMetaData();
+		this.readJarMetaData();
+	}
+	
+	/**
+	 * ctor for subclasses
+	 */
+	protected LoadableFile(LoadableFile file)
+	{
+		super(file.getAbsolutePath());
+		this.displayName = this.getName();
+		this.assignJarMetaData(file);
 	}
 	/**
@@ -77,6 +97,7 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	{
 		super(pathname);
 		this.displayName = this.getName();
+		this.readJarMetaData();
 	}
 	private void guessVersionFromName()
@@ -86,21 +107,51 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 			this.version = versionPatternMatcher.group();
 	}
+	protected void assignJarMetaData(LoadableFile file)
+	{
+		this.modSystems        = file.modSystems;
+		this.tweakClassName    = file.tweakClassName;
+		this.classPathEntries  = file.classPathEntries;
+		this.tweakPriority     = file.tweakPriority;
+		this.displayName       = file.displayName;
+		this.version           = file.version;
+		this.author            = file.author;
+		this.injectionStrategy = file.injectionStrategy;
+	}
+
 	/**
 	 * Search for tweaks in this file
 	 */
-	private void readMetaData()
+	protected void readJarMetaData()
 	{
 		JarFile jar = null;
+		if (this.isDirectory())
+		{
+			return;
+		}
+		
 		try
 		{
 			jar = new JarFile(this);
 			if (jar.getManifest() != null)
 			{
-				LiteLoaderLogger.info("Searching for tweaks in '%s'", this.getName());
+				LiteLoaderLogger.info("Inspecting jar metadata in '%s'", this.getName());
 				Attributes manifestAttributes = jar.getManifest().getMainAttributes();
+				String modSystemList = manifestAttributes.getValue("ModType");
+				if (modSystemList != null)
+				{
+					for (String modSystem : modSystemList.split(","))
+					{
+						modSystem = modSystem.trim();
+						if (modSystem.length() > 0)
+						{
+							this.modSystems.add(modSystem);
+						}
+					}
+				}
+					
 				this.tweakClassName = manifestAttributes.getValue("TweakClass");
 				if (this.tweakClassName != null)
 				{
@@ -110,11 +161,14 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 						this.classPathEntries = classPath.split(" ");
 					}
 				}
-				
-				Integer tweakOrder = Ints.tryParse(manifestAttributes.getValue("TweakOrder"));
-				if (tweakOrder != null)
+
+				if (manifestAttributes.getValue("TweakOrder") != null)
 				{
-					this.tweakPriority = tweakOrder.intValue();
+					Integer tweakOrder = Ints.tryParse(manifestAttributes.getValue("TweakOrder"));
+					if (tweakOrder != null)
+					{
+						this.tweakPriority = tweakOrder.intValue();
+					}
 				}
 				if (manifestAttributes.getValue("Implementation-Title") != null)
@@ -140,7 +194,7 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 		}
 		catch (Exception ex)
 		{
-			LiteLoaderLogger.warning("Error parsing manifest entries in '%s'", this.getAbsolutePath());
+			LiteLoaderLogger.warning("Could not parse jar metadata in '%s'", this);
 		}
 		finally
 		{
@@ -152,6 +206,11 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 		}
 	}
+	public Set<String> getModSystems()
+	{
+		return Collections.unmodifiableSet(this.modSystems);
+	}
+
 	@Override
 	public File getTarget()
 	{
@@ -309,4 +368,62 @@ public class LoadableFile extends File implements TweakContainer&lt;File&gt;
 	{
 		return environment.getEnabledModsList().isEnabled(environment.getProfile(), this.getIdentifier());
 	}
+	
+	@Override
+	public String toString()
+	{
+		return this.getLocation();
+	}
+	
+	/**
+	 * @param name
+	 * @param charset
+	 */
+	public String getFileContents(String name, Charset charset)
+	{
+		return LoadableFile.getFileContents(this, name, charset);
+	}
+
+	/**
+	 * @param parent
+	 * @param name
+	 * @param charset
+	 */
+	public static String getFileContents(File parent, String name, Charset charset)
+	{
+		try
+		{
+			if (parent.isDirectory())
+			{
+				File file = new File(parent, name);
+				if (file.isFile())
+				{
+					return Files.toString(file, charset);
+				}
+			}
+			else
+			{
+				String content = null;
+				ZipFile zipFile = new ZipFile(parent);
+				ZipEntry zipEntry = zipFile.getEntry(name);
+				if (zipEntry != null)
+				{
+					try
+					{
+						content = LoadableModFile.zipEntryToString(zipFile, zipEntry);
+					}
+					catch (IOException ex) {}
+				}
+				
+				zipFile.close();
+				return content;
+			}
+		}
+		catch (IOException ex)
+		{
+			ex.printStackTrace();
+		}
+		
+		return null;
+	}
 }
 \ No newline at end of file
@@ -8,6 +8,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import com.google.common.collect.ImmutableSet;
 import com.mumfrey.liteloader.launch.InjectionStrategy;
 import com.mumfrey.liteloader.launch.LoaderEnvironment;
@@ -24,8 +25,11 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 {
 	static final String METADATA_FILENAME = "litemod.json";
-	static final String LEGACY_METADATA_FILENAME = "version.txt";
-
+	/**
+	 * Get the mod systems declared in the jar metadata
+	 */
+	public abstract Set<String> getModSystems();
+	
 	/**
 	 * Get the name of the mod
 	 */
@@ -132,6 +136,8 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 	 */
 	public class EmptyModContainer implements LoadableMod<File>
 	{
+		private static final ImmutableSet<String> EMPTY_SET = ImmutableSet.<String>of();
+
 		EmptyModContainer() {}
 		@Override
@@ -139,6 +145,12 @@ public interface LoadableMod&lt;L&gt; extends Loadable&lt;L&gt;, Injectable
 		{
 			return null;
 		}
+		
+		@Override
+		public Set<String> getModSystems()
+		{
+			return EmptyModContainer.EMPTY_SET;
+		}
 		@Override
 		public String getName()
@@ -94,8 +94,6 @@ public interface LoaderProperties
 	// Enumerator properties
 	public static final String OPTION_SEARCH_MODS       = "search.mods";
-	public static final String OPTION_SEARCH_JAR        = "search.jar";
 	public static final String OPTION_SEARCH_CLASSPATH  = "search.classpath";
-	public static final String OPTION_SEARCH_ZIPFILES   = "search.zipfiles";
 	public static final String OPTION_SEARCH_JARFILES   = "search.jarfiles";
 }