summaryrefslogtreecommitdiffstats
path: root/MultiMC.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-02 01:09:28 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:17 +0200
commitd313e9ab09639346526b75c92498188753cb5b87 (patch)
tree1df78fb6150b77a705b48aa3af0a845131000309 /MultiMC.cpp
parent382ae78a0bf75892827321b052c6afbd195476bc (diff)
downloadMultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar
MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.gz
MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.lz
MultiMC-d313e9ab09639346526b75c92498188753cb5b87.tar.xz
MultiMC-d313e9ab09639346526b75c92498188753cb5b87.zip
SCRATCH remove remaining references to MultiMC.h and fix legacy LWJGL
Diffstat (limited to 'MultiMC.cpp')
-rw-r--r--MultiMC.cpp7
1 files changed, 6 insertions, 1 deletions
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;
}