Show texture/resource packs when appropriate.

10 files changed, 141 insertions, 102 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93b91a20..bdfe835b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,6 +297,8 @@ SET(MULTIMC_SOURCES
 	gui/pagedialog/PageDialog_p.h
 	gui/pages/VersionPage.cpp
 	gui/pages/VersionPage.h
+	gui/pages/TexturePackPage.h
+	gui/pages/ResourcePackPage.h
 	gui/pages/ModFolderPage.cpp
 	gui/pages/ModFolderPage.h
 	gui/pages/LegacyUpgradePage.cpp
diff --git a/gui/pagedialog/PageDialog.cpp b/gui/pagedialog/PageDialog.cpp
index f71cfdcc..1169af2c 100644
--- a/gui/pagedialog/PageDialog.cpp
+++ b/gui/pagedialog/PageDialog.cpp
@@ -40,14 +40,13 @@ public:
 protected:
 	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
 	{
-		// Regular contents check, then check page-filter.
-		if (QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent))
-			return true;
-
 		const QString pattern = filterRegExp().pattern();
 		const auto model = static_cast<PageModel *>(sourceModel());
 		const auto page = model->pages().at(sourceRow);
-		return page->shouldDisplay();
+		if(!page->shouldDisplay())
+			return false;
+		// Regular contents check, then check page-filter.
+		return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
 	}
 };
 
@@ -92,7 +91,7 @@ void PageDialog::createUI()
 	m_filter = new QLineEdit;
 	m_pageList = new PageView;
 	m_header = new QLabel();
-	m_iconHeader = new IconLabel(this, QIcon::fromTheme("bug"), QSize(24,24));
+	m_iconHeader = new IconLabel(this, QIcon(), QSize(24,24));
 
 	QFont headerLabelFont = m_header->font();
 	headerLabelFont.setBold(true);
@@ -125,7 +124,7 @@ void PageDialog::createUI()
 	mainGridLayout->addLayout(headerHLayout, 0, 1, 1, 1);
 	mainGridLayout->addWidget(m_pageList, 0, 0, 2, 1);
 	mainGridLayout->addLayout(m_pageStack, 1, 1, 1, 1);
-	mainGridLayout->addWidget(buttons, 2, 0, 1, 2);
+	//mainGridLayout->addWidget(buttons, 2, 0, 1, 2);
 	mainGridLayout->setColumnStretch(1, 4);
 	setLayout(mainGridLayout);
 }
diff --git a/gui/pages/LegacyUpgradePage.ui b/gui/pages/LegacyUpgradePage.ui
index 43c3eeda..8d676eae 100644
--- a/gui/pages/LegacyUpgradePage.ui
+++ b/gui/pages/LegacyUpgradePage.ui
@@ -47,7 +47,7 @@ p, li { white-space: pre-wrap; }
    <item>
     <widget class="QCommandLinkButton" name="upgradeButton">
      <property name="text">
-      <string>Start the upgrade!</string>
+      <string>Start the upgrade! (Not Yet Implemented, Coming Soon™)</string>
      </property>
     </widget>
    </item>
diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp
index 359e71c4..74c3c2af 100644
--- a/gui/pages/VersionPage.cpp
+++ b/gui/pages/VersionPage.cpp
@@ -368,7 +368,8 @@ void VersionPage::versionCurrent(const QModelIndex &current, const QModelIndex &
 		ui->moveLibraryDownBtn->setEnabled(enabled);
 		ui->moveLibraryUpBtn->setEnabled(enabled);
 	}
-	if(m_version->versionFileId(current.row()) == "net.minecraft")
+	QString selectedId = m_version->versionFileId(current.row());
+	if(selectedId == "net.minecraft" || selectedId == "org.multimc.custom.json")
 	{
 		ui->changeMCVersionBtn->setEnabled(true);
 	}
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h
index bdd2f1be..2eba1fff 100644
--- a/logic/BaseInstance.h
+++ b/logic/BaseInstance.h
@@ -25,6 +25,7 @@
 #include "logic/BaseVersionList.h"
 #include "logic/auth/MojangAccount.h"
 
+class ModList;
 class QDialog;
 class QDir;
 class Task;
@@ -110,6 +111,19 @@ public:
 	virtual bool shouldUpdate() const = 0;
 	virtual void setShouldUpdate(bool val) = 0;
 
