CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE use classparser for importing Legacy instances with undecided Minecraft versions

Browse Source
This commit is contained in:
Petr Mrázek
2017-09-27 15:39:13 +02:00
parent 9a2d203c0d
commit c51512f940
7 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/classparser/CMakeLists.txt
View File

@ -18,7 +18,7 @@ include_directories(${Qt5Base_INCLUDE_DIRS})
set(CLASSPARSER_HEADERS
# Public headers
include/classparser_config.h
include/javautils.h
include/classparser.h
# Private headers
src/annotations.h
@ -30,12 +30,13 @@ src/membuffer.h
)
set(CLASSPARSER_SOURCES
src/javautils.cpp
src/classparser.cpp
src/annotations.cpp
)
add_definitions(-DCLASSPARSER_LIBRARY)
add_library(classparser SHARED ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
target_include_directories(classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
qt5_use_modules(classparser Core)
add_library(MultiMC_classparser STATIC ${CLASSPARSER_SOURCES} ${CLASSPARSER_HEADERS})
target_include_directories(MultiMC_classparser PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(MultiMC_classparser MultiMC_quazip)
qt5_use_modules(MultiMC_classparser Core)

4
libraries/classparser/include/javautils.h → libraries/classparser/include/classparser.h
View File

@ -18,9 +18,7 @@
#include <QString>
#include "classparser_config.h"
#define MCVer_Unknown "Unknown"
namespace javautils
namespace classparser
{
/**
* @brief Get the version from a minecraft.jar by parsing its class files. Expensive!

8
libraries/classparser/src/javautils.cpp → libraries/classparser/src/classparser.cpp
View File

@ -15,17 +15,18 @@
* limitations under the License.
*/
#include "classfile.h"
#include "javautils.h"
#include "classparser.h"
#include <QFile>
#include <quazipfile.h>
#include <QDebug>
namespace javautils
namespace classparser
{
QString GetMinecraftJarVersion(QString jarName)
{
QString version = MCVer_Unknown;
QString version;
// check if minecraft.jar exists
QFile jar(jarName);
@ -61,6 +62,7 @@ QString GetMinecraftJarVersion(QString jarName)
if (constant.type != java::constant::j_string_data)
continue;
const std::string &str = constant.str_data;
qDebug() << QString::fromStdString(str);
if (str.compare(0, 20, "Minecraft Minecraft ") == 0)
{
version = str.substr(20).data();