From 4e9feca8d49db9c6496da623d41c6ca07d7d341d Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Wed, 19 Jun 2024 18:26:25 +0000 Subject: [PATCH] Validate mod.json as json5 instead of strict json since Android launcher no longer exists --- lib/modding/CModHandler.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/modding/CModHandler.cpp b/lib/modding/CModHandler.cpp index 173fd921a..1cf7b7ba9 100644 --- a/lib/modding/CModHandler.cpp +++ b/lib/modding/CModHandler.cpp @@ -226,10 +226,7 @@ void CModHandler::loadOneMod(std::string modName, const std::string & parent, co if(CResourceHandler::get("initial")->existsResource(CModInfo::getModFile(modFullName))) { - JsonParsingSettings settings; - settings.mode = JsonParsingSettings::JsonFormatMode::JSON; // TODO: remove once Android launcher with its strict parser is gone - - CModInfo mod(modFullName, modSettings[modName], JsonNode(CModInfo::getModFile(modFullName), settings)); + CModInfo mod(modFullName, modSettings[modName], JsonNode(CModInfo::getModFile(modFullName))); if (!parent.empty()) // this is submod, add parent to dependencies mod.dependencies.insert(parent);