From 55e62a81b69663041cb2402f779d0d957c499cb1 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 28 Dec 2013 14:22:36 +0100 Subject: [PATCH 1/2] LiteLoader support --- CMakeLists.txt | 2 + gui/dialogs/OneSixModEditDialog.cpp | 10 +++++ gui/dialogs/OneSixModEditDialog.h | 1 + gui/dialogs/OneSixModEditDialog.ui | 7 ++++ logic/LiteLoaderInstaller.cpp | 62 +++++++++++++++++++++++++++++ logic/LiteLoaderInstaller.h | 28 +++++++++++++ logic/OneSixLibrary.h | 6 +++ 7 files changed, 116 insertions(+) create mode 100644 logic/LiteLoaderInstaller.cpp create mode 100644 logic/LiteLoaderInstaller.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c8087cc..555890bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -356,6 +356,8 @@ logic/OpSys.h logic/OpSys.cpp logic/ForgeInstaller.h logic/ForgeInstaller.cpp +logic/LiteLoaderInstaller.h +logic/LiteLoaderInstaller.cpp # Nostalgia logic/NostalgiaInstance.h diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 51ea2d19..0d54328a 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -38,6 +38,7 @@ #include "logic/EnabledItemFilter.h" #include "logic/lists/ForgeVersionList.h" #include "logic/ForgeInstaller.h" +#include "logic/LiteLoaderInstaller.h" OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) : QDialog(parent), ui(new Ui::OneSixModEditDialog), m_inst(inst) @@ -204,6 +205,15 @@ void OneSixModEditDialog::on_forgeBtn_clicked() } } +void OneSixModEditDialog::on_liteloaderBtn_clicked() +{ + LiteLoaderInstaller liteloader; + if (!liteloader.apply(m_version)) + { + // failure notice + } +} + bool OneSixModEditDialog::loaderListFilter(QKeyEvent *keyEvent) { switch (keyEvent->key()) diff --git a/gui/dialogs/OneSixModEditDialog.h b/gui/dialogs/OneSixModEditDialog.h index 5376e526..09bd7946 100644 --- a/gui/dialogs/OneSixModEditDialog.h +++ b/gui/dialogs/OneSixModEditDialog.h @@ -44,6 +44,7 @@ slots: // Questionable: SettingsDialog doesn't need this for some reason? void on_buttonBox_rejected(); void on_forgeBtn_clicked(); + void on_liteloaderBtn_clicked(); void on_customizeBtn_clicked(); void on_revertBtn_clicked(); void updateVersionControls(); diff --git a/gui/dialogs/OneSixModEditDialog.ui b/gui/dialogs/OneSixModEditDialog.ui index 48aa87ee..ad20cd73 100644 --- a/gui/dialogs/OneSixModEditDialog.ui +++ b/gui/dialogs/OneSixModEditDialog.ui @@ -77,6 +77,13 @@ + + + + Install LiteLoader + + + diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp new file mode 100644 index 00000000..7588ae6a --- /dev/null +++ b/logic/LiteLoaderInstaller.cpp @@ -0,0 +1,62 @@ +/* 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 "LiteLoaderInstaller.h" + +#include "OneSixVersion.h" +#include "OneSixLibrary.h" + +LiteLoaderInstaller::LiteLoaderInstaller() +{ + +} + +bool hasLibrary(const QString &rawName, const QList > &libs) +{ + for (auto lib : libs) + { + if (lib->rawName() == rawName) + { + return true; + } + } + return false; +} + +bool LiteLoaderInstaller::apply(std::shared_ptr to) +{ + to->externalUpdateStart(); + + if (!hasLibrary("net.minecraft:launchwrapper:1.8", to->libraries)) + { + std::shared_ptr lib(new OneSixLibrary("net.minecraft:launchwrapper:1.8")); + lib->finalize(); + to->libraries.prepend(lib); + } + + if (!hasLibrary("com.mumfrey:liteloader:1.6.4", to->libraries)) + { + std::shared_ptr lib(new OneSixLibrary("com.mumfrey:liteloader:1.6.4")); + lib->setBaseUrl("http://dl.liteloader.com/versions/"); + lib->finalize(); + to->libraries.prepend(lib); + } + + to->mainClass = "net.minecraft.launchwrapper.Launch"; + to->minecraftArguments.append(" --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"); + + to->externalUpdateFinish(); + return to->toOriginalFile(); +} diff --git a/logic/LiteLoaderInstaller.h b/logic/LiteLoaderInstaller.h new file mode 100644 index 00000000..6a5ee1f2 --- /dev/null +++ b/logic/LiteLoaderInstaller.h @@ -0,0 +1,28 @@ +/* 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. + */ + +#pragma once +#include +#include + +class OneSixVersion; + +class LiteLoaderInstaller +{ +public: + LiteLoaderInstaller(); + + bool apply(std::shared_ptr to); +}; diff --git a/logic/OneSixLibrary.h b/logic/OneSixLibrary.h index 5cb867c2..3f0bc83d 100644 --- a/logic/OneSixLibrary.h +++ b/logic/OneSixLibrary.h @@ -68,6 +68,12 @@ public: m_name = name; } + /// Returns the raw name field + QString rawName() const + { + return m_name; + } + QJsonObject toJson(); /** From 5b54a4ca8c4849a4476bb9a5e1c2414463949621 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 28 Dec 2013 23:34:18 +0100 Subject: [PATCH 2/2] Don't hardcode stuff!!! --- gui/dialogs/OneSixModEditDialog.cpp | 12 +++- logic/LiteLoaderInstaller.cpp | 92 +++++++++++++++++++++-------- logic/LiteLoaderInstaller.h | 13 +++- 3 files changed, 89 insertions(+), 28 deletions(-) diff --git a/gui/dialogs/OneSixModEditDialog.cpp b/gui/dialogs/OneSixModEditDialog.cpp index 0d54328a..fb422941 100644 --- a/gui/dialogs/OneSixModEditDialog.cpp +++ b/gui/dialogs/OneSixModEditDialog.cpp @@ -72,6 +72,8 @@ OneSixModEditDialog::OneSixModEditDialog(OneSixInstance *inst, QWidget *parent) auto smodel = ui->loaderModTreeView->selectionModel(); connect(smodel, SIGNAL(currentChanged(QModelIndex, QModelIndex)), SLOT(loaderCurrent(QModelIndex, QModelIndex))); + + ui->liteloaderBtn->setEnabled(LiteLoaderInstaller(m_inst->intendedVersionId()).canApply()); } // resource packs { @@ -207,7 +209,15 @@ void OneSixModEditDialog::on_forgeBtn_clicked() void OneSixModEditDialog::on_liteloaderBtn_clicked() { - LiteLoaderInstaller liteloader; + LiteLoaderInstaller liteloader(m_inst->intendedVersionId()); + if (!liteloader.canApply()) + { + QMessageBox::critical( + this, tr("LiteLoader"), + tr("There is no information available on how to install LiteLoader " + "into this version of Minecraft")); + return; + } if (!liteloader.apply(m_version)) { // failure notice diff --git a/logic/LiteLoaderInstaller.cpp b/logic/LiteLoaderInstaller.cpp index 7588ae6a..07fffff3 100644 --- a/logic/LiteLoaderInstaller.cpp +++ b/logic/LiteLoaderInstaller.cpp @@ -18,45 +18,85 @@ #include "OneSixVersion.h" #include "OneSixLibrary.h" -LiteLoaderInstaller::LiteLoaderInstaller() -{ +QMap LiteLoaderInstaller::m_launcherWrapperVersionMapping; +LiteLoaderInstaller::LiteLoaderInstaller(const QString &mcVersion) : m_mcVersion(mcVersion) +{ + if (m_launcherWrapperVersionMapping.isEmpty()) + { + m_launcherWrapperVersionMapping["1.6.2"] = "1.3"; + m_launcherWrapperVersionMapping["1.6.4"] = "1.8"; + //m_launcherWrapperVersionMapping["1.7.2"] = "1.8"; + //m_launcherWrapperVersionMapping["1.7.4"] = "1.8"; + } } -bool hasLibrary(const QString &rawName, const QList > &libs) +bool LiteLoaderInstaller::canApply() const { - for (auto lib : libs) - { - if (lib->rawName() == rawName) - { - return true; - } - } - return false; + return m_launcherWrapperVersionMapping.contains(m_mcVersion); } bool LiteLoaderInstaller::apply(std::shared_ptr to) { to->externalUpdateStart(); - if (!hasLibrary("net.minecraft:launchwrapper:1.8", to->libraries)) - { - std::shared_ptr lib(new OneSixLibrary("net.minecraft:launchwrapper:1.8")); - lib->finalize(); - to->libraries.prepend(lib); - } - - if (!hasLibrary("com.mumfrey:liteloader:1.6.4", to->libraries)) - { - std::shared_ptr lib(new OneSixLibrary("com.mumfrey:liteloader:1.6.4")); - lib->setBaseUrl("http://dl.liteloader.com/versions/"); - lib->finalize(); - to->libraries.prepend(lib); - } + applyLaunchwrapper(to); + applyLiteLoader(to); to->mainClass = "net.minecraft.launchwrapper.Launch"; - to->minecraftArguments.append(" --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"); + if (!to->minecraftArguments.contains( + " --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker")) + { + to->minecraftArguments.append( + " --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"); + } to->externalUpdateFinish(); return to->toOriginalFile(); } + +void LiteLoaderInstaller::applyLaunchwrapper(std::shared_ptr to) +{ + const QString intendedVersion = m_launcherWrapperVersionMapping[m_mcVersion]; + + QMutableListIterator> it(to->libraries); + while (it.hasNext()) + { + it.next(); + if (it.value()->rawName().startsWith("net.minecraft:launchwrapper:")) + { + if (it.value()->version() >= intendedVersion) + { + return; + } + else + { + it.remove(); + } + } + } + + std::shared_ptr lib(new OneSixLibrary( + "net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[m_mcVersion])); + lib->finalize(); + to->libraries.prepend(lib); +} + +void LiteLoaderInstaller::applyLiteLoader(std::shared_ptr to) +{ + QMutableListIterator> it(to->libraries); + while (it.hasNext()) + { + it.next(); + if (it.value()->rawName().startsWith("com.mumfrey:liteloader:")) + { + it.remove(); + } + } + + std::shared_ptr lib( + new OneSixLibrary("com.mumfrey:liteloader:" + m_mcVersion)); + lib->setBaseUrl("http://dl.liteloader.com/versions/"); + lib->finalize(); + to->libraries.prepend(lib); +} diff --git a/logic/LiteLoaderInstaller.h b/logic/LiteLoaderInstaller.h index 6a5ee1f2..44b306d6 100644 --- a/logic/LiteLoaderInstaller.h +++ b/logic/LiteLoaderInstaller.h @@ -15,6 +15,7 @@ #pragma once #include +#include #include class OneSixVersion; @@ -22,7 +23,17 @@ class OneSixVersion; class LiteLoaderInstaller { public: - LiteLoaderInstaller(); + LiteLoaderInstaller(const QString &mcVersion); + + bool canApply() const; bool apply(std::shared_ptr to); + +private: + QString m_mcVersion; + + void applyLaunchwrapper(std::shared_ptr to); + void applyLiteLoader(std::shared_ptr to); + + static QMap m_launcherWrapperVersionMapping; };