aboutsummaryrefslogtreecommitdiff
path: root/launcher/modplatform
diff options
context:
space:
mode:
authorflow <flowlnlnln@gmail.com>2022-12-17 12:41:10 -0300
committerflow <flowlnlnln@gmail.com>2022-12-17 12:41:10 -0300
commite3f8d9908747863b9e5870b9a3d9c79f3407997f (patch)
tree94167b97b9303cb9a8399905c9477dbd74ade6a9 /launcher/modplatform
parent22aebc22159196a83f7f1447a951717b4359f528 (diff)
downloadPrismLauncher-e3f8d9908747863b9e5870b9a3d9c79f3407997f.tar.gz
PrismLauncher-e3f8d9908747863b9e5870b9a3d9c79f3407997f.tar.bz2
PrismLauncher-e3f8d9908747863b9e5870b9a3d9c79f3407997f.zip
refactor(Inst. Import): use m_* for member variables in MR components
Makes it clearer what is being changed when. Signed-off-by: flow <flowlnlnln@gmail.com>
Diffstat (limited to 'launcher/modplatform')
-rw-r--r--launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp22
-rw-r--r--launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h2
2 files changed, 12 insertions, 12 deletions
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
index 4f63ca82..c5a27c9d 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.cpp
@@ -202,14 +202,14 @@ bool ModrinthCreationTask::createInstance()
auto components = instance.getPackProfile();
components->buildingFromScratch();
- components->setComponentVersion("net.minecraft", minecraftVersion, true);
+ components->setComponentVersion("net.minecraft", m_minecraft_version, true);
- if (!fabricVersion.isEmpty())
- components->setComponentVersion("net.fabricmc.fabric-loader", fabricVersion);
- if (!quiltVersion.isEmpty())
- components->setComponentVersion("org.quiltmc.quilt-loader", quiltVersion);
- if (!forgeVersion.isEmpty())
- components->setComponentVersion("net.minecraftforge", forgeVersion);
+ if (!m_fabric_version.isEmpty())
+ components->setComponentVersion("net.fabricmc.fabric-loader", m_fabric_version);
+ if (!m_quilt_version.isEmpty())
+ components->setComponentVersion("org.quiltmc.quilt-loader", m_quilt_version);
+ if (!m_forge_version.isEmpty())
+ components->setComponentVersion("net.minecraftforge", m_forge_version);
if (m_instIcon != "default") {
instance.setIconKey(m_instIcon);
@@ -372,13 +372,13 @@ bool ModrinthCreationTask::parseManifest(const QString& index_path, std::vector<
for (auto it = dependencies.begin(), end = dependencies.end(); it != end; ++it) {
QString name = it.key();
if (name == "minecraft") {
- minecraftVersion = Json::requireString(*it, "Minecraft version");
+ m_minecraft_version = Json::requireString(*it, "Minecraft version");
} else if (name == "fabric-loader") {
- fabricVersion = Json::requireString(*it, "Fabric Loader version");
+ m_fabric_version = Json::requireString(*it, "Fabric Loader version");
} else if (name == "quilt-loader") {
- quiltVersion = Json::requireString(*it, "Quilt Loader version");
+ m_quilt_version = Json::requireString(*it, "Quilt Loader version");
} else if (name == "forge") {
- forgeVersion = Json::requireString(*it, "Forge version");
+ m_forge_version = Json::requireString(*it, "Forge version");
} else {
throw JSONValidationError("Unknown dependency type: " + name);
}
diff --git a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
index 5cf295f4..6de24fd4 100644
--- a/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
+++ b/launcher/modplatform/modrinth/ModrinthInstanceCreationTask.h
@@ -42,7 +42,7 @@ class ModrinthCreationTask final : public InstanceCreationTask {
private:
QWidget* m_parent = nullptr;
- QString minecraftVersion, fabricVersion, quiltVersion, forgeVersion;
+ QString m_minecraft_version, m_fabric_version, m_quilt_version, m_forge_version;
QString m_managed_id, m_managed_version_id, m_managed_name;
std::vector<Modrinth::File> m_files;