From c8687a8d05cc62c062ac18f8a583ceee9ba6d7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Wed, 11 Feb 2015 00:40:58 +0100 Subject: [PATCH] NOISSUE get rid of the obsolete version builder --- application/pages/VersionPage.cpp | 1 - logic/CMakeLists.txt | 2 - logic/ftb/OneSixFTBInstance.cpp | 1 - logic/minecraft/MinecraftProfile.cpp | 6 +- logic/minecraft/MinecraftVersion.cpp | 1 - logic/minecraft/MinecraftVersionList.cpp | 1 - logic/minecraft/VersionBuilder.cpp | 83 ------------------------ logic/minecraft/VersionBuilder.h | 43 ------------ 8 files changed, 4 insertions(+), 134 deletions(-) delete mode 100644 logic/minecraft/VersionBuilder.cpp delete mode 100644 logic/minecraft/VersionBuilder.h diff --git a/application/pages/VersionPage.cpp b/application/pages/VersionPage.cpp index 9b656220d..c23801633 100644 --- a/application/pages/VersionPage.cpp +++ b/application/pages/VersionPage.cpp @@ -42,7 +42,6 @@ #include "forge/ForgeInstaller.h" #include "liteloader/LiteLoaderVersionList.h" #include "liteloader/LiteLoaderInstaller.h" -#include "minecraft/VersionBuilder.h" #include "auth/MojangAccountList.h" #include "minecraft/Mod.h" #include "icons/IconList.h" diff --git a/logic/CMakeLists.txt b/logic/CMakeLists.txt index 08a6f3a8f..183991afd 100644 --- a/logic/CMakeLists.txt +++ b/logic/CMakeLists.txt @@ -132,8 +132,6 @@ SET(LOGIC_SOURCES minecraft/ProfileStrategy.h minecraft/RawLibrary.cpp minecraft/RawLibrary.h - minecraft/VersionBuilder.cpp - minecraft/VersionBuilder.h minecraft/VersionBuildError.h minecraft/VersionFile.cpp minecraft/VersionFile.h diff --git a/logic/ftb/OneSixFTBInstance.cpp b/logic/ftb/OneSixFTBInstance.cpp index 7374b78f1..a8ea30312 100644 --- a/logic/ftb/OneSixFTBInstance.cpp +++ b/logic/ftb/OneSixFTBInstance.cpp @@ -3,7 +3,6 @@ #include "minecraft/MinecraftProfile.h" #include "minecraft/OneSixLibrary.h" -#include "minecraft/VersionBuilder.h" #include "tasks/SequentialTask.h" #include "forge/ForgeInstaller.h" #include "forge/ForgeVersionList.h" diff --git a/logic/minecraft/MinecraftProfile.cpp b/logic/minecraft/MinecraftProfile.cpp index f38f8378e..e9ff87d89 100644 --- a/logic/minecraft/MinecraftProfile.cpp +++ b/logic/minecraft/MinecraftProfile.cpp @@ -20,7 +20,6 @@ #include #include "minecraft/MinecraftProfile.h" -#include "minecraft/VersionBuilder.h" #include "ProfileUtils.h" #include "NullProfileStrategy.h" @@ -241,7 +240,10 @@ std::shared_ptr MinecraftProfile::fromJson(const QJsonObject & std::shared_ptr version(new MinecraftProfile(new NullProfileStrategy())); try { - VersionBuilder::readJsonAndApplyToVersion(version.get(), obj); + version->clear(); + auto file = VersionFile::fromJson(QJsonDocument(obj), QString(), false); + file->applyTo(version.get()); + version->appendPatch(file); } catch(MMCError & err) { diff --git a/logic/minecraft/MinecraftVersion.cpp b/logic/minecraft/MinecraftVersion.cpp index 977a18922..5a7594212 100644 --- a/logic/minecraft/MinecraftVersion.cpp +++ b/logic/minecraft/MinecraftVersion.cpp @@ -1,7 +1,6 @@ #include "MinecraftVersion.h" #include "MinecraftProfile.h" #include "VersionBuildError.h" -#include "VersionBuilder.h" #include "ProfileUtils.h" #include "settings/SettingsObject.h" diff --git a/logic/minecraft/MinecraftVersionList.cpp b/logic/minecraft/MinecraftVersionList.cpp index 34c1e3d45..7b3325e0a 100644 --- a/logic/minecraft/MinecraftVersionList.cpp +++ b/logic/minecraft/MinecraftVersionList.cpp @@ -26,7 +26,6 @@ #include "ParseUtils.h" #include "ProfileUtils.h" -#include "VersionBuilder.h" #include "VersionFilterData.h" #include diff --git a/logic/minecraft/VersionBuilder.cpp b/logic/minecraft/VersionBuilder.cpp deleted file mode 100644 index 4d58b060d..000000000 --- a/logic/minecraft/VersionBuilder.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright 2013-2015 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "minecraft/VersionBuilder.h" -#include "minecraft/MinecraftProfile.h" -#include "minecraft/OneSixRule.h" -#include "minecraft/ProfilePatch.h" -#include "minecraft/VersionFile.h" -#include "VersionBuildError.h" -#include "MinecraftVersionList.h" -#include "ProfileUtils.h" - -#include "minecraft/OneSixInstance.h" -#include "MMCJson.h" - -#include - -VersionBuilder::VersionBuilder() -{ -} - -void VersionBuilder::build(MinecraftProfile *version, OneSixInstance *instance) -{ - VersionBuilder builder; - builder.m_version = version; - builder.m_instance = instance; - builder.buildInternal(); -} - -void VersionBuilder::readJsonAndApplyToVersion(MinecraftProfile *version, const QJsonObject &obj) -{ - VersionBuilder builder; - builder.m_version = version; - builder.m_instance = 0; - builder.readJsonAndApply(obj); -} - -void VersionBuilder::readJsonAndApply(const QJsonObject &obj) -{ - m_version->clear(); - - auto file = VersionFile::fromJson(QJsonDocument(obj), QString(), false); - - file->applyTo(m_version); - m_version->appendPatch(file); -} - - -void VersionBuilder::readInstancePatches() -{ - -} - -void VersionBuilder::buildInternal() -{ - -} - diff --git a/logic/minecraft/VersionBuilder.h b/logic/minecraft/VersionBuilder.h deleted file mode 100644 index b2d23da5e..000000000 --- a/logic/minecraft/VersionBuilder.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2013-2015 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 -#include "VersionFile.h" - -class MinecraftProfile; -class OneSixInstance; -class QJsonObject; -class QFileInfo; - -class VersionBuilder -{ - VersionBuilder(); -public: - static void build(MinecraftProfile *version, OneSixInstance *instance); - static void readJsonAndApplyToVersion(MinecraftProfile *version, const QJsonObject &obj); - -private: - MinecraftProfile *m_version; - OneSixInstance *m_instance; - - void buildInternal(); - - void readInstancePatches(); - - void readJsonAndApply(const QJsonObject &obj); -};