aboutsummaryrefslogtreecommitdiff
path: root/launcher/minecraft/MojangDownloadInfo.h
diff options
context:
space:
mode:
Diffstat (limited to 'launcher/minecraft/MojangDownloadInfo.h')
-rw-r--r--launcher/minecraft/MojangDownloadInfo.h34
1 files changed, 11 insertions, 23 deletions
diff --git a/launcher/minecraft/MojangDownloadInfo.h b/launcher/minecraft/MojangDownloadInfo.h
index 6831d8d8..855dbe00 100644
--- a/launcher/minecraft/MojangDownloadInfo.h
+++ b/launcher/minecraft/MojangDownloadInfo.h
@@ -1,10 +1,9 @@
#pragma once
-#include <QString>
#include <QMap>
+#include <QString>
#include <memory>
-struct MojangDownloadInfo
-{
+struct MojangDownloadInfo {
// types
typedef std::shared_ptr<MojangDownloadInfo> Ptr;
@@ -19,24 +18,20 @@ struct MojangDownloadInfo
int size;
};
-
-
-struct MojangLibraryDownloadInfo
-{
- MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact_): artifact(artifact_) {}
+struct MojangLibraryDownloadInfo {
+ MojangLibraryDownloadInfo(MojangDownloadInfo::Ptr artifact_) : artifact(artifact_) {}
MojangLibraryDownloadInfo() {}
// types
typedef std::shared_ptr<MojangLibraryDownloadInfo> Ptr;
// methods
- MojangDownloadInfo *getDownloadInfo(QString classifier)
+ MojangDownloadInfo* getDownloadInfo(QString classifier)
{
- if (classifier.isNull())
- {
+ if (classifier.isNull()) {
return artifact.get();
}
-
+
return classifiers[classifier].get();
}
@@ -45,17 +40,12 @@ struct MojangLibraryDownloadInfo
QMap<QString, MojangDownloadInfo::Ptr> classifiers;
};
-
-
-struct MojangAssetIndexInfo : public MojangDownloadInfo
-{
+struct MojangAssetIndexInfo : public MojangDownloadInfo {
// types
typedef std::shared_ptr<MojangAssetIndexInfo> Ptr;
// methods
- MojangAssetIndexInfo()
- {
- }
+ MojangAssetIndexInfo() {}
MojangAssetIndexInfo(QString id_)
{
@@ -63,13 +53,11 @@ struct MojangAssetIndexInfo : public MojangDownloadInfo
// HACK: ignore assets from other version files than Minecraft
// workaround for stupid assets issue caused by amazon:
// https://www.theregister.co.uk/2017/02/28/aws_is_awol_as_s3_goes_haywire/
- if(id_ == "legacy")
- {
+ if (id_ == "legacy") {
url = "https://piston-meta.mojang.com/mc/assets/legacy/c0fd82e8ce9fbc93119e40d96d5a4e62cfa3f729/legacy.json";
}
// HACK
- else
- {
+ else {
url = "https://s3.amazonaws.com/Minecraft.Download/indexes/" + id_ + ".json";
}
known = false;