| @@ -1,38 +1,38 @@ | ||||
| // SPDX-License-Identifier: GPL-3.0-only | ||||
| /* | ||||
| *  PolyMC - Minecraft Launcher | ||||
| *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com> | ||||
| *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> | ||||
| * | ||||
| *  This program is free software: you can redistribute it and/or modify | ||||
| *  it under the terms of the GNU General Public License as published by | ||||
| *  the Free Software Foundation, version 3. | ||||
| * | ||||
| *  This program is distributed in the hope that it will be useful, | ||||
| *  but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
| *  GNU General Public License for more details. | ||||
| * | ||||
| *  You should have received a copy of the GNU General Public License | ||||
| *  along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
| * | ||||
| * This file incorporates work covered by the following copyright and | ||||
| * permission notice: | ||||
| * | ||||
| *      Copyright 2013-2021 MultiMC Contributors | ||||
| * | ||||
| *      Licensed under the Apache License, Version 2.0 (the "License"); | ||||
| *      you may not use this file except in compliance with the License. | ||||
| *      You may obtain a copy of the License at | ||||
| * | ||||
| *          http://www.apache.org/licenses/LICENSE-2.0 | ||||
| * | ||||
| *      Unless required by applicable law or agreed to in writing, software | ||||
| *      distributed under the License is distributed on an "AS IS" BASIS, | ||||
| *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
| *      See the License for the specific language governing permissions and | ||||
| *      limitations under the License. | ||||
| */ | ||||
|  *  PolyMC - Minecraft Launcher | ||||
|  *  Copyright (c) 2022 flowln <flowlnlnln@gmail.com> | ||||
|  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net> | ||||
|  * | ||||
|  *  This program is free software: you can redistribute it and/or modify | ||||
|  *  it under the terms of the GNU General Public License as published by | ||||
|  *  the Free Software Foundation, version 3. | ||||
|  * | ||||
|  *  This program is distributed in the hope that it will be useful, | ||||
|  *  but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|  *  GNU General Public License for more details. | ||||
|  * | ||||
|  *  You should have received a copy of the GNU General Public License | ||||
|  *  along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  * | ||||
|  * This file incorporates work covered by the following copyright and | ||||
|  * permission notice: | ||||
|  * | ||||
|  *      Copyright 2013-2021 MultiMC Contributors | ||||
|  * | ||||
|  *      Licensed under the Apache License, Version 2.0 (the "License"); | ||||
|  *      you may not use this file except in compliance with the License. | ||||
|  *      You may obtain a copy of the License at | ||||
|  * | ||||
|  *          http://www.apache.org/licenses/LICENSE-2.0 | ||||
|  * | ||||
|  *      Unless required by applicable law or agreed to in writing, software | ||||
|  *      distributed under the License is distributed on an "AS IS" BASIS, | ||||
|  *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||
|  *      See the License for the specific language governing permissions and | ||||
|  *      limitations under the License. | ||||
|  */ | ||||
|  | ||||
| #include "ModFolderLoadTask.h" | ||||
|  | ||||
| @@ -70,13 +70,11 @@ void ModFolderLoadTask::executeTask() | ||||
|                 m_result->mods[mod->internal_id()]->setStatus(ModStatus::Installed); | ||||
|                 // Delete the object we just created, since a valid one is already in the mods list. | ||||
|                 delete mod; | ||||
|             } | ||||
|             else { | ||||
|             } else { | ||||
|                 m_result->mods[mod->internal_id()].reset(std::move(mod)); | ||||
|                 m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata); | ||||
|             } | ||||
|         } | ||||
|         else {  | ||||
|         } else { | ||||
|             QString chopped_id = mod->internal_id().chopped(9); | ||||
|             if (m_result->mods.contains(chopped_id)) { | ||||
|                 m_result->mods[mod->internal_id()].reset(std::move(mod)); | ||||
| @@ -88,8 +86,7 @@ void ModFolderLoadTask::executeTask() | ||||
|                     m_result->mods[mod->internal_id()]->setStatus(ModStatus::Installed); | ||||
|                     m_result->mods.remove(chopped_id); | ||||
|                 } | ||||
|             } | ||||
|             else { | ||||
|             } else { | ||||
|                 m_result->mods[mod->internal_id()].reset(std::move(mod)); | ||||
|                 m_result->mods[mod->internal_id()]->setStatus(ModStatus::NoMetadata); | ||||
|             } | ||||
| @@ -124,7 +121,7 @@ void ModFolderLoadTask::getFromMetadata() | ||||
|     for (auto entry : m_index_dir.entryList(QDir::Files)) { | ||||
|         auto metadata = Metadata::get(m_index_dir, entry); | ||||
|  | ||||
|         if(!metadata.isValid()){ | ||||
|         if (!metadata.isValid()) { | ||||
|             return; | ||||
|         } | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Sefa Eyeoglu
					Sefa Eyeoglu