summaryrefslogtreecommitdiffstats
path: root/api/logic/minecraft/AssetsUtils.h
diff options
context:
space:
mode:
Diffstat (limited to 'api/logic/minecraft/AssetsUtils.h')
-rw-r--r--api/logic/minecraft/AssetsUtils.h31
1 files changed, 18 insertions, 13 deletions
diff --git a/api/logic/minecraft/AssetsUtils.h b/api/logic/minecraft/AssetsUtils.h
index b7ea9cc1..356b8c8a 100644
--- a/api/logic/minecraft/AssetsUtils.h
+++ b/api/logic/minecraft/AssetsUtils.h
@@ -1,4 +1,4 @@
-/* Copyright 2013-2018 MultiMC Contributors
+/* Copyright 2013-2019 MultiMC Contributors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,27 +22,32 @@
struct AssetObject
{
- QString getRelPath();
- QUrl getUrl();
- QString getLocalPath();
- NetActionPtr getDownloadAction();
+ QString getRelPath();
+ QUrl getUrl();
+ QString getLocalPath();
+ NetActionPtr getDownloadAction();
- QString hash;
- qint64 size;
+ QString hash;
+ qint64 size;
};
struct AssetsIndex
{
- NetJobPtr getDownloadJob();
+ NetJobPtr getDownloadJob();
- QString id;
- QMap<QString, AssetObject> objects;
- bool isVirtual = false;
+ QString id;
+ QMap<QString, AssetObject> objects;
+ bool isVirtual = false;
+ bool mapToResources = false;
};
+/// FIXME: this is absolutely horrendous. REDO!!!!
namespace AssetsUtils
{
-bool loadAssetsIndexJson(QString id, QString file, AssetsIndex* index);
+bool loadAssetsIndexJson(const QString &id, const QString &file, AssetsIndex& index);
+
+QDir getAssetsDir(const QString &assetsId, const QString &resourcesFolder);
+
/// Reconstruct a virtual assets folder for the given assets ID and return the folder
-QDir reconstructAssets(QString assetsId);
+bool reconstructAssets(QString assetsId, QString resourcesFolder);
}