NOISSUE Remove special FTB logic from generic version patch code

5 files changed, 10 insertions, 25 deletions

diff --git a/logic/minecraft/OneSixProfileStrategy.cpp b/logic/minecraft/OneSixProfileStrategy.cpp
index bdb2f8ee..285e983c 100644
--- a/logic/minecraft/OneSixProfileStrategy.cpp
+++ b/logic/minecraft/OneSixProfileStrategy.cpp
@@ -87,7 +87,7 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches()
 
 	// TODO: this is obviously fake.
 	QResource LWJGL(":/versions/LWJGL/2.9.1.json");
-	auto lwjgl = ProfileUtils::parseJsonFile(LWJGL.absoluteFilePath(), false, false);
+	auto lwjgl = ProfileUtils::parseJsonFile(LWJGL.absoluteFilePath(), false);
 	auto lwjglPatch = std::dynamic_pointer_cast<ProfilePatch>(lwjgl);
 	if (!lwjglPatch)
 	{
diff --git a/logic/minecraft/ProfileUtils.cpp b/logic/minecraft/ProfileUtils.cpp
index bae34dbf..db05b0a6 100644
--- a/logic/minecraft/ProfileUtils.cpp
+++ b/logic/minecraft/ProfileUtils.cpp
@@ -98,7 +98,7 @@ bool readOverrideOrders(QString path, PatchOrder &order)
 	return true;
 }
 
-VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB)
+VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder)
 {
 	QFile file(fileInfo.absoluteFilePath());
 	if (!file.open(QFile::ReadOnly))
@@ -115,7 +115,7 @@ VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder,
 				.arg(fileInfo.fileName(), error.errorString())
 				.arg(error.offset));
 	}
-	return VersionFile::fromJson(doc, file.fileName(), requireOrder, isFTB);
+	return VersionFile::fromJson(doc, file.fileName(), requireOrder);
 }
 
 VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
@@ -134,7 +134,7 @@ VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo)
 		throw JSONValidationError(
 			QObject::tr("Unable to process the version file %1.").arg(fileInfo.fileName()));
 	}
-	return VersionFile::fromJson(doc, file.fileName(), false, false);
+	return VersionFile::fromJson(doc, file.fileName(), false);
 }
 
 void removeLwjglFromPatch(VersionFilePtr patch)
diff --git a/logic/minecraft/ProfileUtils.h b/logic/minecraft/ProfileUtils.h
index 88027374..1e6d6a8f 100644
--- a/logic/minecraft/ProfileUtils.h
+++ b/logic/minecraft/ProfileUtils.h
@@ -14,7 +14,7 @@ bool writeOverrideOrders(QString path, const PatchOrder &order);
 
 
 /// Parse a version file in JSON format
-VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder, bool isFTB = false);
+VersionFilePtr parseJsonFile(const QFileInfo &fileInfo, const bool requireOrder);
 
 /// Parse a version file in binary JSON format
 VersionFilePtr parseBinaryJsonFile(const QFileInfo &fileInfo);
diff --git a/logic/minecraft/VersionFile.cpp b/logic/minecraft/VersionFile.cpp
index 97ce6535..f5856936 100644
--- a/logic/minecraft/VersionFile.cpp
+++ b/logic/minecraft/VersionFile.cpp
@@ -34,7 +34,7 @@ int findLibraryByName(QList<OneSixLibraryPtr> haystack, const GradleSpecifier &n
 }
 
 VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &filename,
-									 const bool requireOrder, const bool isFTB)
+									 const bool requireOrder)
 {
 	VersionFilePtr out(new VersionFile());
 	if (doc.isEmpty() || doc.isNull())
@@ -84,11 +84,7 @@ VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &fi
 		return QString();
 	};
 
-	// FIXME: This should be ignored when applying.
-	if (!isFTB)
-	{
-		readString("id", out->id);
-	}
+	readString("id", out->id);
 
 	readString("mainClass", out->mainClass);
 	readString("appletClass", out->appletClass);
@@ -143,24 +139,13 @@ VersionFilePtr VersionFile::fromJson(const QJsonDocument &doc, const QString &fi
 
 	if (root.contains("libraries"))
 	{
-		// FIXME: This should be done when applying.
-		out->shouldOverwriteLibs = !isFTB;
+		out->shouldOverwriteLibs = true;
 		for (auto libVal : ensureArray(root.value("libraries")))
 		{
 			auto libObj = ensureObject(libVal);
 
 			auto lib = RawLibrary::fromJson(libObj, filename);
-			// FIXME: This should be done when applying.
-			if (isFTB)
-			{
-				lib->m_hint = "local";
-				lib->insertType = RawLibrary::Prepend;
-				out->addLibs.prepend(lib);
-			}
-			else
-			{
-				out->overwriteLibs.append(lib);
-			}
+			out->overwriteLibs.append(lib);
 		}
 	}
 
diff --git a/logic/minecraft/VersionFile.h b/logic/minecraft/VersionFile.h
index ddc3f849..1e8772af 100644
--- a/logic/minecraft/VersionFile.h
+++ b/logic/minecraft/VersionFile.h
@@ -19,7 +19,7 @@ class VersionFile : public ProfilePatch
 {
 public: /* methods */
 	static VersionFilePtr fromJson(const QJsonDocument &doc, const QString &filename,
-								   const bool requireOrder, const bool isFTB = false);
+								   const bool requireOrder);
 	QJsonDocument toJson(bool saveOrder);
 
 	virtual void applyTo(MinecraftProfile *version) override;