Skip to content

Commit a6013cb

Browse files
committed
Add 1.13 to lwjgl blacklist
1 parent 562f8ec commit a6013cb

4 files changed

Lines changed: 755 additions & 561 deletions

File tree

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.io.IOException;
88
import java.nio.file.Files;
99
import java.nio.file.Path;
10+
import java.nio.file.Paths;
1011
import java.time.Instant;
1112
import java.util.ArrayList;
1213
import java.util.Arrays;
@@ -30,6 +31,7 @@ public class Generator {
3031
private Instant startTime;
3132
private String postfix;
3233
private String version;
34+
private static List<String> lwjgl3Blacklist = new ArrayList<>();
3335

3436
private static JSONObject manifest;
3537

@@ -48,6 +50,11 @@ public Generator(Path dir, boolean update, boolean packToFolders, boolean genMan
4850
}
4951

5052
public void generate() throws IOException {
53+
JSONArray blacklistObj = parseJSONArray(Paths.get("src/main/resources/lwjgl3_blacklist.json"));
54+
lwjgl3Blacklist.clear();
55+
for (int i = 0; i < blacklistObj.length(); i++) {
56+
lwjgl3Blacklist.add(blacklistObj.getString(i));
57+
}
5158
Set<String> assets = new HashSet<>();
5259
Files.createDirectories(basePath.resolve("assets"));
5360
if (update) {
@@ -157,10 +164,12 @@ public static boolean update(JSONObject json, String postfix, boolean lwjglCompa
157164
updated |= mergePreset(preset_paulscode, json);
158165
}
159166
if (time.compareTo(LWJGL2_TIME) > 0) {
160-
JSONObject preset_lwjgl3 = getPreset("lwjgl3");
161-
updated |= mergePreset(preset_lwjgl3, json);
162-
if(lwjglCompat) {
163-
return false;
167+
if(!lwjgl3Blacklist.contains(id)) {
168+
JSONObject preset_lwjgl3 = getPreset("lwjgl3");
169+
updated |= mergePreset(preset_lwjgl3, json);
170+
if(lwjglCompat) {
171+
return false;
172+
}
164173
}
165174
} else {
166175
if (lwjglCompat) {
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
[
2+
"1.13-pre3",
3+
"1.13-pre2",
4+
"1.13-pre1",
5+
"18w22c",
6+
"18w22b",
7+
"18w22a",
8+
"18w21b",
9+
"18w21a",
10+
"18w20c",
11+
"18w20b",
12+
"18w20a",
13+
"18w19b",
14+
"18w19a",
15+
"18w16a",
16+
"18w15a",
17+
"18w14b",
18+
"18w14a",
19+
"18w11a",
20+
"18w10d",
21+
"18w10c",
22+
"18w10b",
23+
"18w09a",
24+
"18w08b",
25+
"18w08a",
26+
"18w07c",
27+
"18w07b",
28+
"18w07a",
29+
"18w06a",
30+
"18w05a",
31+
"18w03b",
32+
"18w03a",
33+
"18w02a",
34+
"18w01a",
35+
"17w50a",
36+
"17w49b",
37+
"17w49a",
38+
"17w48a",
39+
"17w47b",
40+
"17w47a",
41+
"17w46a",
42+
"17w45b",
43+
"17w45a",
44+
"17w43b",
45+
"17w43a"
46+
]

0 commit comments

Comments
 (0)