Move LWJGL variables into a MC version property

2026-02-07 10:20:23 -06:00
parent 76f69b238a
commit 8b850f14d3
21 changed files with 60 additions and 8 deletions
@@ -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"
    }
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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