diff options
| author | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2021-04-17 09:46:11 -0700 |
|---|---|---|
| committer | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2021-04-17 09:46:11 -0700 |
| commit | e668aa0f95f4f56a1ac4320f014662d279c22708 (patch) | |
| tree | 7462597a5b709081b15c224d928b36018c74248f /api | |
| parent | 13afad80fb9b17503621dc63509113203af8887c (diff) | |
| download | PrismLauncher-e668aa0f95f4f56a1ac4320f014662d279c22708.tar.gz PrismLauncher-e668aa0f95f4f56a1ac4320f014662d279c22708.tar.bz2 PrismLauncher-e668aa0f95f4f56a1ac4320f014662d279c22708.zip | |
switch to new toml library
Diffstat (limited to 'api')
| -rw-r--r-- | api/logic/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | api/logic/minecraft/mod/LocalModParseTask.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/logic/CMakeLists.txt b/api/logic/CMakeLists.txt index 23bf848d..91155ea7 100644 --- a/api/logic/CMakeLists.txt +++ b/api/logic/CMakeLists.txt @@ -540,7 +540,7 @@ set_target_properties(MultiMC_logic PROPERTIES CXX_VISIBILITY_PRESET hidden VISI generate_export_header(MultiMC_logic) # Link -target_link_libraries(MultiMC_logic systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES} optional-bare toml11 BuildConfig) +target_link_libraries(MultiMC_logic systeminfo MultiMC_quazip MultiMC_classparser ${NBT_NAME} ${ZLIB_LIBRARIES} optional-bare tomlc99 BuildConfig) target_link_libraries(MultiMC_logic Qt5::Core Qt5::Xml Qt5::Network Qt5::Concurrent) # Mark and export headers diff --git a/api/logic/minecraft/mod/LocalModParseTask.cpp b/api/logic/minecraft/mod/LocalModParseTask.cpp index 9f3da5a7..d8475fe2 100644 --- a/api/logic/minecraft/mod/LocalModParseTask.cpp +++ b/api/logic/minecraft/mod/LocalModParseTask.cpp @@ -6,7 +6,7 @@ #include <QJsonValue> #include <quazip.h> #include <quazipfile.h> -#include <toml.hpp> +#include <toml.h> #include "settings/INIFile.h" #include "FileSystem.h" @@ -91,7 +91,7 @@ std::shared_ptr<ModDetails> ReadMCModInfo(QByteArray contents) return nullptr; } - +/* std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents) { std::shared_ptr<ModDetails> details = std::make_shared<ModDetails>(); @@ -148,7 +148,7 @@ std::shared_ptr<ModDetails> ReadMCModTOML(QByteArray contents) } return details; } - +*/ // https://fabricmc.net/wiki/documentation:fabric_mod_json std::shared_ptr<ModDetails> ReadFabricModInfo(QByteArray contents) { @@ -257,7 +257,7 @@ void LocalModParseTask::processAsZip() QuaZipFile file(&zip); - if (zip.setCurrentFile("META-INF/mods.toml")) + /*if (zip.setCurrentFile("META-INF/mods.toml")) { if (!file.open(QIODevice::ReadOnly)) { @@ -307,7 +307,7 @@ void LocalModParseTask::processAsZip() zip.close(); return; } - else if (zip.setCurrentFile("mcmod.info")) + else*/ if (zip.setCurrentFile("mcmod.info")) { if (!file.open(QIODevice::ReadOnly)) { |