From 55e62a81b69663041cb2402f779d0d957c499cb1 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 28 Dec 2013 14:22:36 +0100 Subject: LiteLoader support --- logic/LiteLoaderInstaller.cpp | 62 +++++++++++++++++++++++++++++++++++++++++++ logic/LiteLoaderInstaller.h | 28 +++++++++++++++++++ logic/OneSixLibrary.h | 6 +++++ 3 files changed, 96 insertions(+) create mode 100644 logic/LiteLoaderInstaller.cpp create mode 100644 logic/LiteLoaderInstaller.h (limited to 'logic') 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(); /** -- cgit v1.2.3 From 5b54a4ca8c4849a4476bb9a5e1c2414463949621 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Sat, 28 Dec 2013 23:34:18 +0100 Subject: Don't hardcode stuff!!! --- logic/LiteLoaderInstaller.cpp | 88 +++++++++++++++++++++++++++++++------------ logic/LiteLoaderInstaller.h | 13 ++++++- 2 files changed, 76 insertions(+), 25 deletions(-) (limited to 'logic') 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; -bool hasLibrary(const QString &rawName, const QList > &libs) +LiteLoaderInstaller::LiteLoaderInstaller(const QString &mcVersion) : m_mcVersion(mcVersion) { - for (auto lib : libs) + if (m_launcherWrapperVersionMapping.isEmpty()) { - if (lib->rawName() == rawName) - { - return true; - } + 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"; } - return false; +} + +bool LiteLoaderInstaller::canApply() const +{ + return m_launcherWrapperVersionMapping.contains(m_mcVersion); } bool LiteLoaderInstaller::apply(std::shared_ptr to) { to->externalUpdateStart(); - if (!hasLibrary("net.minecraft:launchwrapper:1.8", to->libraries)) + applyLaunchwrapper(to); + applyLiteLoader(to); + + to->mainClass = "net.minecraft.launchwrapper.Launch"; + if (!to->minecraftArguments.contains( + " --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker")) { - std::shared_ptr lib(new OneSixLibrary("net.minecraft:launchwrapper:1.8")); - lib->finalize(); - to->libraries.prepend(lib); + to->minecraftArguments.append( + " --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"); } - if (!hasLibrary("com.mumfrey:liteloader:1.6.4", to->libraries)) + 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()) { - 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); + it.next(); + if (it.value()->rawName().startsWith("net.minecraft:launchwrapper:")) + { + if (it.value()->version() >= intendedVersion) + { + return; + } + else + { + it.remove(); + } + } } - to->mainClass = "net.minecraft.launchwrapper.Launch"; - to->minecraftArguments.append(" --tweakClass com.mumfrey.liteloader.launch.LiteLoaderTweaker"); + std::shared_ptr lib(new OneSixLibrary( + "net.minecraft:launchwrapper:" + m_launcherWrapperVersionMapping[m_mcVersion])); + lib->finalize(); + to->libraries.prepend(lib); +} - to->externalUpdateFinish(); - return to->toOriginalFile(); +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; }; -- cgit v1.2.3