+	//////  Mod Lists  //////
+	virtual std::shared_ptr<ModList> resourcePackList()
+	{
+		return nullptr;
+	}
+	virtual std::shared_ptr<ModList> texturePackList()
+	{
+		return nullptr;
+	}
+	
+	/// Traits. Normally inside the version, depends on instance implementation.
+	virtual QSet <QString> traits() = 0;
+
 	/// Get the curent base jar of this instance. By default, it's the
 	/// versions/$version/$version.jar
 	QString baseJar() const;
diff --git a/logic/LegacyInstance.cpp b/logic/LegacyInstance.cpp
index 8603022a..15332c41 100644
--- a/logic/LegacyInstance.cpp
+++ b/logic/LegacyInstance.cpp
@@ -31,6 +31,7 @@
 #include "gui/pages/LegacyUpgradePage.h"
 #include "gui/pages/ModFolderPage.h"
 #include "gui/pages/LegacyJarModPage.h"
+#include <gui/pages/TexturePackPage.h>
 
 LegacyInstance::LegacyInstance(const QString &rootDir, SettingsObject *settings,
 							   QObject *parent)
@@ -50,7 +51,7 @@ QList<BasePage *> LegacyInstance::getPages()
 	values.append(new LegacyJarModPage(this));
 	values.append(new ModFolderPage(loaderModList(), "mods", "centralmods", tr("Loader Mods")));
 	values.append(new ModFolderPage(coreModList(), "coremods", "viewfolder", tr("Core Mods")));
-	values.append(new ModFolderPage(texturePackList(), "texturepacks", "viewfolder", tr("Texture Packs")));
+	values.append(new TexturePackPage(this));
 	return values;
 }
 
diff --git a/logic/LegacyInstance.h b/logic/LegacyInstance.h
index 82dd4fee..d367b990 100644
--- a/logic/LegacyInstance.h
+++ b/logic/LegacyInstance.h
@@ -80,6 +80,11 @@ public:
 		return false;
 	}
 
+	virtual QSet<QString> traits()
+	{
+		return {"legacy-instance", "texturepacks"};
+	};
+
 	virtual bool shouldUpdate() const override;
 	virtual void setShouldUpdate(bool val) override;
 	virtual std::shared_ptr<Task> doUpdate() override;
diff --git a/logic/OneSixInstance.cpp b/logic/OneSixInstance.cpp
index 58781c15..d306470c 100644
--- a/logic/OneSixInstance.cpp
+++ b/logic/OneSixInstance.cpp
@@ -32,6 +32,8 @@
 #include "gui/pagedialog/PageDialog.h"
 #include "gui/pages/VersionPage.h"
 #include <gui/pages/ModFolderPage.h>
+#include <gui/pages/ResourcePackPage.h>
+#include <gui/pages/TexturePackPage.h>
 
 OneSixInstance::OneSixInstance(const QString &rootDir, SettingsObject *settings,
 							   QObject *parent)
@@ -60,8 +62,8 @@ QList<BasePage *> OneSixInstance::getPages()
 	values.append(new VersionPage(this));
 	values.append(new ModFolderPage(loaderModList(), "mods", "centralmods", tr("Loader Mods")));
 	values.append(new ModFolderPage(coreModList(), "coremods", "viewfolder", tr("Core Mods")));
-	values.append(new ModFolderPage(resourcePackList(), "resourcepacks", "viewfolder", tr("Resource Packs")));
-	values.append(new ModFolderPage(texturePackList(), "texturepacks", "viewfolder", tr("Texture Packs")));
+	values.append(new ResourcePackPage(this));
+	values.append(new TexturePackPage(this));
 	return values;
 }
 
@@ -70,6 +72,17 @@ QString OneSixInstance::dialogTitle()
 	return tr("Edit Instance (%1)").arg(name());
 }
 
+QSet<QString> OneSixInstance::traits()
+{
+	auto version = getFullVersion();
+	if (!version)
+	{
+		return {"version-incomplete"};
+	}
+	else
+		return version->traits;
+}
+
 std::shared_ptr<Task> OneSixInstance::doUpdate()
 {
 	return std::shared_ptr<Task>(new OneSixUpdate(this));
@@ -234,11 +247,11 @@ bool OneSixInstance::prepareForLaunch(AuthSessionPtr session, QString &launchScr
 		}
 		launchScript += "cp " + versionsPath().absoluteFilePath(minecraftjarpath) + "\n";
 	}
