From 8b850f14d3126214fbd69445ffca875a2ad540d7 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 7 Feb 2026 10:20:23 -0600 Subject: [PATCH] Move LWJGL variables into a MC version property --- build.gradle | 3 +-- coreSubProjects | 2 +- gradle.properties | 4 ---- versionProperties/1.16.5.properties | 4 ++++ versionProperties/1.17.1.properties | 4 ++++ versionProperties/1.18.2.properties | 6 +++++- versionProperties/1.19.2.properties | 3 +++ versionProperties/1.19.4.properties | 3 +++ versionProperties/1.20.1.properties | 3 +++ versionProperties/1.20.2.properties | 3 +++ versionProperties/1.20.4.properties | 3 +++ versionProperties/1.20.6.properties | 3 +++ versionProperties/1.21.1.properties | 3 +++ versionProperties/1.21.10.properties | 3 +++ versionProperties/1.21.11.properties | 3 +++ versionProperties/1.21.3.properties | 3 +++ versionProperties/1.21.4.properties | 3 +++ versionProperties/1.21.5.properties | 3 +++ versionProperties/1.21.6.properties | 3 +++ versionProperties/1.21.8.properties | 3 +++ versionProperties/1.21.9.properties | 3 +++ 21 files changed, 60 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 1b23e21ff..ea435cccd 100644 --- a/build.gradle +++ b/build.gradle @@ -666,7 +666,7 @@ allprojects { p -> dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core // Imports most of lwjgl's libraries (well, only the ones that we need) - implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions + implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use implementation "org.lwjgl:lwjgl" @@ -719,7 +719,6 @@ allprojects { p -> options.release = rootProject.java_version as Integer } else { options.release = 8; // Core & Api should use Java 8 no matter what - //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled } options.encoding = "UTF-8" } diff --git a/coreSubProjects b/coreSubProjects index b3185c00d..725602e61 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit b3185c00d6b3fe274e8c73d6a525690520297390 +Subproject commit 725602e61f1ee51e4574b6960293adc2bcabfaad diff --git a/gradle.properties b/gradle.properties index 2e3ca45f5..0971562b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,10 +32,6 @@ fastutil_version=8.2.1 # Minecraft related libraries (included in MC's jar) log4j_version=2.23.1 -# if we actually want to use LWJGL methods, this needs to be a MC version variable -# since different MC versions have different LWJGL versions that aren't compatible -# 3.3.3 is for MC 1.21.8 -lwjgl_version=3.3.3 joml_version=1.10.2 # Architectury config diff --git a/versionProperties/1.16.5.properties b/versionProperties/1.16.5.properties index 4de42a6c2..c749e2131 100644 --- a/versionProperties/1.16.5.properties +++ b/versionProperties/1.16.5.properties @@ -10,6 +10,10 @@ embed_joml=true # Netty netty_version=4.1.25.Final +# LWJGL +# the actual LWJGL version is 3.2.2, but the oldest BOM version available on maven is 3.2.3 +lwjgl_version=3.2.3 + # Fabric loader fabric_loader_version=0.14.24 fabric_api_version=0.42.0+1.16 diff --git a/versionProperties/1.17.1.properties b/versionProperties/1.17.1.properties index f67f3a9a9..7414adc27 100644 --- a/versionProperties/1.17.1.properties +++ b/versionProperties/1.17.1.properties @@ -10,6 +10,10 @@ embed_joml=true # Netty netty_version=4.1.25.Final +# LWJGL +# the actual LWJGL version is 3.2.2, but the oldest BOM version available on maven is 3.2.3 +lwjgl_version=3.2.3 + # Fabric loader fabric_loader_version=0.14.24 fabric_api_version=0.46.1+1.17 diff --git a/versionProperties/1.18.2.properties b/versionProperties/1.18.2.properties index 208ace2ba..d745c474f 100644 --- a/versionProperties/1.18.2.properties +++ b/versionProperties/1.18.2.properties @@ -1,4 +1,4 @@ -# 1.18.2 version based stuff +# 1.18.2 version java_version=17 minecraft_version=1.18.2 parchment_version=1.18.2:2022.11.06 @@ -10,6 +10,10 @@ embed_joml=true # Netty netty_version=4.1.68.Final +# LWJGL +# the actual LWJGL version is 3.2.2, but the oldest BOM version available on maven is 3.2.3 +lwjgl_version=3.2.3 + # Fabric loader fabric_loader_version=0.14.24 fabric_api_version=0.76.0+1.18.2 diff --git a/versionProperties/1.19.2.properties b/versionProperties/1.19.2.properties index ee94e1666..e50c5e617 100644 --- a/versionProperties/1.19.2.properties +++ b/versionProperties/1.19.2.properties @@ -10,6 +10,9 @@ embed_joml=true # Netty netty_version=4.1.77.Final +# LWJGL +lwjgl_version=3.3.1 + # Fabric loader fabric_loader_version=0.14.24 fabric_api_version=0.76.1+1.19.2 diff --git a/versionProperties/1.19.4.properties b/versionProperties/1.19.4.properties index 015d44069..3945a43f9 100644 --- a/versionProperties/1.19.4.properties +++ b/versionProperties/1.19.4.properties @@ -9,6 +9,9 @@ builds_for=fabric,forge # Netty netty_version=4.1.82.Final +# LWJGL +lwjgl_version=3.3.1 + # Fabric loader fabric_loader_version=0.14.24 fabric_api_version=0.87.1+1.19.4 diff --git a/versionProperties/1.20.1.properties b/versionProperties/1.20.1.properties index 8715ffc15..af43eb93b 100644 --- a/versionProperties/1.20.1.properties +++ b/versionProperties/1.20.1.properties @@ -9,6 +9,9 @@ builds_for=fabric,forge # Netty netty_version=4.1.82.Final +# LWJGL +lwjgl_version=3.3.1 + # Fabric loader fabric_loader_version=0.16.10 fabric_api_version=0.92.6+1.20.1 diff --git a/versionProperties/1.20.2.properties b/versionProperties/1.20.2.properties index 230d27ce3..1adff5e3b 100644 --- a/versionProperties/1.20.2.properties +++ b/versionProperties/1.20.2.properties @@ -9,6 +9,9 @@ builds_for=fabric,forge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.2 + # Fabric loader fabric_loader_version=0.15.6 fabric_api_version=0.90.4+1.20.2 diff --git a/versionProperties/1.20.4.properties b/versionProperties/1.20.4.properties index e0fabea7b..7d74fe957 100644 --- a/versionProperties/1.20.4.properties +++ b/versionProperties/1.20.4.properties @@ -10,6 +10,9 @@ builds_for=fabric,forge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.2 + # Fabric loader fabric_loader_version=0.15.6 fabric_api_version=0.91.2+1.20.4 diff --git a/versionProperties/1.20.6.properties b/versionProperties/1.20.6.properties index b50c0ec88..e3096bd7c 100644 --- a/versionProperties/1.20.6.properties +++ b/versionProperties/1.20.6.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.15.10 fabric_api_version=0.97.8+1.20.6 diff --git a/versionProperties/1.21.1.properties b/versionProperties/1.21.1.properties index b99bfcd80..a1535ff55 100644 --- a/versionProperties/1.21.1.properties +++ b/versionProperties/1.21.1.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.16.9 fabric_api_version=0.115.0+1.21.1 diff --git a/versionProperties/1.21.10.properties b/versionProperties/1.21.10.properties index 10f6ab032..0904bac2f 100644 --- a/versionProperties/1.21.10.properties +++ b/versionProperties/1.21.10.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.2.3 + # Fabric loader fabric_loader_version=0.17.3 fabric_api_version=0.138.3+1.21.10 diff --git a/versionProperties/1.21.11.properties b/versionProperties/1.21.11.properties index d46e55fa1..92a14048f 100644 --- a/versionProperties/1.21.11.properties +++ b/versionProperties/1.21.11.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.17.3 fabric_api_version=0.139.4+1.21.11 diff --git a/versionProperties/1.21.3.properties b/versionProperties/1.21.3.properties index c5e7f2072..a6dedbe66 100644 --- a/versionProperties/1.21.3.properties +++ b/versionProperties/1.21.3.properties @@ -10,6 +10,9 @@ builds_for=neoforge,fabric # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.16.9 fabric_api_version=0.110.0+1.21.3 diff --git a/versionProperties/1.21.4.properties b/versionProperties/1.21.4.properties index 99cff8899..a753d179d 100644 --- a/versionProperties/1.21.4.properties +++ b/versionProperties/1.21.4.properties @@ -10,6 +10,9 @@ builds_for=neoforge,fabric # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.16.9 fabric_api_version=0.110.5+1.21.4 diff --git a/versionProperties/1.21.5.properties b/versionProperties/1.21.5.properties index 44c5eb10d..7c306a476 100644 --- a/versionProperties/1.21.5.properties +++ b/versionProperties/1.21.5.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.16.10 fabric_api_version=0.119.5+1.21.5 diff --git a/versionProperties/1.21.6.properties b/versionProperties/1.21.6.properties index d4594b874..11bbe88a6 100644 --- a/versionProperties/1.21.6.properties +++ b/versionProperties/1.21.6.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.16.13 fabric_api_version=0.127.0+1.21.6 diff --git a/versionProperties/1.21.8.properties b/versionProperties/1.21.8.properties index 2c7274926..5f8dd7e04 100644 --- a/versionProperties/1.21.8.properties +++ b/versionProperties/1.21.8.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.17.2 fabric_api_version=0.133.4+1.21.8 diff --git a/versionProperties/1.21.9.properties b/versionProperties/1.21.9.properties index f86f9bff1..c177f4caa 100644 --- a/versionProperties/1.21.9.properties +++ b/versionProperties/1.21.9.properties @@ -10,6 +10,9 @@ builds_for=fabric,neoforge # Netty netty_version=4.1.97.Final +# LWJGL +lwjgl_version=3.3.3 + # Fabric loader fabric_loader_version=0.17.3 fabric_api_version=0.134.0+1.21.9