From 576d808d7197b4b7ef798891dfd138e2e8aae54f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 13 Mar 2016 02:28:55 +0100 Subject: NOISSUE resolve library activeness during application to profile --- logic/minecraft/forge/ForgeInstaller.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'logic/minecraft/forge') diff --git a/logic/minecraft/forge/ForgeInstaller.cpp b/logic/minecraft/forge/ForgeInstaller.cpp index a72160a2..c42a8e18 100644 --- a/logic/minecraft/forge/ForgeInstaller.cpp +++ b/logic/minecraft/forge/ForgeInstaller.cpp @@ -193,6 +193,8 @@ bool ForgeInstaller::add(OneSixInstance *to) QJsonObject libObj = OneSixVersionFormat::libraryToJson(lib.get()); + // FIXME: use upstream Minecraft version files instead, not the processed profile! + /* bool equals = false; // find an entry that matches this one for (auto tolib : to->getMinecraftProfile()->getVanillaLibraries()) @@ -209,6 +211,7 @@ bool ForgeInstaller::add(OneSixInstance *to) { continue; } + */ libraries.append(libObj); } obj.insert("libraries", libraries); @@ -225,7 +228,8 @@ bool ForgeInstaller::add(OneSixInstance *to) match = expression.match(args); } } - if (!args.isEmpty() && args != to->getMinecraftProfile()->getVanillaMinecraftArguments()) + // FIXME: use upstream Minecraft version files instead, not the processed profile! + if (!args.isEmpty() /* && args != to->getMinecraftProfile()->getVanillaMinecraftArguments() */) { obj.insert("minecraftArguments", args); } -- cgit v1.2.3