Split MultiMC up into a few separate libraries.

Fixed plugin system.

Tons of other stuff...

8 files changed, 0 insertions, 928 deletions

diff --git a/data/inst/instance.cpp b/data/inst/instance.cpp
deleted file mode 100644
index 5db0be20..00000000
--- a/data/inst/instance.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "instance.h"
-
-#include <QFileInfo>
-
-#include "util/pathutils.h"
-
-Instance::Instance(const QString &rootDir, QObject *parent) :
-	SettingsBase(parent)
-{
-	m_rootDir = rootDir;
-	config.loadFile(PathCombine(rootDir, "instance.cfg"));
-}
-
-QString Instance::id()
-{
-	return QFileInfo(rootDir()).baseName();
-}
-
-QString Instance::rootDir()
-{
-	return m_rootDir;
-}
-
-InstanceList *Instance::instList()
-{
-	if (parent()->inherits("InstanceList"))
-		return (InstanceList *)parent();
-	else
-		return NULL;
-}
-
-QString Instance::minecraftDir() const
-{
-	QFileInfo mcDir(PathCombine(rootDir(), "minecraft"));
-	QFileInfo dotMCDir(PathCombine(rootDir(), ".minecraft"));
-	
-	if (dotMCDir.exists() && !mcDir.exists())
-	{
-		return dotMCDir.path();
-	}
-	else
-	{
-		return mcDir.path();
-	}
-}
-
-QString Instance::binDir() const
-{
-	return PathCombine(minecraftDir(), "bin");
-}
-
-QString Instance::savesDir() const
-{
-	return PathCombine(minecraftDir(), "saves");
-}
-
-QString Instance::mlModsDir() const
-{
-	return PathCombine(minecraftDir(), "mods");
-}
-
-QString Instance::coreModsDir() const
-{
-	return PathCombine(minecraftDir(), "coremods");
-}
-
-QString Instance::resourceDir() const
-{
-	return PathCombine(minecraftDir(), "resources");
-}
-
-QString Instance::screenshotsDir() const
-{
-	return PathCombine(minecraftDir(), "screenshots");
-}
-
-QString Instance::texturePacksDir() const
-{
-	return PathCombine(minecraftDir(), "texturepacks");
-}
-
-QString Instance::mcJar() const
-{
-	return PathCombine(binDir(), "minecraft.jar");
-}
-
-QVariant Instance::getField(const QString &name, QVariant defVal) const
-{
-	return config.get(name, defVal);
-}
-
-void Instance::setField(const QString &name, QVariant val)
-{
-	config.set(name, val);
-}
diff --git a/data/inst/instance.h b/data/inst/instance.h
deleted file mode 100644
index 035704b9..00000000
--- a/data/inst/instance.h
+++ /dev/null
@@ -1,340 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INSTANCE_H
-#define INSTANCE_H
-
-#include <QObject>
-#include <QDateTime>
-
-#include "data/appsettings.h"
-#include "data/inifile.h"
-
-#define DEFINE_OVERRIDDEN_SETTING_ADVANCED(funcName, cfgEntryName, typeName) \
-	typeName get ## funcName() const { return getField(cfgEntryName, settings->get ## funcName()).value<typeName>(); }
-
-#define DEFINE_OVERRIDDEN_SETTING(funcName, typeName) \
-	DEFINE_OVERRIDDEN_SETTING_ADVANCED(funcName, STR_VAL(funcName), typeName)
-
-class InstanceList;
-
-/*!
- * \brief Base class for instances.
- * This class implements many functions that are common between instances and 
- * provides a standard interface for all instances.
- * 
- * To create a new instance type, create a new class inheriting from this class
- * and implement the pure virtual functions.
- */
-class Instance : public SettingsBase
-{
-	Q_OBJECT
-public:
-	explicit Instance(const QString &rootDir, QObject *parent = 0);
-	
-	// Please, for the sake of my (and everyone else's) sanity, at least keep this shit
-	// *somewhat* organized. Also, documentation is semi-important here. Please don't
-	// leave undocumented stuff behind.
-	
-	
-	//////// STUFF ////////
-	
-	/*!
-	 * \brief Get the instance's ID. 
-	 *        This is a unique identifier string that is, by default, set to the
-	 *        instance's folder name. It's not always the instance's folder name, 
-	 *        however, as any class deriving from Instance can override the id() 
-	 *        method and change how the ID is determined. The instance's ID 
-	 *        should always remain constant. Undefined behavior results if an 
-	 *        already loaded instance's ID changes.
-	 * 
-	 * \return The instance's ID.
-	 */
-	virtual QString id();
-	
-	/*!
-	 * \brief Gets the path to the instance's root directory.
-	 * \return  The path to the instance's root directory.
-	 */
-	virtual QString rootDir();
-	
-	/*!
-	 * \brief Gets the instance list that this instance is a part of. 
-	 *        Returns NULL if this instance is not in a list 
-	 *        (the parent is not an InstanceList).
-	 * \return A pointer to the InstanceList containing this instance. 
-	 */
-	virtual InstanceList *instList();
-	
-	
-	//////// FIELDS AND SETTINGS ////////
-	// Fields are options stored in the instance's config file that are specific
-	// to instances (not a part of SettingsBase). Settings are things overridden
-	// from SettingsBase.
-	
-	
-	////// Fields //////
-	
-	//// General Info ////
-	
-	/*!
-	 * \brief Gets this instance's name.
-	 *        This is the name that will be displayed to the user.
-	 * \return The instance's name.
-	 * \sa setName
-	 */
-	virtual QString name() { return getField("name", "Unnamed Instance").value<QString>(); }
-	
-	/*!
-	 * \brief Sets the instance's name
-	 * \param val The instance's new name.
-	 */
-	virtual void setName(QString val) { setField("name", val); }
-	
-	/*!
-	 * \brief Gets the instance's icon key.
-	 * \return The instance's icon key.
-	 * \sa setIconKey()
-	 */
-	virtual QString iconKey() const { return getField("iconKey", "default").value<QString>(); }
-	
-	/*!
-	 * \brief Sets the instance's icon key.
-	 * \param val The new icon key.
-	 */
-	virtual void setIconKey(QString val) { setField("iconKey", val); }
-	
-	
-	/*!
-	 * \brief Gets the instance's notes.
-	 * \return The instances notes.
-	 */
-	virtual QString notes() const { return getField("notes", "").value<QString>(); }
-	
-	/*!
-	 * \brief Sets the instance's notes.
-	 * \param val The instance's new notes.
-	 */
-	virtual void setNotes(QString val) { setField("notes", val); }
-	
-	
-	/*!
-	 * \brief Checks if	the instance's minecraft.jar needs to be rebuilt.
-	 *        If this is true, the instance's mods will be reinstalled to its
-	 *        minecraft.jar file. This value is automatically set to true when
-	 *        the jar mod list changes.
-	 * \return Whether or not the instance's jar file should be rebuilt.
-	 */
-	virtual bool shouldRebuild() const { return getField("NeedsRebuild", false).value<bool>(); }
-	
-	/*!
-	 * \brief Sets whether or not the instance's minecraft.jar needs to be rebuilt.
-	 * \param val Whether the instance's minecraft needs to be rebuilt or not.
-	 */
-	virtual void setShouldRebuild(bool val) { setField("NeedsRebuild", val); }
-	
-	
-	//// Version Stuff ////
-	
-	/*!
-	 * \brief Sets the instance's current version.
-	 *        This value represents the instance's current version. If this value
-	 *        is different from intendedVersion(), the instance should be updated.
-	 *        This value is updated by the updateCurrentVersion() function.
-	 * \return A string representing the instance's current version.
-	 */
-	virtual QString currentVersion() { return getField("JarVersion", "Unknown").value<QString>(); }
-	
-	/*!
-	 * \brief Sets the instance's current version.
-	 *        This is used to keep track of the instance's current version. Don't
-	 *        mess with this unless you know what you're doing.
-	 * \param val The new value.
-	 */
-	virtual void setCurrentVersion(QString val) { setField("JarVersion", val); }
-	
-	
-	/*!
-	 * \brief Gets the version of LWJGL that this instance should use.
-	 *        If no LWJGL version is specified in the instance's config file, 
-	 *        defaults to "Mojang"
-	 * \return The instance's LWJGL version.
-	 */
-	virtual QString lwjglVersion() { return getField("LwjglVersion", "Mojang").value<QString>(); }
-	
-	/*!
-	 * \brief Sets the version of LWJGL that this instance should use.
-	 * \param val The LWJGL version to use
-	 */
-	virtual void setLWJGLVersion(QString val) { setField("LwjglVersion", val); }
-	
-	
-	/*!
-	 * \brief Gets the version that this instance should try to update to.
-	 *        If this value differs from currentVersion(), the instance will
-	 *        download the intended version when it launches.
-	 * \return The instance's intended version.
-	 */
-	virtual QString intendedVersion() { return getField("IntendedJarVersion", currentVersion()).value<QString>(); }
-	
-	/*!
-	 * \brief Sets the version that this instance should try to update to.
-	 * \param val The instance's new intended version.
-	 */
-	virtual void setIntendedVersion(QString val) { setField("IntendedJarVersion", val); }
-	
-	
-	
-	//// Timestamps ////
-	
-	/*!
-	 * \brief Gets the time that the instance was last launched.
-	 *        Measured in milliseconds since epoch. QDateTime::currentMSecsSinceEpoch()
-	 * \return The time that the instance was last launched.
-	 */
-	virtual qint64 lastLaunch() { return getField("lastLaunchTime", 0).value<qint64>(); }
-	
-	/*!
-	 * \brief Sets the time that the instance was last launched.
-	 * \param val The time to set. Defaults to QDateTime::currentMSecsSinceEpoch()
-	 */
-	virtual void setLastLaunch(qint64 val = QDateTime::currentMSecsSinceEpoch()) 
-	{ setField("lastLaunchTime", val); }
-	
-	
-	////// Directories //////
-	//! Gets the path to the instance's minecraft folder.
-	QString minecraftDir() const;
-	
-	/*!
-	 * \brief Gets the path to the instance's instance mods folder.
-	 * This is the folder where the jar mods are kept.
-	 */
-	QString instModsDir() const;
-	
-	//! Gets the path to the instance's bin folder.
-	QString binDir() const;
-	
-	//! Gets the path to the instance's saves folder.
-	QString savesDir() const;
-	
-	//! Gets the path to the instance's mods folder. (.minecraft/mods)
-	QString mlModsDir() const;
-	
-	//! Gets the path to the instance's coremods folder.
-	QString coreModsDir() const;
-	
-	//! Gets the path to the instance's resources folder.
-	QString resourceDir() const;
-	
-	//! Gets the path to the instance's screenshots folder.
-	QString screenshotsDir() const;
-	
-	//! Gets the path to the instance's texture packs folder.
-	QString texturePacksDir() const;
-	
-	
-	////// Files //////
-	//! Gets the path to the instance's minecraft.jar
-	QString mcJar() const;
-	
-	//! Gets the path to the instance's mcbackup.jar.
-	QString mcBackup() const;
-	
-	//! Gets the path to the instance's config file.
-	QString configFile() const;
-	
-	//! Gets the path to the instance's modlist file.
-	QString modListFile() const;
-	
-	////// Settings //////
-	
-	//// Java Settings ////
-	DEFINE_OVERRIDDEN_SETTING_ADVANCED(JavaPath, JPATHKEY, QString)
-	DEFINE_OVERRIDDEN_SETTING(JvmArgs, QString)
-	
-	//// Custom Commands ////
-	DEFINE_OVERRIDDEN_SETTING(PreLaunchCommand, QString)
-	DEFINE_OVERRIDDEN_SETTING(PostExitCommand, QString)
-	
-	//// Memory ////
-	DEFINE_OVERRIDDEN_SETTING(MinMemAlloc, int)
-	DEFINE_OVERRIDDEN_SETTING(MaxMemAlloc, int)
-	
-	//// Auto login ////
-	DEFINE_OVERRIDDEN_SETTING(AutoLogin, bool)
-	
-	// This little guy here is to keep Qt Creator from being a dumbass and 
-	// auto-indenting the lines below the macros. Seriously, it's really annoying.
-	;
-	
-	
-	//////// OTHER FUNCTIONS ////////
-	
-	//// Version System ////
-	
-	/*!
-	 * \brief Checks whether or not the currentVersion of the instance needs to be updated. 
-	 *        If this returns true, updateCurrentVersion is called. In the 
-	 *        standard instance, this is determined by checking a timestamp 
-	 *        stored in the instance config file against the last modified time of Minecraft.jar.
-	 * \return True if updateCurrentVersion() should be called.
-	 */
-	virtual bool shouldUpdateCurrentVersion() = 0;
-	
-	/*!
-	 * \brief Updates the current version. 
-	 *        This function should first set the current version timestamp 
-	 *        (setCurrentVersionTimestamp()) to the current time. Next, if 
-	 *        keepCurrent is false, this function should check what the 
-	 *        instance's current version is and call setCurrentVersion() to 
-	 *        update it. This function will automatically be called when the 
-	 *        instance is loaded if shouldUpdateCurrentVersion returns true.
-	 * \param keepCurrent If true, only the version timestamp will be updated.
-	 */
-	virtual void updateCurrentVersion(bool keepCurrent = false) = 0; 
-	
-protected:
-	/*!
-	 * \brief Gets the value of the given field in the instance's config file.
-	 *        If the value isn't in the config file, defVal is returned instead.
-	 * \param name The name of the field in the config file.
-	 * \param defVal The default value.
-	 * \return The value of the given field or defVal if the field doesn't exist.
-	 * \sa setField()
-	 */
-	virtual QVariant getField(const QString &name, QVariant defVal = QVariant()) const;
-	
-	/*!
-	 * \brief Sets the value of the given field in the config file.
-	 * \param name The name of the field in the config file.
-	 * \param val The value to set the field to.
-	 * \sa getField()
-	 */
-	virtual void setField(const QString &name, QVariant val);
-	
-	// Overrides for SettingBase stuff.
-	virtual QVariant getValue(const QString &name, QVariant defVal = QVariant()) const
-	{ return settings->getValue(name, defVal); }
-	virtual void setValue(const QString &name, QVariant val)
-	{ setField(name, val); }
-	
-	INIFile config;
-	
-private:
-	QString m_rootDir;
-};
-
-#endif // INSTANCE_H
diff --git a/data/inst/instancelist.cpp b/data/inst/instancelist.cpp
deleted file mode 100644
index cbb89f05..00000000
--- a/data/inst/instancelist.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "instancelist.h"
-
-#include "data/siglist_impl.h"
-
-#include <QDir>
-#include <QFile>
-#include <QDirIterator>
-
-#include "instance.h"
-#include "instanceloader.h"
-
-#include "util/pathutils.h"
-
-
-InstanceList::InstanceList(const QString &instDir, QObject *parent) :
-	QObject(parent), m_instDir(instDir)
-{
-	
-}
-
-InstanceList::InstListError InstanceList::loadList()
-{
-	QDir dir(m_instDir);
-	QDirIterator iter(dir);
-	
-	while (iter.hasNext())
-	{
-		QString subDir = iter.next();
-		if (QFileInfo(PathCombine(subDir, "instance.cfg")).exists())
-		{
-			QSharedPointer<Instance> inst;
-			InstanceLoader::InstTypeError error = InstanceLoader::loader.
-					loadInstance(inst.data(), subDir);
-			
-			if (inst.data() && error == InstanceLoader::NoError)
-			{
-				qDebug(QString("Loaded instance %1").arg(inst->name()).toUtf8());
-				inst->setParent(this);
-				append(QSharedPointer<Instance>(inst));
-			}
-			else if (error != InstanceLoader::NotAnInstance)
-			{
-				QString errorMsg = QString("Failed to load instance %1: ").
-						arg(QFileInfo(subDir).baseName()).toUtf8();
-				
-				switch (error)
-				{
-				case InstanceLoader::TypeNotRegistered:
-					errorMsg += "Instance type not found.";
-					break;
-				}
-				qDebug(errorMsg.toUtf8());
-			}
-			else if (!inst.data())
-			{
-				qDebug(QString("Error loading instance %1. Instance loader returned null.").
-					   arg(QFileInfo(subDir).baseName()).toUtf8());
-			}
-		}
-	}
-	
-	return NoError;
-}
diff --git a/data/inst/instancelist.h b/data/inst/instancelist.h
deleted file mode 100644
index c43c4cc0..00000000
--- a/data/inst/instancelist.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INSTANCELIST_H
-#define INSTANCELIST_H
-
-#include <QObject>
-
-#include <QSharedPointer>
-
-#include "data/siglist.h"
-
-class Instance;
-
-class InstanceList : public QObject, public SigList<QSharedPointer<Instance>>
-{
-	Q_OBJECT
-public:
-	explicit InstanceList(const QString &instDir, QObject *parent = 0);
-	
-	/*!
-	 * \brief Error codes returned by functions in the InstanceList class.
-	 * NoError Indicates that no error occurred.
-	 * UnknownError indicates that an unspecified error occurred.
-	 */
-	enum InstListError
-	{
-		NoError = 0,
-		UnknownError
-	};
-	
-	QString instDir() const { return m_instDir; }
-	
-	/*!
-	 * \brief Loads the instance list.
-	 */
-	InstListError loadList();
-	
-	DEFINE_SIGLIST_SIGNALS(QSharedPointer<Instance>);
-	SETUP_SIGLIST_SIGNALS(QSharedPointer<Instance>);
-protected:
-	QString m_instDir;
-};
-
-#endif // INSTANCELIST_H
diff --git a/data/inst/instanceloader.cpp b/data/inst/instanceloader.cpp
deleted file mode 100644
index e80a0e9e..00000000
--- a/data/inst/instanceloader.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "instanceloader.h"
-
-#include <QFileInfo>
-
-#include "instancetype.h"
-
-#include "data/inifile.h"
-
-#include "util/pathutils.h"
-
-InstanceLoader InstanceLoader::loader;
-
-InstanceLoader::InstanceLoader() :
-	QObject(NULL)
-{
-	
-}
-
-
-InstanceLoader::InstTypeError InstanceLoader::registerInstanceType(InstanceType *type)
-{
-	// Check to see if the type ID exists.
-	if (m_typeMap.contains(type->typeID()))
-		return TypeIDExists;
-	
-	// Set the parent to this.
-	type->setParent(this);
-	
-	// Add it to the map.
-	m_typeMap.insert(type->typeID(), type);
-	return NoError;
-}
-
-InstanceLoader::InstTypeError InstanceLoader::createInstance(Instance *inst, 
-															 const InstanceType *type, 
-															 const QString &instDir)
-{
-	// Check if the type is registered.
-	if (!type || findType(type->typeID()) != type)
-		return TypeNotRegistered;
-	
-	// Create the instance.
-	return type->createInstance(inst, instDir);
-}
-
-InstanceLoader::InstTypeError InstanceLoader::loadInstance(Instance *inst, 
-														   const InstanceType *type, 
-														   const QString &instDir)
-{
-	// Check if the type is registered.
-	if (!type || findType(type->typeID()) != type)
-		return TypeNotRegistered;
-	
-	return type->loadInstance(inst, instDir);
-}
-
-InstanceLoader::InstTypeError InstanceLoader::loadInstance(Instance *inst, 
-														   const QString &instDir)
-{
-	QFileInfo instConfig(PathCombine(instDir, "instance.cfg"));
-	
-	if (!instConfig.exists())
-		return NotAnInstance;
-	
-	INIFile ini;
-	ini.loadFile(instConfig.path());
-	QString typeName = ini.get("type", "StdInstance").toString();
-	const InstanceType *type = findType(typeName);
-	
-	return loadInstance(inst, type, instDir);
-}
-
-const InstanceType *InstanceLoader::findType(const QString &id)
-{
-	if (!m_typeMap.contains(id))
-		return NULL;
-	else
-		return m_typeMap[id];
-}
-
-InstTypeList InstanceLoader::typeList()
-{
-	InstTypeList typeList;
-	
-	for (auto iter = m_typeMap.begin(); iter != m_typeMap.end(); iter++)
-	{
-		typeList.append(*iter);
-	}
-	
-	return typeList;
-}
diff --git a/data/inst/instanceloader.h b/data/inst/instanceloader.h
deleted file mode 100644
index 60c4e998..00000000
--- a/data/inst/instanceloader.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INSTANCELOADER_H
-#define INSTANCELOADER_H
-
-#include <QObject>
-#include <QMap>
-#include <QList>
-
-class InstanceType;
-class Instance;
-
-typedef QList<const InstanceType *> InstTypeList;
-
-/*!
- * \brief The InstanceLoader is a singleton that manages all of the instance types and handles loading and creating instances.
- * Instance types are registered with the instance loader through its registerInstType() function. 
- * Creating instances is done through the InstanceLoader's createInstance() function. This function takes 
- */
-class InstanceLoader : public QObject
-{
-	Q_OBJECT
-public:
-	static InstanceLoader loader;
-	
-	/*!
-	 * \brief Error codes returned by functions in the InstanceLoader and InstanceType classes.
-	 *
-	 * - NoError indicates that no error occurred.
-	 * - OtherError indicates that an unspecified error occurred.
-	 * - TypeIDExists is returned	by registerInstanceType() if the ID of the type being registered already exists.
-	 * - TypeNotRegistered is returned by createInstance() and loadInstance() when the given type is not registered.
-	 * - InstExists is returned by createInstance() if the given instance directory is already an instance.
-	 * - NotAnInstance is returned by loadInstance() if the given instance directory is not a valid instance.
-	 * - WrongInstType is returned by loadInstance() if the given instance directory's type doesn't match the given type.
-	 */
-	enum InstTypeError
-	{
-		NoError = 0,
-		OtherError,
-		
-		TypeIDExists,
-		
-		TypeNotRegistered,
-		InstExists,
-		NotAnInstance,
-		WrongInstType
-	};
-	
-	/*!
-	 * \brief Registers the given InstanceType with the instance loader.
-	 * This causes the instance loader to take ownership of the given 
-	 * instance type (meaning the instance type's parent will be set to 
-	 * the instance loader).
-	 *
-	 * \param type The InstanceType to register.
-	 * \return An InstTypeError error code.
-	 * - TypeIDExists if the given type's is already registered to another instance type.
-	 */
-	InstTypeError registerInstanceType(InstanceType *type);
-	
-	/*!
-	 * \brief Creates an instance with the given type and stores it in inst.
-	 *
-	 * \param inst Pointer to store the created instance in.
-	 * \param type The type of instance to create.
-	 * \param instDir The instance's directory.
-	 * \return An InstTypeError error code.
-	 * - TypeNotRegistered if the given type is not registered with the InstanceLoader.
-	 * - InstExists if the given instance directory is already an instance.
-	 */
-	InstTypeError createInstance(Instance *inst, const InstanceType *type, const QString &instDir);
-	
-	/*!
-	 * \brief Loads an instance from the given directory.
-	 *
-	 * \param inst Pointer to store the loaded instance in.
-	 * \param type The type of instance to load.
-	 * \param instDir The instance's directory.
-	 * \return An InstTypeError error code.
-	 * - TypeNotRegistered if the given type is not registered with the InstanceLoader.
-	 * - NotAnInstance if the given instance directory isn't a valid instance.
-	 * - WrongInstType if the given instance directory's type isn't the same as the given type.
-	 */
-	InstTypeError loadInstance(Instance *inst, const InstanceType *type, const QString &instDir);
-	
-	/*!
-	 * \brief Loads an instance from the given directory.
-	 * Checks the instance's INI file to figure out what the instance's type is first.
-	 * \param inst Pointer to store the loaded instance in.
-	 * \param instDir The instance's directory.
-	 * \return An InstTypeError error code.
-	 * - TypeNotRegistered if the instance's type is not registered with the InstanceLoader.
-	 * - NotAnInstance if the given instance directory isn't a valid instance.
-	 */
-	InstTypeError loadInstance(Instance *inst, const QString &instDir);
-	
-	/*!
-	 * \brief Finds an instance type with the given ID.
-	 * If one cannot be found, returns NULL.
-	 *
-	 * \param id The ID of the type to find.
-	 * \return The type with the given ID. NULL if none were found.
-	 */
-	const InstanceType *findType(const QString &id);
-	
-	/*!
-	 * \brief Gets a list of the registered instance types.
-	 *
-	 * \return A list of instance types.
-	 */
-	InstTypeList typeList();
-	
-private:
-	InstanceLoader();
-	
-	QMap<QString, InstanceType *> m_typeMap;
-};
-
-#endif // INSTANCELOADER_H
diff --git a/data/inst/instancetype.cpp b/data/inst/instancetype.cpp
deleted file mode 100644
index 4f27542d..00000000
--- a/data/inst/instancetype.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "instancetype.h"
-
-InstanceType::InstanceType(QObject *parent) :
-	QObject(parent)
-{
-}
diff --git a/data/inst/instancetype.h b/data/inst/instancetype.h
deleted file mode 100644
index bd22a17c..00000000
--- a/data/inst/instancetype.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* Copyright 2013 MultiMC Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef INSTANCETYPE_H
-#define INSTANCETYPE_H
-
-#include <QObject>
-
-#include "instanceloader.h"
-
-/*!
- * \brief The InstanceType class is a base class for all instance types.
- * It handles loading and creating instances of a certain type. There should be 
- * one of these for each type of instance and they should be registered with the 
- * InstanceLoader.
- * To create an instance, the InstanceLoader calls the type's createInstance() 
- * function. Loading is done through the loadInstance() function.
- */
-class InstanceType : public QObject
-{
-	Q_OBJECT
-public:
-	explicit InstanceType(QObject *parent = 0);
-	
-	friend class InstanceLoader;
-	
-	/*!
-	 * \brief Gets the ID for this instance type. 
-	 *        The type ID should be unique as it is used to identify the type 
-	 *        of instances when they are loaded.
-	 *        Changing this value at runtime results in undefined behavior.
-	 * \return This instance type's ID string. 
-	 */
-	virtual QString typeID() const = 0;
-	
-	/*!
-	 * \brief Gets the name of this instance type as it is displayed to the user.
-	 * \return The instance type's display name.
-	 */
-	virtual QString displayName() const = 0;
-	
-	/*!
-	 * \brief Gets a longer, more detailed description of this instance type.
-	 * \return The instance type's description.
-	 */
-	virtual QString description() const	= 0;
-	
-protected:
-	/*!
-	 * \brief Creates an instance and stores it in inst.
-	 * \param inst Pointer to store the created instance in.
-	 * \param instDir The instance's directory.
-	 * \return An InstTypeError error code.
-	 *         TypeNotRegistered if the given type is not registered with the InstanceLoader.
-	 *         InstExists if the given instance directory is already an instance.
-	 */
-	virtual InstanceLoader::InstTypeError createInstance(Instance *inst, const QString &instDir) const = 0;
-	
-	/*!
-	 * \brief Loads an instance from the given directory.
-	 * \param inst Pointer to store the loaded instance in.
-	 * \param instDir The instance's directory.
-	 * \return An InstTypeError error code.
-	 *         TypeNotRegistered if the given type is not registered with the InstanceLoader.
-	 *         NotAnInstance if the given instance directory isn't a valid instance.
-	 *         WrongInstType if the given instance directory's type isn't an instance of this type.
-	 */
-	virtual InstanceLoader::InstTypeError loadInstance(Instance *inst, const QString &instDir) const = 0;
-};
-
-#endif // INSTANCETYPE_H