GH-2026 implement changes necessary to support 1.13 snapshots

2 files changed, 2 insertions, 11 deletions

diff --git a/api/logic/minecraft/update/FMLLibrariesTask.cpp b/api/logic/minecraft/update/FMLLibrariesTask.cpp
index 56ecee43..1bd339e4 100644
--- a/api/logic/minecraft/update/FMLLibrariesTask.cpp
+++ b/api/logic/minecraft/update/FMLLibrariesTask.cpp
@@ -15,7 +15,6 @@ void FMLLibrariesTask::executeTask()
 	MinecraftInstance *inst = (MinecraftInstance *)m_inst;
 	auto components = inst->getComponentList();
 	auto profile = components->getProfile();
-	bool forge_present = false;
 
 	if (!profile->hasTrait("legacyFML"))
 	{
@@ -23,7 +22,7 @@ void FMLLibrariesTask::executeTask()
 		return;
 	}
 
-	QString version = inst->getComponentVersion("net.minecraft");
+	QString version = components->getComponentVersion("net.minecraft");
 	auto &fmlLibsMapping = g_VersionFilterData.fmlLibsMapping;
 	if (!fmlLibsMapping.contains(version))
 	{
@@ -35,9 +34,7 @@ void FMLLibrariesTask::executeTask()
 
 	// determine if we need some libs for FML or forge
 	setStatus(tr("Checking for FML libraries..."));
-	forge_present = (components->versionPatch("net.minecraftforge") != nullptr);
-	// we don't...
-	if (!forge_present)
+	if(!components->getComponent("net.minecraftforge"))
 	{
 		emitSucceeded();
 		return;
diff --git a/api/logic/minecraft/update/LibrariesTask.cpp b/api/logic/minecraft/update/LibrariesTask.cpp
index 80d45d97..0bec61c1 100644
--- a/api/logic/minecraft/update/LibrariesTask.cpp
+++ b/api/logic/minecraft/update/LibrariesTask.cpp
@@ -13,12 +13,6 @@ void LibrariesTask::executeTask()
 	setStatus(tr("Getting the library files from Mojang..."));
 	qDebug() << m_inst->name() << ": downloading libraries";
 	MinecraftInstance *inst = (MinecraftInstance *)m_inst;
-	inst->reloadProfile();
-	if(inst->hasVersionBroken())
-	{
-		emitFailed(tr("Failed to load the version description files - check the instance for errors."));
-		return;
-	}
 
 	// Build a list of URLs that will need to be downloaded.
 	auto components = inst->getComponentList();