Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
912a97ca94dd06f8a6dfb25608c0024dcd1ec0a2
d562b83d28c54d14bbb2f0366ed428945100310e
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4d7b802102910e7d570874ad36e1e0fa6874117e
3999dc44bce7e9d269e034e79c7e430f88a50f3e
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,10 @@ public static void launchMinecraft(final AppCompatActivity activity, MinecraftAc
javaArgList.addAll(Arrays.asList(getMinecraftJVMArgs(versionId, gamedir)));
javaArgList.add("-cp"); javaArgList.add(launchClasspath);

// Some modloaders (babric) don't fully respect java.libary.path and only use the native lib dir
// This arg makes them use it. LWJGL prioritizes this path during native loading as well.
javaArgList.add("-Dorg.lwjgl.librarypath="+lwjglNativesDir);

// Forge 1.6.4 crash mitigation
// https://github.com/MinecraftForge/FML/blob/f1b3381e61fac1a0ae90f521223c6bc613eb4888/common/cpw/mods/fml/common/asm/FMLSanityChecker.java#L192-L208
// It for some reason fails certification and crashes because it thinks Minecraft is corrupted.
Expand Down
10 changes: 4 additions & 6 deletions jre_lwjgl3glfw/lwjgl-3.3.3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,17 @@ jar {
"lwjgl-openal.jar",
"lwjgl-stb.jar",
"lwjgl-tinyfd.jar",
"lwjgl-opengl.jar"
"lwjgl-shaderc.jar",
"lwjgl-spvc.jar",
"lwjgl-vma.jar",
"lwjgl-vulkan.jar"
]

duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveBaseName.set("lwjgl-${lwjglVersion}-merged-modules")
// destinationDirectory.set(project(":jre_lwjgl3glfw").layout.buildDirectory.dir("libs/lwjgl-${lwjglVersion}"))
destinationDirectory = file("${project(':app_pojavlauncher').layout.projectDirectory}/src/main/assets/components/lwjgl3/${lwjglVersion}")

// Mark as using multiple Java versions.
manifest {
attributes "Multi-Release": "true"
}

from {
// Ensure that the core lwjgl jar is processed first so duplicates in META-INF from other classes
// are ignored. This avoids InvalidModuleDescriptorException due to say, using the module-info.class
Expand Down
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-freetype.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-glfw.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-lwjglx.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-nanovg.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-openal.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-opengl.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-shaderc.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-spvc.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-stb.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-tinyfd.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vma.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl-vulkan.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.3.3/libs/lwjgl-3.3.3/lwjgl.jar
Binary file not shown.
10 changes: 4 additions & 6 deletions jre_lwjgl3glfw/lwjgl-3.4.1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,17 @@ jar {
"lwjgl-openal.jar",
"lwjgl-stb.jar",
"lwjgl-tinyfd.jar",
"lwjgl-opengl.jar"
"lwjgl-shaderc.jar",
"lwjgl-spvc.jar",
"lwjgl-vma.jar",
"lwjgl-vulkan.jar"
]

duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveBaseName.set("lwjgl-${lwjglVersion}-merged-modules")
// destinationDirectory.set(project(":jre_lwjgl3glfw").layout.buildDirectory.dir("libs/lwjgl-${lwjglVersion}"))
destinationDirectory = file("${project(':app_pojavlauncher').layout.projectDirectory}/src/main/assets/components/lwjgl3/${lwjglVersion}")

// Mark as using multiple Java versions.
manifest {
attributes "Multi-Release": "true"
}

from {
// Ensure that the core lwjgl jar is processed first so duplicates in META-INF from other classes
// are ignored. This avoids InvalidModuleDescriptorException due to say, using the module-info.class
Expand Down
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-freetype.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-glfw.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-lwjglx.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-nanovg.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-openal.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-opengl.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-shaderc.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-spvc.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-stb.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-tinyfd.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vma.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl-vulkan.jar
Binary file not shown.
Binary file modified jre_lwjgl3glfw/lwjgl-3.4.1/libs/lwjgl-3.4.1/lwjgl.jar
Binary file not shown.
Loading