From 6e80f03409054293bdbbcd0ce87b607a811016d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 2 Oct 2016 00:26:10 +0200 Subject: NOISSUE add instance-local library storage Any libraries stored in $instanceroot/libraries/ will override the libraries from MultiMC's global folders, as long as they are marked 'local' in the json patch. --- api/logic/minecraft/GradleSpecifier.h | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'api/logic/minecraft/GradleSpecifier.h') diff --git a/api/logic/minecraft/GradleSpecifier.h b/api/logic/minecraft/GradleSpecifier.h index 18308537..b05553bb 100644 --- a/api/logic/minecraft/GradleSpecifier.h +++ b/api/logic/minecraft/GradleSpecifier.h @@ -55,18 +55,23 @@ struct GradleSpecifier } return retval; } + QString getFileName() const + { + QString filename = m_artifactId + '-' + m_version; + if(!m_classifier.isEmpty()) + { + filename += "-" + m_classifier; + } + filename += "." + m_extension; + return filename; + } QString toPath() const { if(!m_valid) return "INVALID"; QString path = m_groupId; path.replace('.', '/'); - path += '/' + m_artifactId + '/' + m_version + '/' + m_artifactId + '-' + m_version; - if(!m_classifier.isEmpty()) - { - path += "-" + m_classifier; - } - path += "." + m_extension; + path += '/' + m_artifactId + '/' + m_version + '/' + getFileName(); return path; } inline bool valid() const -- cgit v1.2.3