Fix build

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/minecraft/mod/tasks/LocalResourcePackParseTask.cpp

@@ -1,192 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "LocalResourcePackParseTask.h"
-
-#include "FileSystem.h"
-#include "Json.h"
-#include "minecraft/mod/tasks/LocalDataPackParseTask.h"
-
-#include <quazip/quazip.h>
-#include <quazip/quazipdir.h>
-#include <quazip/quazipfile.h>
-
-#include <QCryptographicHash>
-
-namespace ResourcePackUtils {
-
-QString buildStyle(const QJsonObject& obj)
-{
-    QStringList styles;
-    if (auto color = Json::ensureString(obj, "color"); !color.isEmpty()) {
-        styles << QString("color: %1;").arg(color);
-    }
-    if (obj.contains("bold")) {
-        QString weight = "normal";
-        if (Json::ensureBoolean(obj, "bold", false)) {
-            weight = "bold";
-        }
-        styles << QString("font-weight: %1;").arg(weight);
-    }
-    if (obj.contains("italic")) {
-        QString style = "normal";
-        if (Json::ensureBoolean(obj, "italic", false)) {
-            style = "italic";
-        }
-        styles << QString("font-style: %1;").arg(style);
-    }
-
-    return styles.isEmpty() ? "" : QString("style=\"%1\"").arg(styles.join(" "));
-}
-
-QString processComponent(const QJsonArray& value, bool strikethrough, bool underline)
-{
-    QString result;
-    for (auto current : value)
-        result += processComponent(current, strikethrough, underline);
-    return result;
-}
-
-QString processComponent(const QJsonObject& obj, bool strikethrough, bool underline)
-{
-    underline = Json::ensureBoolean(obj, "underlined", underline);
-    strikethrough = Json::ensureBoolean(obj, "strikethrough", strikethrough);
-
-    QString result = Json::ensureString(obj, "text");
-    if (underline) {
-        result = QString("<u>%1</u>").arg(result);
-    }
-    if (strikethrough) {
-        result = QString("<s>%1</s>").arg(result);
-    }
-    // the extra needs to be a array
-    result += processComponent(Json::ensureArray(obj, "extra"), strikethrough, underline);
-    if (auto style = buildStyle(obj); !style.isEmpty()) {
-        result = QString("<span %1>%2</span>").arg(style, result);
-    }
-    if (obj.contains("clickEvent")) {
-        auto click_event = Json::ensureObject(obj, "clickEvent");
-        auto action = Json::ensureString(click_event, "action");
-        auto value = Json::ensureString(click_event, "value");
-        if (action == "open_url" && !value.isEmpty()) {
-            result = QString("<a href=\"%1\">%2</a>").arg(value, result);
-        }
-    }
-    return result;
-}
-
-QString processComponent(const QJsonValue& value, bool strikethrough, bool underline)
-{
-    if (value.isString()) {
-        return value.toString();
-    }
-    if (value.isBool()) {
-        return value.toBool() ? "true" : "false";
-    }
-    if (value.isDouble()) {
-        return QString::number(value.toDouble());
-    }
-    if (value.isArray()) {
-        return processComponent(value.toArray(), strikethrough, underline);
-    }
-    if (value.isObject()) {
-        return processComponent(value.toObject(), strikethrough, underline);
-    }
-    qWarning() << "Invalid component type!";
-    return {};
-}
-
-bool processPackPNG(const ResourcePack* pack, QByteArray&& raw_data)
-{
-    auto img = QImage::fromData(raw_data);
-    if (!img.isNull()) {
-        pack->setImage(img);
-    } else {
-        qWarning() << "Failed to parse pack.png.";
-        return false;
-    }
-    return true;
-}
-
-bool processPackPNG(const ResourcePack* pack)
-{
-    auto png_invalid = [&pack]() {
-        qWarning() << "Resource pack at" << pack->fileinfo().filePath() << "does not have a valid pack.png";
-        return false;
-    };
-
-    switch (pack->type()) {
-        case ResourceType::FOLDER: {
-            QFileInfo image_file_info(FS::PathCombine(pack->fileinfo().filePath(), "pack.png"));
-            if (image_file_info.exists() && image_file_info.isFile()) {
-                QFile pack_png_file(image_file_info.filePath());
-                if (!pack_png_file.open(QIODevice::ReadOnly))
-                    return png_invalid();  // can't open pack.png file
-
-                auto data = pack_png_file.readAll();
-
-                bool pack_png_result = ResourcePackUtils::processPackPNG(pack, std::move(data));
-
-                pack_png_file.close();
-                if (!pack_png_result) {
-                    return png_invalid();  // pack.png invalid
-                }
-            } else {
-                return png_invalid();  // pack.png does not exists or is not a valid file.
-            }
-            return false;  // not processed correctly; https://github.com/PrismLauncher/PrismLauncher/issues/1740
-        }
-        case ResourceType::ZIPFILE: {
-            QuaZip zip(pack->fileinfo().filePath());
-            if (!zip.open(QuaZip::mdUnzip))
-                return false;  // can't open zip file
-
-            QuaZipFile file(&zip);
-            if (zip.setCurrentFile("pack.png")) {
-                if (!file.open(QIODevice::ReadOnly)) {
-                    qCritical() << "Failed to open file in zip.";
-                    zip.close();
-                    return png_invalid();
-                }
-
-                auto data = file.readAll();
-
-                bool pack_png_result = ResourcePackUtils::processPackPNG(pack, std::move(data));
-
-                file.close();
-                if (!pack_png_result) {
-                    return png_invalid();  // pack.png invalid
-                }
-            } else {
-                return png_invalid();  // could not set pack.mcmeta as current file.
-            }
-            return false;  // not processed correctly; https://github.com/PrismLauncher/PrismLauncher/issues/1740
-        }
-        default:
-            qWarning() << "Invalid type for resource pack parse task!";
-            return false;
-    }
-}
-
-bool validate(QFileInfo file)
-{
-    ResourcePack rp{ file };
-    return DataPackUtils::process(&rp, DataPackUtils::ProcessingLevel::BasicInfoOnly) && rp.valid();
-}
-
-}  // namespace ResourcePackUtils

