From 31988f0529f6c316d6a9ba3e66cf981a807ed710 Mon Sep 17 00:00:00 2001 From: Sefa Eyeoglu Date: Sat, 14 May 2022 19:56:38 +0200 Subject: [PATCH] fix: adapt upstream Modrinth code to our codebase --- launcher/CMakeLists.txt | 8 +-- launcher/InstanceImportTask.cpp | 2 - .../multimc/128x128/instances/modrinth.png | Bin 10575 -> 0 bytes .../multimc/32x32/instances/modrinth.png | Bin 1913 -> 0 bytes launcher/resources/multimc/multimc.qrc | 3 -- launcher/ui/pages/modplatform/ImportPage.cpp | 2 +- .../modplatform/modrinth/ModrinthPage.cpp | 45 ++++++++++++----- .../pages/modplatform/modrinth/ModrinthPage.h | 46 +++++++++++++----- 8 files changed, 72 insertions(+), 34 deletions(-) delete mode 100644 launcher/resources/multimc/128x128/instances/modrinth.png delete mode 100644 launcher/resources/multimc/32x32/instances/modrinth.png diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt index cbe135e2b..7984d3c98 100644 --- a/launcher/CMakeLists.txt +++ b/launcher/CMakeLists.txt @@ -532,6 +532,8 @@ set(FLAME_SOURCES set(MODRINTH_SOURCES modplatform/modrinth/ModrinthPackIndex.cpp modplatform/modrinth/ModrinthPackIndex.h + modplatform/modrinth/ModrinthPackManifest.cpp + modplatform/modrinth/ModrinthPackManifest.h ) set(MODPACKSCH_SOURCES @@ -563,11 +565,6 @@ set(ATLAUNCHER_SOURCES modplatform/atlauncher/ATLShareCode.h ) -set(MODRINTH_SOURCES - modplatform/modrinth/ModrinthPackManifest.cpp - modplatform/modrinth/ModrinthPackManifest.h -) - add_unit_test(Index SOURCES meta/Index_test.cpp LIBS Launcher_logic @@ -601,7 +598,6 @@ set(LOGIC_SOURCES ${MODPACKSCH_SOURCES} ${TECHNIC_SOURCES} ${ATLAUNCHER_SOURCES} - ${MODRINTH_SOURCES} ) SET(LAUNCHER_SOURCES diff --git a/launcher/InstanceImportTask.cpp b/launcher/InstanceImportTask.cpp index 517155811..ec0f58e08 100644 --- a/launcher/InstanceImportTask.cpp +++ b/launcher/InstanceImportTask.cpp @@ -581,8 +581,6 @@ void InstanceImportTask::processModrinth() { QString configPath = FS::PathCombine(m_stagingPath, "instance.cfg"); auto instanceSettings = std::make_shared(configPath); - instanceSettings->registerSetting("InstanceType", "Legacy"); - instanceSettings->set("InstanceType", "OneSix"); MinecraftInstance instance(m_globalSettings, instanceSettings, m_stagingPath); auto components = instance.getPackProfile(); components->buildingFromScratch(); diff --git a/launcher/resources/multimc/128x128/instances/modrinth.png b/launcher/resources/multimc/128x128/instances/modrinth.png deleted file mode 100644 index 740bc8f02469f108db79d92d05484aff17bf8801..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10575 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 diff --git a/launcher/resources/multimc/32x32/instances/modrinth.png b/launcher/resources/multimc/32x32/instances/modrinth.png deleted file mode 100644 index 025ed06534234458f6de2456868d0a66b4324f3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1913 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}EX7WqAsieW95oy%9SjWY z2A(dCArY-_!!vV2u1nh9-~0aThWEZ61x*{DFJw5|q_AYEruR}6uCuq&4y488G>cDT z*}5Vt^wz5235&u)J-ZxMmdiY5RcmZpv2=&G!`fSIWz6;|F(X=zUTM3^7EDVzu&cf&h-Daa~_M#9qzUEJaQ_xew^1<&VBE{!#_ELrO|$7x3@d*$tyyC!kW} zfjgGzJ@ql4CUA%~EitUPsd8s|^yz9pe&)7?0&I*1)m2aZKg*a#UGF-f#IWGFa_z@| zsq4e`nSZ#*#G#p06epBWN9y;^MQqP^C!H2^-d3HrY13L0G3JH~>kjaxuH;q8wAs9E z>5|n})^Vx!BG=CBh|J7kWRTjDdV>4)r+4AgzE-u(X|pw{I9Kc&xn$FC7KQ*HIR=f1 z?7F%CD^uT|VP&`=-CZ}8tzJMdFv?bX&DohHzKlt$m%FCeoaFb7F=IN=^=i+|Tg&4` z54udM&1+h%-}j=VZ2hYnSAvAro<8#J*sfE)lU{qw6ITtM(r>SyapJ74Oxx?DzO0_% zE^5DZ{_k2nEg|lzP4%@CpVeIwSAG1@{OnO*KBL2mla`BI#3ueZ;9J4JW$nv<-ph`e z--mfe7TDD&(ir; zD>7|Xxn z$883MC|!1jsy8KmC8mrHfz6*AHhsCLSX6Yuw_+iWCBqlF_iI`odNKrTTi0^v5|1Ur z4ZFyKRDO-G{!Xhr{zy!^cfG6o^3+@6e1}<9e|p!_`d7(l){@ti&u;$}_sNTn{GPw* zb(ICrbpd;CZXb#M-#s6-dJ=V}mYqA5u=Y&&D=t<>w(v7HbohL`eMv5>WY$()c9)aB zE8lh>emOOLd4Wx*xBFLJh6OI?QYzZL7#0{`)tJNYq@d6v)9A#|m94XMp5VklhgGi? zcX+zI6YQ;KXjqaxDduXF;NRnu40Kd0luY}TR|-AtQ!sF1=y>o}+lWEDo{8aNQFh|n z9_wJ2W!itY2D_w)oU}7PnI92nBtB*Or6ZhD{|o z#4Y*b#pcJKUd%dvxADnBp0`{17O8Q$XSV7yDrG83U9VoXbW6271IzZOJzso3*dMFd zWP7_JMc$D2iu-hL+ogy#3-t2$ZTng$@LQPq)8P}l`tE6aGaOJk%Qva^ zrT({`)A@Z;GUeN+e~?rCxUZupeA}we$LF3~B%YqfZTe)o_!aB#j0}FPYMHIFl0}mz z=x>{PEQvp#|A%gLxVEb0qJRuzyEDQ(!WW|M72n$NBTmbFQOk$$@O=|=VlV%#j`<=c z!M~odL1U&OSA6icb=!1qvN25Ty=bg(?*mW$)2frz(Wk8XnkIA#2k3e|V^WCS{Ih6& zMX0k-)kVt%TWpvn9D5q3F7~%>S>5T^pQiuH5mnj1;lS6CqV$ecY3kkDgL8KVD@!LW zXL#`NE#v-spfInwfmnstFoMS zaha^b6aT84e@e_*{sl66_oy>@_0;g n-#M$BpSMfzob|W32x32/instances/flame.png 128x128/instances/flame.png - 32x32/instances/modrinth.png - 128x128/instances/modrinth.png - 32x32/instances/gear.png 128x128/instances/gear.png diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp index 8ae38f8dd..3b65de9d4 100644 --- a/launcher/ui/pages/modplatform/ImportPage.cpp +++ b/launcher/ui/pages/modplatform/ImportPage.cpp @@ -144,8 +144,8 @@ void ImportPage::setUrl(const QString& url) void ImportPage::on_modpackBtn_clicked() { - // TODO: Add .mrpack filter auto filter = QMimeDatabase().mimeTypeForName("application/zip").filterString(); + filter += ";;" + tr("Modrinth pack (*.mrpack)"); const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), filter); if (url.isValid()) { diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp index 93b1ca027..0d65ef166 100644 --- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp +++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp @@ -1,18 +1,36 @@ +// SPDX-License-Identifier: GPL-3.0-only /* - * Copyright 2013-2021 MultiMC Contributors - * Copyright 2021-2022 kb1000 + * PolyMC - Minecraft Launcher * - * 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 + * 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. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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. * - * 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. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright 2013-2021 MultiMC Contributors + * Copyright 2021-2022 kb1000 + * + * 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 "ModrinthPage.h" @@ -31,6 +49,11 @@ ModrinthPage::~ModrinthPage() delete ui; } +void ModrinthPage::retranslate() +{ + ui->retranslateUi(this); +} + void ModrinthPage::openedImpl() { BasePage::openedImpl(); diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h index 6c75b60dd..562049b48 100644 --- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h +++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.h @@ -1,18 +1,36 @@ +// SPDX-License-Identifier: GPL-3.0-only /* - * Copyright 2013-2021 MultiMC Contributors - * Copyright 2021-2022 kb1000 + * PolyMC - Minecraft Launcher * - * 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 + * 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. * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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. * - * 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. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * This file incorporates work covered by the following copyright and + * permission notice: + * + * Copyright 2013-2021 MultiMC Contributors + * Copyright 2021-2022 kb1000 + * + * 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. */ #pragma once @@ -49,6 +67,12 @@ public: return "modrinth"; } + virtual QString helpPage() const override + { + return "Modrinth-platform"; + } + void retranslate() override; + void openedImpl() override; bool eventFilter(QObject *watched, QEvent *event) override;