From e6cc65cf69b3fb2c1fa08e6768669f826048af20 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Thu, 26 Mar 2020 10:38:13 +0100 Subject: NOISSUE no means no, #2 --- api/logic/minecraft/MojangVersionFormat.cpp | 4 ---- api/logic/minecraft/OneSixVersionFormat.cpp | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'api') diff --git a/api/logic/minecraft/MojangVersionFormat.cpp b/api/logic/minecraft/MojangVersionFormat.cpp index 0f6cf6a6..33d3c54c 100644 --- a/api/logic/minecraft/MojangVersionFormat.cpp +++ b/api/logic/minecraft/MojangVersionFormat.cpp @@ -130,10 +130,6 @@ void MojangVersionFormat::readVersionProperties(const QJsonObject &in, VersionFi { Bits::readString(in, "id", out->minecraftVersion); Bits::readString(in, "mainClass", out->mainClass); - if(out->mainClass.contains("forgewrapper") || out->mainClass.contains("zekerzhayard")) { - out->mainClass.clear(); - out->addProblem(ProblemSeverity::Error, QObject::tr("Forge workarounds have no place in MultiMC.")); - } Bits::readString(in, "minecraftArguments", out->minecraftArguments); if(out->minecraftArguments.isEmpty()) { diff --git a/api/logic/minecraft/OneSixVersionFormat.cpp b/api/logic/minecraft/OneSixVersionFormat.cpp index 6f3b926b..3d3cf916 100644 --- a/api/logic/minecraft/OneSixVersionFormat.cpp +++ b/api/logic/minecraft/OneSixVersionFormat.cpp @@ -151,6 +151,10 @@ VersionFilePtr OneSixVersionFormat::versionFileFromJson(const QJsonDocument &doc QJsonObject libObj = requireObject(libVal); // parse the library auto lib = libraryFromJson(libObj, filename); + if(lib->rawName().artifactId() == "ForgeWrapper") { + out->mainClass.clear(); + out->addProblem(ProblemSeverity::Error, QObject::tr("Forge workarounds have no place in MultiMC.")); + } out->libraries.append(lib); } }; -- cgit