diff options
author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-20 20:40:56 +0100 |
---|---|---|
committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-01-31 21:40:59 +0100 |
commit | efa414c442a77735a5f972b7103e8ce866a6bdd1 (patch) | |
tree | dbefe8703aeed2f40e95fb2d5dac5a0ad0f794f0 /launcher/minecraft/launch | |
parent | c39da093bf5f4d73f2cfbc1b030d5c1e8297f5a2 (diff) | |
download | PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.tar.gz PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.tar.bz2 PrismLauncher-efa414c442a77735a5f972b7103e8ce866a6bdd1.zip |
refactor: initial migration to QuaZip 1.2
Let's move off our custom QuaZip. In the olden times we needed the
custom version of QuaZip, as it was basically unmaintained and on
SourceForge (eww). But nowadays it's maintained and on GitHub. See
new GitHub page: https://github.com/stachenov/quazip
Diffstat (limited to 'launcher/minecraft/launch')
-rw-r--r-- | launcher/minecraft/launch/ExtractNatives.cpp | 4 | ||||
-rw-r--r-- | launcher/minecraft/launch/ModMinecraftJar.cpp | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/launcher/minecraft/launch/ExtractNatives.cpp b/launcher/minecraft/launch/ExtractNatives.cpp index 8cd439b1..744e7ac6 100644 --- a/launcher/minecraft/launch/ExtractNatives.cpp +++ b/launcher/minecraft/launch/ExtractNatives.cpp @@ -17,8 +17,8 @@ #include <minecraft/MinecraftInstance.h> #include <launch/LaunchTask.h> -#include <quazip.h> -#include <quazipdir.h> +#include <QuaZip-Qt5-1.2/quazip/quazip.h> +#include <QuaZip-Qt5-1.2/quazip/quazipdir.h> #include "MMCZip.h" #include "FileSystem.h" #include <QDir> diff --git a/launcher/minecraft/launch/ModMinecraftJar.cpp b/launcher/minecraft/launch/ModMinecraftJar.cpp index 93de9d59..c8796f01 100644 --- a/launcher/minecraft/launch/ModMinecraftJar.cpp +++ b/launcher/minecraft/launch/ModMinecraftJar.cpp @@ -42,6 +42,7 @@ void ModMinecraftJar::executeTask() emitFailed(tr("Couldn't remove stale jar file: %1").arg(finalJarPath)); } + /* // create temporary modded jar, if needed auto components = m_inst->getPackProfile(); auto profile = components->getProfile(); @@ -53,12 +54,13 @@ void ModMinecraftJar::executeTask() mainJar->getApplicableFiles(currentSystem, jars, temp1, temp2, temp3, m_inst->getLocalLibraryPath()); auto sourceJarPath = jars[0]; if(!MMCZip::createModdedJar(sourceJarPath, finalJarPath, jarMods)) - { + { */ + // TODO: add back support for modded jar emitFailed(tr("Failed to create the custom Minecraft jar file.")); return; - } + /*} } - emitSucceeded(); + emitSucceeded();*/ } void ModMinecraftJar::finalize() |