Merge branch 'master' of http://github.com/peterix/MultiMC5

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp

14 files changed, 177 insertions, 1378 deletions

diff --git a/data/appsettings.cpp b/data/appsettings.cpp
deleted file mode 100644
index 1d9c4312..00000000
--- a/data/appsettings.cpp
+++ /dev/null
@@ -1,40 +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 "appsettings.h"
-
-AppSettings* settings;
-
-SettingsBase::SettingsBase(QObject *parent) :
-	QObject(parent)
-{
-	
-}
-
-AppSettings::AppSettings(QObject *parent) :
-	SettingsBase(parent)
-{
-	
-}
-
-QVariant AppSettings::getValue(const QString& name, QVariant defVal) const
-{
-	return config.value(name, defVal);
-}
-
-void AppSettings::setValue(const QString& name, QVariant val)
-{
-	config.setValue(name, val);
-}
diff --git a/data/appsettings.h b/data/appsettings.h
deleted file mode 100644
index a9068bfd..00000000
--- a/data/appsettings.h
+++ /dev/null
@@ -1,119 +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 APPSETTINGS_H
-#define APPSETTINGS_H
-
-#include <QObject>
-#include <QSettings>
-#include <QColor>
-#include <QPoint>
-
-#include "util/apputils.h"
-#include "util/osutils.h"
-
-#if WINDOWS
-#define JPATHKEY "JavaPathWindows"
-#elif OSX
-#define JPATHKEY "JavaPathOSX"
-#else
-#define JPATHKEY "JavaPathLinux"
-#endif
-
-#define DEFINE_SETTING_ADVANCED(funcName, name, valType, defVal) \
-	virtual valType get ## funcName() const { return getValue(name, defVal).value<valType>(); } \
-	virtual void set ## funcName(valType value) { setValue(name, value); }
-
-#define DEFINE_SETTING(name, valType, defVal) \
-	DEFINE_SETTING_ADVANCED(name, STR_VAL(name), valType, defVal)
-
-#define DEFINE_OVERRIDE_SETTING(overrideName) \
-	
-
-class SettingsBase : public QObject
-{
-	Q_OBJECT
-public:
-	explicit SettingsBase(QObject *parent = 0);
-	
-	// Updates
-	DEFINE_SETTING(UseDevBuilds, bool, false)
-	DEFINE_SETTING(AutoUpdate, bool, true)
-	
-	// Folders
-	DEFINE_SETTING(InstanceDir, QString, "instances")
-	DEFINE_SETTING(CentralModsDir, QString, "mods")
-	DEFINE_SETTING(LWJGLDir, QString, "lwjgl")
-	
-	// Console
-	DEFINE_SETTING(ShowConsole, bool, true)
-	DEFINE_SETTING(AutoCloseConsole, bool, true)
-	
-	// Toolbar settings
-	DEFINE_SETTING(InstanceToolbarVisible, bool, true)
-	DEFINE_SETTING(InstanceToolbarPosition, QPoint, QPoint())
-	
-	// Console Colors
-	DEFINE_SETTING(SysMessageColor, QColor, QColor(Qt::blue))
-	DEFINE_SETTING(StdOutColor, QColor, QColor(Qt::black))
-	DEFINE_SETTING(StdErrColor, QColor, QColor(Qt::red))
-	
-	// Window Size
-	DEFINE_SETTING(LaunchCompatMode, bool, false)
-	DEFINE_SETTING(LaunchMaximized, bool, false)
-	DEFINE_SETTING(MinecraftWinWidth, int, 854)
-	DEFINE_SETTING(MinecraftWinHeight, int, 480)
-	
-	// Auto login
-	DEFINE_SETTING(AutoLogin, bool, false)
-	
-	// Memory
-	DEFINE_SETTING(MinMemAlloc, int, 512)
-	DEFINE_SETTING(MaxMemAlloc, int, 1024)
-	
-	// Java Settings
-	DEFINE_SETTING_ADVANCED(JavaPath, JPATHKEY, QString, "java")
-	DEFINE_SETTING(JvmArgs, QString, "")
-	
-	// Custom Commands
-	DEFINE_SETTING(PreLaunchCommand, QString, "")
-	DEFINE_SETTING(PostExitCommand, QString, "")
-	
-protected:
-	virtual QVariant getValue(const QString& name, QVariant defVal = QVariant()) const = 0;
-	virtual void setValue(const QString& name, QVariant val) = 0;
-};
-
-class AppSettings : public SettingsBase
-{
-	Q_OBJECT
-public:
-	explicit AppSettings(QObject *parent = 0);
-	
-	QSettings& getConfig() { return config; }
-	
-protected:
-	virtual QVariant getValue(const QString &name, QVariant defVal = QVariant()) const;
-	virtual void setValue(const QString& name, QVariant val);
-	
-	QSettings config;
-};
-
-#undef DEFINE_SETTING_ADVANCED
-#undef DEFINE_SETTING
-
-extern AppSettings* settings;
-
-#endif // APPSETTINGS_H
diff --git a/data/inifile.cpp b/data/inifile.cpp
deleted file mode 100644
index 2d68caf6..00000000
--- a/data/inifile.cpp
+++ /dev/null
@@ -1,86 +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 "inifile.h"
-
-#include <QFile>
-#include <QTextStream>
-#include <QStringList>
-
-INIFile::INIFile()
-{
-	
-}
-
-bool INIFile::saveFile(QString fileName)
-{
-	// TODO Handle errors.
-	QFile file(fileName);
-	file.open(QIODevice::WriteOnly);
-	QTextStream out(&file);
-	
-	for (Iterator iter = begin(); iter != end(); iter++)
-	{
-		out << iter.key() << "=" << iter.value().toString() << "\n";
-	}
-	
-	return true;
-}
-
-bool INIFile::loadFile(QString fileName)
-{
-	// TODO Handle errors.
-	QFile file(fileName);
-	file.open(QIODevice::ReadOnly);
-	QTextStream	in(&file);
-	
-	QStringList lines = in.readAll().split('\n');
-	for (int i = 0; i < lines.count(); i++)
-	{
-		QString & lineRaw = lines[i];
-		// Ignore comments.
-		QString line = lineRaw.left(lineRaw.indexOf('#')).trimmed();
-		
-		int eqPos = line.indexOf('=');
-		if(eqPos == -1)
-			continue;
-		QString key = line.left(eqPos).trimmed();
-		QString valueStr = line.right(line.length() - eqPos - 1).trimmed();
-		
-		QVariant value(valueStr);
-		/*
-		QString dbg = key;
-		dbg += " = ";
-		dbg += valueStr;
-		qDebug(dbg.toLocal8Bit());
-		*/
-		this->operator [](key) = value;
-	}
-	
-	return true;
-}
-
-QVariant INIFile::get(QString key, QVariant def) const
-{
-	if (!this->contains(key))
-		return def;
-	else
-		return this->operator [](key);
-}
-
-void INIFile::set(QString key, QVariant val)
-{
-	this->operator [](key) = val;
-}
diff --git a/data/inifile.h b/data/inifile.h
deleted file mode 100644
index 75783859..00000000
--- a/data/inifile.h
+++ /dev/null
@@ -1,36 +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 INIFILE_H
-#define INIFILE_H
-
-#include <QMap>
-#include <QString>
-#include <QVariant>
-
-// Sectionless INI parser (for instance config files)
-class INIFile : public QMap<QString, QVariant>
-{
-public:
-	explicit INIFile();
-	
-	bool loadFile(QString fileName);
-	bool saveFile(QString fileName);
-	
-	QVariant get(QString key, QVariant def) const;
-	void set(QString key, QVariant val);
-};
-
-#endif // INIFILE_H
diff --git a/data/instancebase.cpp b/data/instancebase.cpp
deleted file mode 100644
index a5ef35a2..00000000
--- a/data/instancebase.cpp
+++ /dev/null
@@ -1,109 +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 "instancebase.h"
-
-#include <QFileInfo>
-#include <QDir>
-
-#include "../util/pathutils.h"
-
-InstanceBase::InstanceBase(QString dir, QObject *parent) :
-	QObject(parent), 
-	rootDir(dir)
-{
-	QFileInfo cfgFile(PathCombine(rootDir, "instance.cfg"));
-	
-	if (cfgFile.exists())
-	{
-		if(!config.loadFile(cfgFile.absoluteFilePath()))
-		{
-			QString debugmsg("Can't load instance config file for instance ");
-			debugmsg+= getInstID();
-			qDebug(debugmsg.toLocal8Bit());
-		}
-	}
-	else
-	{
-		QString debugmsg("Can't find instance config file for instance ");
-		debugmsg+= getInstID();
-		debugmsg += " : ";
-		debugmsg += 
-		debugmsg+=" ... is this an instance even?";
-		qDebug(debugmsg.toLocal8Bit());
-	}
-	currentGroup = nullptr;
-}
-
-QString InstanceBase::getRootDir() const
-{
-	return rootDir;
-}
-
-
-///////////// Config Values /////////////
-
-// Name
-QString InstanceBase::getInstName() const
-{
-	return config.get("name", "Unnamed").toString();
-}
-
-void InstanceBase::setInstName(QString name)
-{
-	config.set("name", name);
-}
-
-QString InstanceBase::getInstID() const
-{
-	return QDir(rootDir).dirName();
-}
-
-InstanceModelItem* InstanceBase::getParent() const
-{
-	return currentGroup;
-}
-
-QVariant InstanceBase::data ( int role ) const
-{
-	switch(role)
-	{
-		case Qt::DisplayRole:
-			return getInstName();
-		default:
-			return QVariant();
-	}
-}
-int InstanceBase::getRow() const
-{
-	return currentGroup->getIndexOf((InstanceBase*)this);
-}
-
-InstanceModelItem* InstanceBase::getChild ( int index ) const
-{
-	return nullptr;
-}
-InstanceModel* InstanceBase::getModel() const
-{
-	return currentGroup->getModel();
-}
-IMI_type InstanceBase::getModelItemType() const
-{
-	return IMI_Instance;
-}
-int InstanceBase::numChildren() const
-{
-	return 0;
-}
diff --git a/data/instancebase.h b/data/instancebase.h
deleted file mode 100644
index fa043c5f..00000000
--- a/data/instancebase.h
+++ /dev/null
@@ -1,58 +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 INSTANCEBASE_H
-#define INSTANCEBASE_H
-
-#include <QObject>
-#include <QString>
-
-#include "../data/inifile.h"
-#include "instancemodel.h"
-
-class InstanceBase : public QObject, public InstanceModelItem
-{
-	friend class InstanceGroup;
-	Q_OBJECT
-public:
-	explicit InstanceBase(QString rootDir, QObject *parent = 0);
-	
-	QString getRootDir() const;
-	
-	QString getInstName() const;
-	void setInstName(QString name);
-	
-	QString getInstID() const;
-	
-	virtual IMI_type getModelItemType() const;
-	virtual InstanceModelItem* getParent() const;
-	virtual int numChildren() const;
-	virtual InstanceModelItem* getChild ( int index ) const;
-	virtual InstanceModel* getModel() const;
-	virtual QVariant data ( int column ) const;
-	virtual int getRow() const;
-	
-private:
-	void setGroup ( InstanceGroup* group )
-	{
-		currentGroup = group;
-	};
-	
-	QString rootDir;
-	INIFile config;
-	InstanceGroup * currentGroup;
-};
-
-#endif // INSTANCEBASE_H
diff --git a/data/instancemodel.cpp b/data/instancemodel.cpp
deleted file mode 100644
index fbdb8212..00000000
--- a/data/instancemodel.cpp
+++ /dev/null
@@ -1,457 +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 "instancemodel.h"
-
-#include <QString>
-
-#include <QDir>
-#include <QFile>
-#include <QDirIterator>
-#include <QTextStream>
-
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-
-#include "data/stdinstance.h"
-#include "util/pathutils.h"
-
-#define GROUP_FILE_FORMAT_VERSION 1
-
-InstanceModel::InstanceModel( QObject* parent ) :
-	QAbstractItemModel()
-{
-}
-
-InstanceModel::~InstanceModel()
-{
-	saveGroupInfo();
-	for(int i = 0; i < groups.size(); i++)
-	{
-		delete groups[i];
-	}
-}
-
-void InstanceModel::addInstance( InstanceBase* inst, const QString& groupName )
-{
-	auto group = getGroupByName(groupName);
-	group->addInstance(inst);
-}
-
-void InstanceGroup::addInstance ( InstanceBase* inst )
-{
-	instances.append(inst);
-	inst->setGroup(this);
-	// TODO: notify model.
-}
-
-
-void InstanceModel::initialLoad(QString dir)
-{
-	groupFileName = dir + "/instgroups.json";
-	implicitGroup = new InstanceGroup("Ungrouped", this);
-	groups.append(implicitGroup);
-	
-	// temporary map from instance ID to group name
-	QMap<QString, QString> groupMap;
-	
-	if (QFileInfo(groupFileName).exists())
-	{
-		QFile groupFile(groupFileName);
-		
-		if (!groupFile.open(QIODevice::ReadOnly))
-		{
-			// An error occurred. Ignore it.
-			qDebug("Failed to read instance group file.");
-			goto groupParseFail;
-		}
-		
-		QTextStream in(&groupFile);
-		QString jsonStr = in.readAll();
-		groupFile.close();
-		
-		QJsonParseError error;
-		QJsonDocument jsonDoc = QJsonDocument::fromJson(jsonStr.toUtf8(), &error);
-		
-		if (error.error != QJsonParseError::NoError)
-		{
-			qWarning(QString("Failed to parse instance group file: %1 at offset %2").
-					 arg(error.errorString(), QString::number(error.offset)).toUtf8());
-			goto groupParseFail;
-		}
-		
-		if (!jsonDoc.isObject())
-		{
-			qWarning("Invalid group file. Root entry should be an object.");
-			goto groupParseFail;
-		}
-		
-		QJsonObject rootObj = jsonDoc.object();
-		
-		// Make sure the format version matches.
-		if (rootObj.value("formatVersion").toVariant().toInt() == GROUP_FILE_FORMAT_VERSION)
-		{
-			// Get the group list.
-			if (!rootObj.value("groups").isObject())
-			{
-				qWarning("Invalid group list JSON: 'groups' should be an object.");
-				goto groupParseFail;
-			}
-			
-			// Iterate through the list.
-			QJsonObject groupList = rootObj.value("groups").toObject();
-			
-			for (QJsonObject::iterator iter = groupList.begin(); 
-				 iter != groupList.end(); iter++)
-			{
-				QString groupName = iter.key();
-				
-				// If not an object, complain and skip to the next one.
-				if (!iter.value().isObject())
-				{
-					qWarning(QString("Group '%1' in the group list should "
-									 "be an object.").arg(groupName).toUtf8());
-					continue;
-				}
-				
-				QJsonObject groupObj = iter.value().toObject();
-				
-				// Create the group object.
-				InstanceGroup *group = new InstanceGroup(groupName, this);
-				groups.push_back(group);
-				
-				// If 'hidden' isn't a bool value, just assume it's false.
-				if (groupObj.value("hidden").isBool() && groupObj.value("hidden").toBool())
-				{
-					group->setHidden(groupObj.value("hidden").toBool());
-				}
-				
-				if (!groupObj.value("instances").isArray())
-				{
-					qWarning(QString("Group '%1' in the group list is invalid. "
-									 "It should contain an array "
-									 "called 'instances'.").arg(groupName).toUtf8());
-					continue;
-				}
-				
-				// Iterate through the list of instances in the group.
-				QJsonArray instancesArray = groupObj.value("instances").toArray();
-				
-				for (QJsonArray::iterator iter2 = instancesArray.begin(); 
-					 iter2 != instancesArray.end(); iter2++)
-				{
-					groupMap[(*iter2).toString()] = groupName;
-				}
-			}
-		}
-	}
-	
-groupParseFail:
-	
-	qDebug("Loading instances");
-	QDir instDir(dir);
-	QDirIterator iter(instDir);
-	
-	while (iter.hasNext())
-	{
-		QString subDir = iter.next();
-		if (QFileInfo(PathCombine(subDir, "instance.cfg")).exists())
-		{
-			// TODO Differentiate between different instance types.
-			InstanceBase* inst = new StdInstance(subDir);
-			QString instID = inst->getInstID();
-			auto iter = groupMap.find(instID);
-			if(iter != groupMap.end())
-			{
-				addInstance(inst,iter.value());
-			}
-			else
-			{
-				addInstance(inst);
-			}
-		}
-	}
-}
-
-int InstanceModel::columnCount ( const QModelIndex& parent ) const
-{
-	// for now...
-	return 1;
-}
-
-QVariant InstanceModel::data ( const QModelIndex& index, int role ) const
-{
-	if (!index.isValid())
-		return QVariant();
-
-	if (role != Qt::DisplayRole)
-		return QVariant();
-
-	InstanceModelItem *item = static_cast<InstanceModelItem*>(index.internalPointer());
-
-	return item->data(index.column());
-}
-
-QModelIndex InstanceModel::index ( int row, int column, const QModelIndex& parent ) const
-{
-	if (!hasIndex(row, column, parent))
-		return QModelIndex();
-	
-	InstanceModelItem *parentItem;
-
-	if (!parent.isValid())
-		parentItem = (InstanceModelItem *) this;
-	else
-		parentItem = static_cast<InstanceModelItem*>(parent.internalPointer());
-
-	InstanceModelItem *childItem = parentItem->getChild(row);
-	if (childItem)
-		return createIndex(row, column, childItem);
-	else
-		return QModelIndex();
-	
-}
-
-QModelIndex InstanceModel::parent ( const QModelIndex& index ) const
-{
-	if (!index.isValid())
-		return QModelIndex();
-
-	InstanceModelItem *childItem = static_cast<InstanceModelItem*>(index.internalPointer());
-	InstanceModelItem *parentItem = childItem->getParent();
-
-	if (parentItem == this)
-		return QModelIndex();
-
-	return createIndex(parentItem->getRow(), 0, parentItem);
-}
-
-int InstanceModel::rowCount ( const QModelIndex& parent ) const
-{
-	InstanceModelItem *parentItem;
-	if (parent.column() > 0)
-		return 0;
-
-	if (!parent.isValid())
-		parentItem = (InstanceModelItem*) this;
-	else
-		parentItem = static_cast<InstanceModelItem*>(parent.internalPointer());
-
-	return parentItem->numChildren();
-}
-
-bool InstanceModel::saveGroupInfo() const
-{
-	/*
-	using namespace boost::property_tree;
-	ptree pt;
-
-	pt.put<int>("formatVersion", GROUP_FILE_FORMAT_VERSION);
-
-	try
-	{
-		typedef QMap<InstanceGroup *, QVector<InstanceBase*> > GroupListMap;
-
-		GroupListMap groupLists;
-		for (auto iter = instances.begin(); iter != instances.end(); iter++)
-		{
-			InstanceGroup *group = getInstanceGroup(*iter);
-			
-			if (group != nullptr)
-				groupLists[group].push_back(*iter);
-		}
-
-		ptree groupsPtree;
-		for (auto iter = groupLists.begin(); iter != groupLists.end(); iter++)
-		{
-			auto group = iter.key();
-			auto & gList = iter.value();
-
-			ptree groupTree;
-
-			groupTree.put<bool>("hidden", group->isHidden());
-
-			ptree instList;
-			for (auto iter2 = gList.begin(); iter2 != gList.end(); iter2++)
-			{
-				std::string instID((*iter2)->getInstID().toUtf8());
-				instList.push_back(std::make_pair("", ptree(instID)));
-			}
-			groupTree.put_child("instances", instList);
-
-			groupsPtree.push_back(std::make_pair(std::string(group->getName().toUtf8()), groupTree));
-		}
-		pt.put_child("groups", groupsPtree);
-
-		write_json(groupFile.toStdString(), pt);
-	}
-	catch (json_parser_error e)
-	{
-// 		wxLogError(_("Failed to read group list.\nJSON parser error at line %i: %s"), 
-// 			e.line(), wxStr(e.message()).c_str());
-		return false;
-	}
-	catch (ptree_error e)
-	{
-// 		wxLogError(_("Failed to save group list. Unknown ptree error."));
-		return false;
-	}
-
-	return true;
-	*/
-	return false;
-}
-
-void InstanceModel::setInstanceGroup ( InstanceBase* inst, const QString& groupName )
-{
-	/*
-	InstanceGroup *prevGroup = getInstanceGroup(inst);
-
-	if (prevGroup != nullptr)
-	{
-		groupsMap.remove(inst);
-	}
-
-	if (!groupName.isEmpty())
-	{
-		InstanceGroup *newGroup = nullptr;
-
-		for (auto iter = root->groups.begin(); iter != root->groups.end(); iter++)
-		{
-			if ((*iter)->getName() == groupName)
-			{
-				newGroup = *iter;
-			}
-		}
-
-		if (newGroup == nullptr)
-		{
-			newGroup = new InstanceGroup(groupName, this);
-			root->groups.push_back(newGroup);
-		}
-
-		groupsMap[inst] = newGroup;
-	}
-
-	// TODO: propagate change, reflect in model, etc.
-	//InstanceGroupChanged(inst);
-	*/
-}
-
-InstanceGroup* InstanceModel::getGroupByName ( const QString& name ) const
-{
-	for (auto iter = groups.begin(); iter != groups.end(); iter++)
-	{
-		if ((*iter)->getName() == name)
-			return *iter;
-	}
-	return nullptr;
-}
-/*
-void InstanceModel::setGroupFile ( QString filename )
-{
-	groupFile = filename;
-}*/
-
-int InstanceModel::numChildren() const
-{
-	return groups.count();
-}
-
-InstanceModelItem* InstanceModel::getChild ( int index ) const
-{
-	return groups[index];
-}
-
-QVariant InstanceModel::data ( int role ) const
-{
-	switch(role)
-	{
-		case Qt::DisplayRole:
-			return "name";
-	}
-	return QVariant();
-}
-
-
-InstanceGroup::InstanceGroup(const QString& name, InstanceModel *parent)
-{
-	this->name = name;
-	this->model = parent;
-	this->hidden = false;
-}
-
-InstanceGroup::~InstanceGroup()
-{
-	for(int i = 0; i < instances.size(); i++)
-	{
-		delete instances[i];
-	}
-}
-
-
-QString InstanceGroup::getName() const
-{
-	return name;
-}
-
-void InstanceGroup::setName(const QString& name)
-{
-	this->name = name;
-	//TODO: propagate change
-}
-
-InstanceModelItem* InstanceGroup::getParent() const
-{
-	return model;
-}
-
-bool InstanceGroup::isHidden() const
-{
-	return hidden;
-}
-
-void InstanceGroup::setHidden(bool hidden)
-{
-	this->hidden = hidden;
-	//TODO: propagate change
-}
-
-int InstanceGroup::getRow() const
-{
-	return model->getIndexOf( this);
-}
-
-InstanceModelItem* InstanceGroup::getChild ( int index ) const
-{
-	return instances[index];
-}
-
-int InstanceGroup::numChildren() const
-{
-	return instances.size();
-}
-
-QVariant InstanceGroup::data ( int role ) const
-{
-	switch(role)
-	{
-		case Qt::DisplayRole:
-			return name;
-		default:
-			return QVariant();
-	}
-}
diff --git a/data/instancemodel.h b/data/instancemodel.h
deleted file mode 100644
index 4bd34831..00000000
--- a/data/instancemodel.h
+++ /dev/null
@@ -1,137 +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 <QList>
-#include <QMap>
-#include <QSet>
-#include <qabstractitemmodel.h>
-
-enum IMI_type
-{
-	IMI_Root,
-	IMI_Group,
-	IMI_Instance
-};
-
-class InstanceModel;
-class InstanceGroup;
-class InstanceBase;
-
-class InstanceModelItem
-{
-	public:
-	virtual IMI_type getModelItemType() const = 0;
-	virtual InstanceModelItem * getParent() const = 0;
-	virtual int numChildren() const = 0;
-	virtual InstanceModelItem * getChild(int index) const = 0;
-	virtual InstanceModel * getModel() const = 0;
-	virtual QVariant data(int role) const = 0;
-	virtual int getRow() const = 0;
-};
-
-class InstanceGroup : public InstanceModelItem
-{
-public:
-	InstanceGroup(const QString& name, InstanceModel * model);
-	~InstanceGroup();
-	
-	QString getName() const;
-	void setName(const QString& name);
-
-	bool isHidden() const;
-	void setHidden(bool hidden);
-
-	virtual IMI_type getModelItemType() const
-	{
-		return IMI_Group;
-	}
-	virtual InstanceModelItem* getParent() const;
-	virtual InstanceModelItem* getChild ( int index ) const;
-	virtual int numChildren() const;
-	virtual InstanceModel * getModel() const
-	{
-		return model;
-	};
-	virtual QVariant data ( int column ) const;
-	int getIndexOf(InstanceBase * inst)
-	{
-		return instances.indexOf(inst);
-	};
-	virtual int getRow() const;
-	void addInstance ( InstanceBase* inst );
-protected:
-	QString name;
-	InstanceModel * model;
-	QVector<InstanceBase*> instances;
-	bool hidden;
-	int row;
-};
-
-class InstanceModel : public QAbstractItemModel, public InstanceModelItem
-{
-public:
-	explicit InstanceModel(QObject *parent = 0);
-	~InstanceModel();
-	
-	virtual int columnCount ( const QModelIndex& parent = QModelIndex() ) const;
-	virtual QVariant data ( const QModelIndex& index, int role = Qt::DisplayRole ) const;
-	virtual QModelIndex index ( int row, int column, const QModelIndex& parent = QModelIndex() ) const;
-	virtual QModelIndex parent ( const QModelIndex& child ) const;
-	virtual int rowCount ( const QModelIndex& parent = QModelIndex() ) const;
-	
-	void addInstance(InstanceBase *inst, const QString& groupName = "Ungrouped");
-	void setInstanceGroup(InstanceBase *inst, const QString & groupName);
-	InstanceGroup* getGroupByName(const QString & name) const;
-	
-	void initialLoad(QString dir);
-	bool saveGroupInfo() const;
-	
-	virtual IMI_type getModelItemType() const
-	{
-		return IMI_Root;
-	}
-	virtual InstanceModelItem * getParent() const 
-	{
-		return nullptr;
-	};
-	virtual int numChildren() const;
-	virtual InstanceModelItem* getChild ( int index ) const;
-	virtual InstanceModel* getModel() const
-	{
-		return nullptr;
-	};
-	virtual QVariant data ( int column ) const;
-	int getIndexOf(const InstanceGroup * grp) const
-	{
-		return groups.indexOf((InstanceGroup *) grp);
-	};
-	virtual int getRow() const
-	{
-		return 0;
-	};
-signals:
-	
-public slots:
-	
-private:
-	QString groupFileName;
-	QVector<InstanceGroup*> groups;
-	InstanceGroup * implicitGroup;
-};
-
-#endif // INSTANCELIST_H
diff --git a/data/plugin/pluginmanager.cpp b/data/plugin/pluginmanager.cpp
new file mode 100644
index 00000000..2f066293
--- /dev/null
+++ b/data/plugin/pluginmanager.cpp
@@ -0,0 +1,105 @@
+/* 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 Lic