Skip to content

Commit 7e71d7e

Browse files
committed
Update LWJGLX support in dev.
1 parent d9d62d4 commit 7e71d7e

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

dev/src/main/groovy/com/fox2code/foxloader/dev/FoxLoaderConfig.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
package com.fox2code.foxloader.dev;
2525

2626
import com.fox2code.foxloader.dependencies.DependencyHelper;
27+
import com.fox2code.foxloader.launcher.BuildConfig;
2728

2829
import java.text.Normalizer;
2930
import java.util.ArrayList;
@@ -97,8 +98,8 @@ public String getUsedDependencyBundles() {
9798
public boolean forceReload = false;
9899
public boolean unofficial = false;
99100
public boolean useLWJGLX = false;
100-
public String LWJGLXVersion = "0.21";
101-
public String LWJGLXLWJGLVersion = "3.3.1";
101+
public String LWJGLXVersion = BuildConfig.LWJGLX_VERSION;
102+
public String LWJGLXLWJGLVersion = "3.3.6";
102103

103104
private void checkConfigMutable() {
104105
if (this.configImmutable) {

dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,20 +258,22 @@ class GradlePlugin implements Plugin<Project> {
258258

259259
project.dependencies {
260260
implementation(platform("org.lwjgl:lwjgl-bom:${config.LWJGLXLWJGLVersion}"))
261-
implementation("com.github.Fox2Code:lwjglx:${config.LWJGLXVersion}")
261+
implementation("com.fox2code:lwjglx:${config.LWJGLXVersion}")
262262
runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
263263
runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
264264
runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
265265
runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
266266
}
267267
} else {
268268
project.dependencies {
269-
implementation("net.java.jinput:jinput:2.0.5")
270269
implementation("org.lwjgl.lwjgl:lwjgl:2.9.1")
271270
implementation("org.lwjgl.lwjgl:lwjgl_util:2.9.1")
272271
implementation("org.lwjgl.lwjgl:lwjgl-platform:2.9.1")
273272
}
274273
}
274+
project.dependencies {
275+
implementation("net.java.jinput:jinput:2.0.5")
276+
}
275277
Objects.requireNonNull(config.modId, "The mod id cannot be null!")
276278
if (config.modVersion == null && project.version != null) {
277279
config.modVersion = project.version.toString()

gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ fox-events.version=1.3.1
7979
# https://github.com/Fox2Code/FoxFlexVer/releases
8080
fox-flex-ver.version=1.1.0
8181

82+
# https://github.com/Fox2Code/lwjglx/releases
83+
lwjglx.version=v0.24
84+
8285
# For dependency bundles.
8386
# https://mvnrepository.com/artifact/net.java.dev.jna/jna
8487
jna.version=5.17.0

patching/generate.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ static void generateBuildConfig0(File buildConfigSrc, Project project) {
5757
final String REBUILD_VERSION = project['rebuild.version']
5858
final String FOX_EVENTS_VERSION = project['fox-events.version']
5959
final String FOX_FLEX_VER_VERSION = project['fox-flex-ver.version']
60+
final String LWJGLX_VERSION = project['lwjglx.version']
6061
final String JNA_VERSION = project['jna.version']
6162
final String KOTLIN_VERSION = project['kotlin.version']
6263
final String KOTLINX_ATOMICFU_VERSION = project['kotlinx.atomicfu.version']
@@ -102,6 +103,7 @@ static void generateBuildConfig0(File buildConfigSrc, Project project) {
102103
printStream.println(" public static final String REBUILD_VERSION = \"" + REBUILD_VERSION + "\";")
103104
printStream.println(" public static final String FOX_EVENTS_VERSION = \"" + FOX_EVENTS_VERSION + "\";")
104105
printStream.println(" public static final String FOX_FLEX_VER_VERSION = \"" + FOX_FLEX_VER_VERSION + "\";")
106+
printStream.println(" public static final String LWJGLX_VERSION = \"" + LWJGLX_VERSION + "\";")
105107
printStream.println(" public static final String JNA_VERSION = \"" + JNA_VERSION + "\";")
106108
printStream.println(" public static final String KOTLIN_VERSION = \"" + KOTLIN_VERSION + "\";")
107109
printStream.println(" public static final String KOTLINX_ATOMICFU_VERSION = \"" + KOTLINX_ATOMICFU_VERSION + "\";")

0 commit comments

Comments
 (0)