Skip to content

Commit 56d6ca0

Browse files
committed
Undo lwjgl 3 update. Avoid patching lwjgl 3 for 26.1-snapshot-8 and newer
1 parent a2cc031 commit 56d6ca0

4 files changed

Lines changed: 566 additions & 2257 deletions

File tree

src/main/java/lbq/jsongen/Generator.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public static boolean update(JSONObject json, String postfix, boolean lwjglCompa
164164
updated |= mergePreset(preset_paulscode, json);
165165
}
166166
if (time.compareTo(LWJGL2_TIME) > 0) {
167-
if(!lwjgl3Blacklist.contains(id)) {
167+
if(!lwjgl3Blacklist.contains(id) && time.compareTo(LWJGL34_TIME) < 0) {
168168
JSONObject preset_lwjgl3 = getPreset("lwjgl3");
169169
updated |= mergePreset(preset_lwjgl3, json);
170170
if(lwjglCompat) {
@@ -178,6 +178,13 @@ public static boolean update(JSONObject json, String postfix, boolean lwjglCompa
178178
updated |= removeLibrary(verLibs, "org.lwjgl.lwjgl", "lwjgl");
179179
updated |= removeLibrary(verLibs, "org.lwjgl.lwjgl", "lwjgl_util");
180180
updated |= removeLibrary(verLibs, "org.lwjgl.lwjgl", "lwjgl-platform");
181+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl");
182+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-opengl");
183+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-openal");
184+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-glfw");
185+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-jemalloc");
186+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-stb");
187+
// updated |= removeLibrary(verLibs, "org.lwjgl", "lwjgl-freetype");
181188
updated |= mergePreset(preset_lwjgl3compat, json);
182189
updated |= mergePreset(preset_lwjgl3, json);
183190
} else {

src/main/java/lbq/jsongen/JSONConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ public class JSONConstants {
88
public static final Instant PAULSCODE_TIME = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2009-12-21T22:00:00+00:00"));
99
public static final Instant ASSETINDEX_TIME = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2013-04-21T12:49:20+00:00"));
1010
public static final Instant LWJGL2_TIME = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2017-09-18T08:39:46+00:00"));
11+
public static final Instant LWJGL34_TIME = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2026-03-10T12:35:40+00:00"));
1112

1213
static Instant skin1Start = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2009-06-14T07:53:24+00:00"));
1314
static Instant skin2Start = Instant.from(DateTimeFormatter.ISO_DATE_TIME.parse("2009-06-19T22:53:16+00:00"));

0 commit comments

Comments
 (0)