From d313e9ab09639346526b75c92498188753cb5b87 Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Mon, 2 Feb 2015 01:09:28 +0100
Subject: SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL

---
 MultiMC.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'MultiMC.cpp')

diff --git a/MultiMC.cpp b/MultiMC.cpp
index 80a4593c..e3319c9a 100644
--- a/MultiMC.cpp
+++ b/MultiMC.cpp
@@ -392,7 +392,7 @@ void MultiMC::initGlobalSettings(bool test_mode)
 	}
 	m_settings->registerSetting("ConsoleFontSize", defaultSize);
 
-	FTBPlugin::initialize();
+	FTBPlugin::initialize(m_settings);
 
 	// Folders
 	m_settings->registerSetting("InstanceDir", "instances");
@@ -467,6 +467,7 @@ std::shared_ptr<LWJGLVersionList> MultiMC::lwjgllist()
 	if (!m_lwjgllist)
 	{
 		m_lwjgllist.reset(new LWJGLVersionList());
+		ENV.registerVersionList("org.lwjgl.legacy", m_lwjgllist);
 	}
 	return m_lwjgllist;
 }
@@ -476,6 +477,7 @@ std::shared_ptr<ForgeVersionList> MultiMC::forgelist()
 	if (!m_forgelist)
 	{
 		m_forgelist.reset(new ForgeVersionList());
+		ENV.registerVersionList("net.minecraftforge", m_forgelist);
 	}
 	return m_forgelist;
 }
@@ -485,6 +487,7 @@ std::shared_ptr<LiteLoaderVersionList> MultiMC::liteloaderlist()
 	if (!m_liteloaderlist)
 	{
 		m_liteloaderlist.reset(new LiteLoaderVersionList());
+		ENV.registerVersionList("com.mumfrey.liteloader", m_liteloaderlist);
 	}
 	return m_liteloaderlist;
 }
@@ -494,6 +497,7 @@ std::shared_ptr<MinecraftVersionList> MultiMC::minecraftlist()
 	if (!m_minecraftlist)
 	{
 		m_minecraftlist.reset(new MinecraftVersionList());
+		ENV.registerVersionList("net.minecraft", m_liteloaderlist);
 	}
 	return m_minecraftlist;
 }
@@ -503,6 +507,7 @@ std::shared_ptr<JavaVersionList> MultiMC::javalist()
 	if (!m_javalist)
 	{
 		m_javalist.reset(new JavaVersionList());
+		ENV.registerVersionList("com.java", m_liteloaderlist);
 	}
 	return m_javalist;
 }
-- 
cgit