diff --git a/launcher/minecraft/mod/DataPack.h b/launcher/minecraft/mod/DataPack.h index ac6408bde..2943dd4bc 100644 --- a/launcher/minecraft/mod/DataPack.h +++ b/launcher/minecraft/mod/DataPack.h @@ -64,8 +64,6 @@ class DataPack : public Resource { [[nodiscard]] int compare(Resource const& other, SortType type) const override; [[nodiscard]] bool applyFilter(QRegularExpression filter) const override; - virtual QString directory() { return "/data"; } - protected: mutable QMutex m_data_lock; diff --git a/launcher/minecraft/mod/ResourcePack.h b/launcher/minecraft/mod/ResourcePack.h index 494bdee97..9345e9c27 100644 --- a/launcher/minecraft/mod/ResourcePack.h +++ b/launcher/minecraft/mod/ResourcePack.h @@ -23,6 +23,4 @@ class ResourcePack : public DataPack { /** Gets, respectively, the lower and upper versions supported by the set pack format. */ std::pair compatibleVersions() const override; - - QString directory() override { return "/assets"; } }; diff --git a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp index c37a25c21..c63e0c65f 100644 --- a/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp +++ b/launcher/minecraft/mod/tasks/LocalDataPackParseTask.cpp @@ -73,11 +73,6 @@ bool processFolder(DataPack* pack, ProcessingLevel level) return mcmeta_invalid(); // mcmeta file isn't a valid file } - QFileInfo data_dir_info(FS::PathCombine(pack->fileinfo().filePath(), pack->directory())); - if (!data_dir_info.exists() || !data_dir_info.isDir()) { - return false; // data dir does not exists or isn't valid - } - if (level == ProcessingLevel::BasicInfoOnly) { return true; // only need basic info already checked } @@ -141,11 +136,6 @@ bool processZIP(DataPack* pack, ProcessingLevel level) return mcmeta_invalid(); // could not set pack.mcmeta as current file. } - QuaZipDir zipDir(&zip); - if (!zipDir.exists(pack->directory())) { - return false; // data dir does not exists at zip root - } - if (level == ProcessingLevel::BasicInfoOnly) { zip.close(); return true; // only need basic info already checked