NOISSUE use classparser for importing Legacy instances with undecided Minecraft versions

2 files changed, 14 insertions, 6 deletions

diff --git a/api/logic/minecraft/legacy/LegacyInstance.cpp b/api/logic/minecraft/legacy/LegacyInstance.cpp
index 21acf675..0b69acf2 100644
--- a/api/logic/minecraft/legacy/LegacyInstance.cpp
+++ b/api/logic/minecraft/legacy/LegacyInstance.cpp
@@ -31,8 +31,8 @@ LegacyInstance::LegacyInstance(SettingsObjectPtr globalSettings, SettingsObjectP
 {
 	settings->registerSetting("NeedsRebuild", true);
 	settings->registerSetting("ShouldUpdate", false);
-	settings->registerSetting("JarVersion", "Unknown");
-	settings->registerSetting("IntendedJarVersion", "");
+	settings->registerSetting("JarVersion", QString());
+	settings->registerSetting("IntendedJarVersion", QString());
 	/*
 	 * custom base jar has no default. it is determined in code... see the accessor methods for
 	 *it
diff --git a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp b/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
index cb0572ed..e41d87cb 100644
--- a/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
+++ b/api/logic/minecraft/legacy/LegacyUpgradeTask.cpp
@@ -8,6 +8,7 @@
 #include "LegacyInstance.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/MinecraftProfile.h"
+#include "classparser.h"
 
 LegacyUpgradeTask::LegacyUpgradeTask(SettingsObjectPtr settings, const QString & stagingPath, InstancePtr origInstance, const QString & newName)
 {
@@ -50,7 +51,6 @@ static QString decideVersion(const QString& currentVersion, const QString& inten
 			return intendedVersion;
 		}
 	}
-	// TODO: possibly add fallback to the old jar/classfile analysis method from MultiMC4
 	return QString();
 }
 
@@ -74,9 +74,17 @@ void LegacyUpgradeTask::copyFinished()
 	QString preferredVersionNumber = decideVersion(legacyInst->currentVersionId(), legacyInst->intendedVersionId());
 	if(preferredVersionNumber.isNull())
 	{
-		// FIXME: let the user decide
-		emitFailed(tr("Could not decide Minecraft version."));
-		return;
+		// try to decide version based on the jar(s?)
+		preferredVersionNumber = classparser::GetMinecraftJarVersion(legacyInst->baseJar());
+		if(preferredVersionNumber.isNull())
+		{
+			preferredVersionNumber = classparser::GetMinecraftJarVersion(legacyInst->runnableJar());
+			if(preferredVersionNumber.isNull())
+			{
+				emitFailed(tr("Could not decide Minecraft version."));
+				return;
+			}
+		}
 	}
 	inst->setComponentVersion("net.minecraft", preferredVersionNumber);