launcher/minecraft/mod/tasks/LocalResourcePackParseTask.h

@@ -1,36 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QDebug>
-#include <QObject>
-
-#include "minecraft/mod/ResourcePack.h"
-
-namespace ResourcePackUtils {
-
-QString processComponent(const QJsonValue& value, bool strikethrough = false, bool underline = false);
-bool processPackPNG(const ResourcePack* pack, QByteArray&& raw_data);
-
-/// processes ONLY the pack.png (rest of the pack may be invalid)
-bool processPackPNG(const ResourcePack* pack);
-
-/** Checks whether a file is valid as a resource pack or not. */
-bool validate(QFileInfo file);
-}  // namespace ResourcePackUtils

launcher/ui/widgets/MinecraftSettingsWidget.cpp

@@ -36,14 +36,14 @@
  */
 
 #include "MinecraftSettingsWidget.h"
-#include <QFileDialog>
+#include "ui_MinecraftSettingsWidget.h"
 
+#include <QFileDialog>
 #include "Application.h"
 #include "BuildConfig.h"
 #include "minecraft/WorldList.h"
 #include "minecraft/auth/AccountList.h"
 #include "settings/Setting.h"
-#include "ui_MinecraftSettingsWidget.h"
 
 MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance, QWidget* parent)
     : QWidget(parent), m_instance(std::move(instance)), m_ui(new Ui::MinecraftSettingsWidget)

tests/MetaComponentParse_test.cpp

@@ -41,6 +41,7 @@
 
 #include <FileSystem.h>
 
+#include <minecraft/mod/tasks/LocalDataPackParseTask.h>
 #include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
 
 class MetaComponentParseTest : public QObject {
@@ -69,7 +70,7 @@ class MetaComponentParseTest : public QObject {
 
         QString expected = expected_json.toString();
 
-        QString processed = ResourcePackUtils::processComponent(description_json);
+        QString processed = DataPackUtils::processComponent(description_json);
 
         QCOMPARE(processed, expected);
     }