0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NOISSUE Remove hardcoded LWJGL (modern)

Browse Source
This commit is contained in:
Petr Mrázek
2017-03-12 20:08:56 +01:00
parent 2980322c3b
commit f6eb8fa1e4
8 changed files with 2 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/logic/minecraft/onesix/OneSixProfileStrategy.cpp
View File

@@ -121,12 +121,8 @@ void OneSixProfileStrategy::loadDefaultBuiltinPatches()
}
else
{
// NOTE: this is obviously fake, is fixed in unstable.
QResource LWJGL(":/versions/LWJGL/2.9.1.json");
auto lwjgl = ProfileUtils::parseJsonFile(LWJGL.absoluteFilePath(), false);
lwjgl->setVanilla(true);
lwjgl->setCustomizable(true);
lwjglPatch = std::dynamic_pointer_cast<ProfilePatch>(lwjgl);
auto lwjglversion = ENV.getVersion("org.lwjgl", "2.9.1" /*m_instance->intendedVersionId()*/);
lwjglPatch = std::dynamic_pointer_cast<ProfilePatch>(lwjglversion);
}
if (!lwjglPatch)
{

1
application/CMakeLists.txt
View File

@@ -313,7 +313,6 @@ set(MULTIMC_QRCS
resources/pe_blue/pe_blue.qrc
resources/OSX/OSX.qrc
resources/iOS/iOS.qrc
resources/versions/versions.qrc
resources/certs/certs.qrc
)

1
application/main.cpp
View File

@@ -38,7 +38,6 @@ int main(int argc, char *argv[])
{
Q_INIT_RESOURCE(multimc);
Q_INIT_RESOURCE(backgrounds);
Q_INIT_RESOURCE(versions);
Q_INIT_RESOURCE(pe_dark);
Q_INIT_RESOURCE(pe_light);

45
application/resources/versions/LWJGL/2.9.0.json
View File

@@ -1,45 +0,0 @@
{
"fileId": "org.lwjgl",
"name": "LWJGL",
"version": "2.9.0",
"+libraries": [
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.0",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
]
}

45
application/resources/versions/LWJGL/2.9.1-nightly-20130708-debug3.json
View File

@@ -1,45 +0,0 @@
{
"fileId": "org.lwjgl",
"name": "LWJGL",
"version": "2.9.1-nightly-20130708-debug3",
"+libraries": [
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1-nightly-20130708-debug3"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1-nightly-20130708-debug3"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1-nightly-20130708-debug3",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
]
}

45
application/resources/versions/LWJGL/2.9.1.json
View File

@@ -1,45 +0,0 @@
{
"fileId": "org.lwjgl",
"name": "LWJGL",
"version": "2.9.1",
"+libraries": [
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.1"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.1",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
]
}

45
application/resources/versions/LWJGL/2.9.2-nightly-20140822.json
View File

@@ -1,45 +0,0 @@
{
"fileId": "org.lwjgl",
"name": "LWJGL",
"version": "2.9.2-nightly-20140822",
"+libraries": [
{
"name": "net.java.jinput:jinput:2.0.5"
},
{
"name": "net.java.jinput:jinput-platform:2.0.5",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
},
{
"name": "net.java.jutils:jutils:1.0.0"
},
{
"name": "org.lwjgl.lwjgl:lwjgl:2.9.2-nightly-20140822"
},
{
"name": "org.lwjgl.lwjgl:lwjgl_util:2.9.2-nightly-20140822"
},
{
"name": "org.lwjgl.lwjgl:lwjgl-platform:2.9.2-nightly-20140822",
"natives": {
"linux": "natives-linux",
"windows": "natives-windows",
"osx": "natives-osx"
},
"extract": {
"exclude": [
"META-INF/"
]
}
}
]
}

10
application/resources/versions/versions.qrc
View File

@@ -1,10 +0,0 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/versions">
<!-- LWJGL -->
<file>LWJGL/2.9.0.json</file>
<file>LWJGL/2.9.1-nightly-20130708-debug3.json</file>
<file>LWJGL/2.9.1.json</file>
<file>LWJGL/2.9.2-nightly-20140822.json</file>
</qresource>
</RCC>