-	if(!version->mainClass.isEmpty())
+	if (!version->mainClass.isEmpty())
 	{
 		launchScript += "mainClass " + version->mainClass + "\n";
 	}
-	if(!version->appletClass.isEmpty())
+	if (!version->appletClass.isEmpty())
 	{
 		launchScript += "appletClass " + version->appletClass + "\n";
 	}
@@ -261,7 +274,7 @@ bool OneSixInstance::prepareForLaunch(AuthSessionPtr session, QString &launchScr
 		launchScript += "windowTitle " + windowTitle() + "\n";
 		launchScript += "windowParams " + windowParams + "\n";
 	}
-	
+
 	// legacy auth
 	{
 		launchScript += "userName " + session->player_name + "\n";
@@ -278,7 +291,7 @@ bool OneSixInstance::prepareForLaunch(AuthSessionPtr session, QString &launchScr
 		}
 		launchScript += "natives " + natives_dir.absolutePath() + "\n";
 	}
-	
+
 	// traits. including legacyLaunch and others ;)
 	for (auto trait : version->traits)
 	{
@@ -398,9 +411,8 @@ void OneSixInstance::reloadVersion()
 		d->m_flags.remove(VersionBrokenFlag);
 		emit versionReloaded();
 	}
-	catch (VersionIncomplete & error)
+	catch (VersionIncomplete &error)
 	{
-		
 	}
 	catch (MMCError &error)
 	{
@@ -532,7 +544,6 @@ QString OneSixInstance::texturePacksDir() const
 	return PathCombine(minecraftRoot(), "texturepacks");
 }
 
