From 223a7aba7bfa6019d8a2cfa5e8f8a4791a96d136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 8 Jun 2014 19:01:19 +0200 Subject: [PATCH] Hardcode LWJGL 2.9.1 for OneSix, only allow chancging Minecraft versions for now. --- gui/pages/VersionPage.cpp | 8 ++++++++ logic/minecraft/VersionBuilder.cpp | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/gui/pages/VersionPage.cpp b/gui/pages/VersionPage.cpp index cc728e755..359e71c46 100644 --- a/gui/pages/VersionPage.cpp +++ b/gui/pages/VersionPage.cpp @@ -368,4 +368,12 @@ void VersionPage::versionCurrent(const QModelIndex ¤t, const QModelIndex & ui->moveLibraryDownBtn->setEnabled(enabled); ui->moveLibraryUpBtn->setEnabled(enabled); } + if(m_version->versionFileId(current.row()) == "net.minecraft") + { + ui->changeMCVersionBtn->setEnabled(true); + } + else + { + ui->changeMCVersionBtn->setEnabled(false); + } } diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp index 29418fe38..ddcf63337 100644 --- a/logic/minecraft/VersionBuilder.cpp +++ b/logic/minecraft/VersionBuilder.cpp @@ -185,7 +185,8 @@ void VersionBuilder::buildFromMultilayer() minecraftPatch->setOrder(-2); m_version->VersionPatches.append(minecraftPatch); - QResource LWJGL(":/versions/LWJGL/2.9.0.json"); + // TODO: this is obviously fake. + QResource LWJGL(":/versions/LWJGL/2.9.1.json"); auto lwjgl = parseJsonFile(LWJGL.absoluteFilePath(), false, false); auto lwjglPatch = std::dynamic_pointer_cast(lwjgl); if (!lwjglPatch)