Skip to content

Commit

Permalink
New lwjgl solution, not working
Browse files Browse the repository at this point in the history
  • Loading branch information
kappa-maintainer committed Dec 16, 2024
1 parent f9b5813 commit 35e93c4
Show file tree
Hide file tree
Showing 452 changed files with 6,278 additions and 4,580 deletions.
12 changes: 6 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,8 @@ project(':cleanroom') {
// Do not change the order unless it is required so
lwjglLibraries = [
[
'lwjgl3-glfw', 'lwjgl3-jemalloc', 'lwjgl3-openal',
'lwjgl3-opengl', 'lwjgl3-stb', 'lwjgl3-tinyfd', 'lwjgl3'
'lwjgl-glfw', 'lwjgl-jemalloc', 'lwjgl-openal',
'lwjgl-opengl', 'lwjgl-stb', 'lwjgl-tinyfd', 'lwjgl'
],

[
Expand Down Expand Up @@ -290,7 +290,7 @@ project(':cleanroom') {
environment 'FORGE_GROUP', project.group
environment 'FORGE_VERSION', props.last_forge_version

jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true' + '-Djava.system.class.loader=net.minecraft.launchwrapper.LaunchClassLoader'
jvmArgs jvm_arguments + '-Dmixin.debug.export=true' + '-Dmixin.checks.interfaces=true'
//jvmArgs jvm_arguments

// Lazily supply the Mappings target, createSrg2Mcp.getMappings() doesn't get populated until later
Expand Down Expand Up @@ -417,11 +417,11 @@ project(':cleanroom') {

dependencies {
lwjglLibraries[0].each {
installer "org.lwjgl3:$it:$props.lwjgl_version"
runtimeOnly "org.lwjgl3:$it::$lwjglArch"
installer "org.lwjgl:$it:$props.lwjgl_version"
runtimeOnly "org.lwjgl:$it::$lwjglArch"

lwjglLibraries[1].each { arch ->
lwjglNatives "org.lwjgl3:$it:$props.lwjgl_version:$arch"
lwjglNatives "org.lwjgl:$it:$props.lwjgl_version:$arch"
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ installer_tools_version = 1.4.1
asm_version = 9.7.1
asm_deprecated = 7.1
netty_version = 4.1.114.Final
lwjgl_version = 3.3.4-27-CLEANROOM
lwjgl_version = 3.3.5

# Sets default memory used for Gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
Expand Down
Loading

0 comments on commit 35e93c4

Please sign in to comment.