diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c8087cc5..555890bb4 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 51ea2d191..0d54328ab 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 5376e5263..09bd79465 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 48aa87ee5..ad20cd736 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 000000000..7588ae6af --- /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 000000000..6a5ee1f2e --- /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 5cb867c22..3f0bc83dd 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(); /**