-
 QString OneSixInstance::instanceConfigFolder() const
 {
 	return PathCombine(minecraftRoot(), "config");
diff --git a/logic/OneSixInstance.h b/logic/OneSixInstance.h
index fa98ccf0..405cfe97 100644
--- a/logic/OneSixInstance.h
+++ b/logic/OneSixInstance.h
@@ -38,9 +38,11 @@ public:
 	//////  Mod Lists  //////
 	std::shared_ptr<ModList> loaderModList();
 	std::shared_ptr<ModList> coreModList();
-	std::shared_ptr<ModList> resourcePackList();
-	std::shared_ptr<ModList> texturePackList();
+	std::shared_ptr<ModList> resourcePackList() override;
+	std::shared_ptr<ModList> texturePackList() override;
 
+	virtual QSet<QString> traits();
+	
 	////// Directories and files //////
 	QString jarModsDir() const;
 	QString resourcePacksDir() const;
diff --git a/resources/versions/minecraft.json b/resources/versions/minecraft.json
index d543383c..58b153c2 100644
--- a/resources/versions/minecraft.json
+++ b/resources/versions/minecraft.json
@@ -6,7 +6,7 @@
 		"releaseTime": "2013-04-25T17:45:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.5.1",
@@ -14,7 +14,7 @@
 		"releaseTime": "2013-03-20T12:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.5",
@@ -22,7 +22,7 @@
 		"releaseTime": "2013-03-07T00:00:00+02:00",
 		"type": "snapshot",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.7",
@@ -30,7 +30,7 @@
 		"releaseTime": "2012-12-28T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.6",
@@ -38,7 +38,7 @@
 		"releaseTime": "2012-12-20T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.5",
@@ -46,7 +46,7 @@
 		"releaseTime": "2012-11-20T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.4",
@@ -54,7 +54,7 @@
 		"releaseTime": "2012-11-14T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.3",
@@ -62,7 +62,7 @@
 		"releaseTime": "2012-11-01T00:00:00+02:00",
 		"type": "snapshot",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.2",
@@ -70,7 +70,7 @@
 		"releaseTime": "2012-10-25T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4.1",
@@ -78,7 +78,7 @@
 		"releaseTime": "2012-10-23T00:00:00+02:00",
 		"type": "snapshot",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.4",
@@ -86,7 +86,7 @@
 		"releaseTime": "2012-10-19T00:00:00+02:00",
 		"type": "snapshot",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.3.2",
@@ -94,7 +94,7 @@
 		"releaseTime": "2012-08-16T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.3.1",
@@ -102,7 +102,7 @@
 		"releaseTime": "2012-08-01T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.3",
@@ -110,7 +110,7 @@
 		"releaseTime": "2012-07-26T00:00:00+02:00",
 		"type": "snapshot",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.2.5",
@@ -118,7 +118,7 @@
 		"releaseTime": "2012-03-30T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.2.4",
@@ -126,7 +126,7 @@
 		"releaseTime": "2012-03-22T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.2.3",
@@ -134,7 +134,7 @@
 		"releaseTime": "2012-03-02T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.2.2",
@@ -142,7 +142,7 @@
 		"releaseTime": "2012-03-01T00:00:01+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.2.1",
@@ -150,7 +150,7 @@
 		"releaseTime": "2012-03-01T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.1",
@@ -158,7 +158,7 @@
 		"releaseTime": "2012-01-12T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "1.0",
@@ -166,7 +166,7 @@
 		"releaseTime": "2011-11-18T00:00:00+02:00",
 		"type": "release",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.8.1",
@@ -174,7 +174,7 @@
 		"releaseTime": "2011-09-19T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.8",
@@ -182,7 +182,7 @@
 		"releaseTime": "2011-09-15T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.7.3",
@@ -190,7 +190,7 @@
 		"releaseTime": "2011-07-08T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.7.2",
@@ -198,7 +198,7 @@
 		"releaseTime": "2011-07-01T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.7",
@@ -206,7 +206,7 @@
 		"releaseTime": "2011-06-30T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.6",
@@ -214,7 +214,7 @@
 		"releaseTime": "2011-05-31T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.5",
@@ -222,7 +222,7 @@
 		"releaseTime": "2011-05-28T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.4",
@@ -230,7 +230,7 @@
 		"releaseTime": "2011-05-26T00:00:04+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.3",
@@ -238,7 +238,7 @@
 		"releaseTime": "2011-05-26T00:00:03+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.2",
@@ -246,7 +246,7 @@
 		"releaseTime": "2011-05-26T00:00:02+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6.1",
@@ -254,7 +254,7 @@
 		"releaseTime": "2011-05-26T00:00:01+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.6",
@@ -262,7 +262,7 @@
 		"releaseTime": "2011-05-26T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.5_01",
@@ -270,7 +270,7 @@
 		"releaseTime": "2011-04-20T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.5",
@@ -278,7 +278,7 @@
 		"releaseTime": "2011-04-19T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.4_01",
@@ -286,7 +286,7 @@
 		"releaseTime": "2011-04-05T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.4",
@@ -294,7 +294,7 @@
 		"releaseTime": "2011-03-31T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.3_01",
@@ -302,7 +302,7 @@
 		"releaseTime": "2011-02-23T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.3b",
@@ -310,7 +310,7 @@
 		"releaseTime": "2011-02-22T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.2_02",
@@ -318,7 +318,7 @@
 		"releaseTime": "2011-01-21T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.2_01",
@@ -326,7 +326,7 @@
 		"releaseTime": "2011-01-14T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.2",
@@ -334,7 +334,7 @@
 		"releaseTime": "2011-01-13T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.1_02",
@@ -342,7 +342,7 @@
 		"releaseTime": "2010-12-22T00:00:01+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.1_01",
@@ -350,7 +350,7 @@
 		"releaseTime": "2010-12-22T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.0.2",
@@ -358,7 +358,7 @@
 		"releaseTime": "2010-12-21T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.0_01",
@@ -366,7 +366,7 @@
 		"releaseTime": "2010-12-20T00:00:01+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "b1.0",
@@ -374,7 +374,7 @@
 		"releaseTime": "2010-12-20T00:00:00+02:00",
 		"type": "old_beta",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.6",
@@ -382,7 +382,7 @@
 		"releaseTime": "2010-12-03T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.5",
@@ -390,7 +390,7 @@
 		"releaseTime": "2010-12-01T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.4_01",
@@ -398,7 +398,7 @@
 		"releaseTime": "2010-11-30T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.3_04",
@@ -406,7 +406,7 @@
 		"releaseTime": "2010-11-26T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.3_02",
@@ -414,7 +414,7 @@
 		"releaseTime": "2010-11-25T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.3_01",
@@ -422,7 +422,7 @@
 		"releaseTime": "2010-11-24T00:00:01+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.3",
@@ -430,7 +430,7 @@
 		"releaseTime": "2010-11-24T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.2b",
@@ -438,7 +438,7 @@
 		"releaseTime": "2010-11-10T00:00:01+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.2a",
@@ -446,7 +446,7 @@
 		"releaseTime": "2010-11-10T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "texturepacks"]
 	},
 	{
 		"id": "a1.2.1_01",
@@ -454,7 +454,7 @@
 		"releaseTime": "2010-11-05T00:00:01+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.2.1",
@@ -462,7 +462,7 @@
 		"releaseTime": "2010-11-05T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.2.0_02",
@@ -470,7 +470,7 @@
 		"releaseTime": "2010-11-04T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.2.0_01",
@@ -478,7 +478,7 @@
 		"releaseTime": "2010-10-31T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.2.0",
@@ -486,7 +486,7 @@
 		"releaseTime": "2010-10-30T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.1.2_01",
@@ -494,7 +494,7 @@
 		"releaseTime": "2010-09-23T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.1.2",
@@ -502,7 +502,7 @@
 		"releaseTime": "2010-09-20T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.1.0",
@@ -510,7 +510,7 @@
 		"releaseTime": "2010-09-13T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.17_04",
@@ -518,7 +518,7 @@
 		"releaseTime": "2010-08-23T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.17_02",
@@ -526,7 +526,7 @@
 		"releaseTime": "2010-08-20T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.16",
@@ -534,7 +534,7 @@
 		"releaseTime": "2010-08-12T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.15",
@@ -542,7 +542,7 @@
 		"releaseTime": "2010-08-04T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.14",
@@ -550,7 +550,7 @@
 		"releaseTime": "2010-07-30T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.11",
@@ -558,7 +558,7 @@
 		"releaseTime": "2010-07-23T00:00:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.5_01",
@@ -567,7 +567,7 @@
 		"type": "old_alpha",
 		"processArguments": "legacy",
 		"mainClass": "y",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "a1.0.4",
@@ -576,7 +576,7 @@
 		"type": "old_alpha",
 		"processArguments": "legacy",
 		"mainClass": "ax",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "inf-20100618",
@@ -586,7 +586,7 @@
 		"processArguments": "legacy",
 		"mainClass": "net.minecraft.client.d",
 		"appletClass": "net.minecraft.client.MinecraftApplet",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "c0.30_01c",
@@ -596,7 +596,7 @@
 		"processArguments": "legacy",
 		"mainClass": "com.mojang.minecraft.l",
 		"appletClass": "com.mojang.minecraft.MinecraftApplet",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "c0.0.13a_03",
@@ -606,7 +606,7 @@
 		"processArguments": "legacy",
 		"mainClass": "com.mojang.minecraft.c",
 		"appletClass": "com.mojang.minecraft.MinecraftApplet",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "c0.0.13a",
@@ -616,7 +616,7 @@
 		"processArguments": "legacy",
 		"mainClass": "com.mojang.minecraft.Minecraft",
 		"appletClass": "com.mojang.minecraft.MinecraftApplet",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "c0.0.11a",
@@ -626,7 +626,7 @@
 		"processArguments": "legacy",
 		"mainClass": "com.mojang.minecraft.Minecraft",
 		"appletClass": "com.mojang.minecraft.MinecraftApplet",
-		"+traits": ["legacyLaunch"]
+		"+traits": ["legacyLaunch", "no-texturepacks"]
 	},
 	{
 		"id": "rd-161348",
@@ -634,7 +634,8 @@
 		"releaseTime": "2009-05-16T13:48:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"mainClass": "com.mojang.minecraft.RubyDung"
+		"mainClass": "com.mojang.minecraft.RubyDung",
+		"+traits": ["no-texturepacks"]
 	},
 	{
 		"id": "rd-160052",
@@ -642,7 +643,8 @@
 		"releaseTime": "2009-05-16T00:52:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"mainClass": "com.mojang.rubydung.RubyDung"
+		"mainClass": "com.mojang.rubydung.RubyDung",
+		"+traits": ["no-texturepacks"]
 	},
 	{
 		"id": "rd-132328",
@@ -650,7 +652,8 @@
 		"releaseTime": "2009-05-13T23:28:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"mainClass": "com.mojang.rubydung.RubyDung"
+		"mainClass": "com.mojang.rubydung.RubyDung",
+		"+traits": ["no-texturepacks"]
 	},
 	{
 		"id": "rd-132211",
@@ -658,7 +661,8 @@
 		"releaseTime": "2009-05-13T22:11:00+02:00",
 		"type": "old_alpha",
 		"processArguments": "legacy",
-		"mainClass": "com.mojang.rubydung.RubyDung"
+		"mainClass": "com.mojang.rubydung.RubyDung",
+		"+traits": ["no-texturepacks"]
 	}
 ]
 }