Skip to content

Commit 70b187f

Browse files
FireController1847FireController1847
committed
Add 1.19 support
1 parent d958eae commit 70b187f

3 files changed

Lines changed: 61 additions & 19 deletions

File tree

‎pom.xml‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -286,131 +286,139 @@
286286
<systemPath>${project.basedir}/all-spigot-nms.jar</systemPath>
287287
</dependency>
288288

289-
<!-- 1_18_R2 - 1.18.2 -->
289+
<!-- 1_19_R1 - 1.19 -->
290290
<dependency>
291291
<groupId>org.spigotmc</groupId>
292292
<artifactId>spigot</artifactId>
293+
<version>1.19-R0.1-SNAPSHOT</version>
294+
<classifier>remapped-mojang</classifier>
295+
<scope>provided</scope>
296+
</dependency>
297+
<!-- 1_18_R2 - 1.18.2 -->
298+
<dependency>
299+
<groupId>org.spigotmc.</groupId>
300+
<artifactId>spigot</artifactId>
293301
<version>1.18.2-R0.1-SNAPSHOT</version>
294302
<classifier>remapped-mojang</classifier>
295303
<scope>provided</scope>
296304
</dependency>
297305
<!-- 1_18_R1 - 1.18.1 -->
298306
<dependency>
299-
<groupId>org.spigotmc.</groupId>
307+
<groupId>org.spigotmc..</groupId>
300308
<artifactId>spigot</artifactId>
301309
<version>1.18.1-R0.1-SNAPSHOT</version>
302310
<classifier>remapped-mojang</classifier>
303311
<scope>provided</scope>
304312
</dependency>
305313
<!-- &lt;!&ndash; 1_17_R1 - 1.17.1 &ndash;&gt;-->
306314
<!-- <dependency>-->
307-
<!-- <groupId>org.spigotmc...</groupId>-->
315+
<!-- <groupId>org.spigotmc....</groupId>-->
308316
<!-- <artifactId>spigot</artifactId>-->
309317
<!-- <version>1.17.1-R0.1-SNAPSHOT</version>-->
310318
<!-- <classifier>remapped-mojang</classifier>-->
311319
<!-- <scope>provided</scope>-->
312320
<!-- </dependency>-->
313321
<!-- &lt;!&ndash; 1_16_R3 - 1.16.5 &ndash;&gt;-->
314322
<!-- <dependency>-->
315-
<!-- <groupId>org.spigotmc....</groupId>-->
323+
<!-- <groupId>org.spigotmc.....</groupId>-->
316324
<!-- <artifactId>spigot</artifactId>-->
317325
<!-- <version>1.16.5-R0.1-SNAPSHOT</version>-->
318326
<!-- <scope>provided</scope>-->
319327
<!-- </dependency>-->
320328
<!-- &lt;!&ndash; 1_16_R2 - 1.16.3 &ndash;&gt;-->
321329
<!-- <dependency>-->
322-
<!-- <groupId>org.spigotmc.....</groupId>-->
330+
<!-- <groupId>org.spigotmc......</groupId>-->
323331
<!-- <artifactId>spigot</artifactId>-->
324332
<!-- <version>1.16.3-R0.1-SNAPSHOT</version>-->
325333
<!-- <scope>provided</scope>-->
326334
<!-- </dependency>-->
327335
<!-- &lt;!&ndash; 1_16_R1 - 1.16.1 &ndash;&gt;-->
328336
<!-- <dependency>-->
329-
<!-- <groupId>org.spigotmc......</groupId>-->
337+
<!-- <groupId>org.spigotmc.......</groupId>-->
330338
<!-- <artifactId>spigot</artifactId>-->
331339
<!-- <version>1.16.1-R0.1-SNAPSHOT</version>-->
332340
<!-- <scope>provided</scope>-->
333341
<!-- </dependency>-->
334342
<!-- &lt;!&ndash; 1_15_R1 - 1.15.2 &ndash;&gt;-->
335343
<!-- <dependency>-->
336-
<!-- <groupId>org.spigotmc.......</groupId>-->
344+
<!-- <groupId>org.spigotmc........</groupId>-->
337345
<!-- <artifactId>spigot</artifactId>-->
338346
<!-- <version>1.15.2-R0.1-SNAPSHOT</version>-->
339347
<!-- <scope>provided</scope>-->
340348
<!-- </dependency>-->
341349
<!-- &lt;!&ndash; 1_14_R1 - 1.14.4 &ndash;&gt;-->
342350
<!-- <dependency>-->
343-
<!-- <groupId>org.spigotmc........</groupId>-->
351+
<!-- <groupId>org.spigotmc.........</groupId>-->
344352
<!-- <artifactId>spigot</artifactId>-->
345353
<!-- <version>1.14.4-R0.1-SNAPSHOT</version>-->
346354
<!-- <scope>provided</scope>-->
347355
<!-- </dependency>-->
348356
<!-- &lt;!&ndash; 1_13_R2 - 1.13.2 &ndash;&gt;-->
349357
<!-- <dependency>-->
350-
<!-- <groupId>org.spigotmc.........</groupId>-->
358+
<!-- <groupId>org.spigotmc..........</groupId>-->
351359
<!-- <artifactId>spigot</artifactId>-->
352360
<!-- <version>1.13.2-R0.1-SNAPSHOT</version>-->
353361
<!-- <scope>provided</scope>-->
354362
<!-- </dependency>-->
355363
<!-- &lt;!&ndash; 1_13_R1 - 1.13 &ndash;&gt;-->
356364
<!-- <dependency>-->
357-
<!-- <groupId>org.spigotmc..........</groupId>-->
365+
<!-- <groupId>org.spigotmc...........</groupId>-->
358366
<!-- <artifactId>spigot</artifactId>-->
359367
<!-- <version>1.13-R0.1-SNAPSHOT</version>-->
360368
<!-- <scope>provided</scope>-->
361369
<!-- </dependency>-->
362370
<!-- &lt;!&ndash; 1_12_R1 - 1.12.2 &ndash;&gt;-->
363371
<!-- <dependency>-->
364-
<!-- <groupId>org.spigotmc...........</groupId>-->
372+
<!-- <groupId>org.spigotmc............</groupId>-->
365373
<!-- <artifactId>spigot</artifactId>-->
366374
<!-- <version>1.12.2-R0.1-SNAPSHOT</version>-->
367375
<!-- <scope>provided</scope>-->
368376
<!-- </dependency>-->
369377
<!-- &lt;!&ndash; 1_11_R1 - 1.11.2 &ndash;&gt;-->
370378
<!-- <dependency>-->
371-
<!-- <groupId>org.spigotmc............</groupId>-->
379+
<!-- <groupId>org.spigotmc.............</groupId>-->
372380
<!-- <artifactId>spigot</artifactId>-->
373381
<!-- <version>1.11.2-R0.1-SNAPSHOT</version>-->
374382
<!-- <scope>provided</scope>-->
375383
<!-- </dependency>-->
376384
<!-- &lt;!&ndash; 1_10_R1 - 1.10.2 &ndash;&gt;-->
377385
<!-- <dependency>-->
378-
<!-- <groupId>org.spigotmc.............</groupId>-->
386+
<!-- <groupId>org.spigotmc..............</groupId>-->
379387
<!-- <artifactId>spigot</artifactId>-->
380388
<!-- <version>1.10.2-R0.1-SNAPSHOT</version>-->
381389
<!-- <scope>provided</scope>-->
382390
<!-- </dependency>-->
383391
<!-- &lt;!&ndash; 1_9_R2 - 1.9.4 &ndash;&gt;-->
384392
<!-- <dependency>-->
385-
<!-- <groupId>org.spigotmc..............</groupId>-->
393+
<!-- <groupId>org.spigotmc...............</groupId>-->
386394
<!-- <artifactId>spigot</artifactId>-->
387395
<!-- <version>1.9.4-R0.1-SNAPSHOT</version>-->
388396
<!-- <scope>provided</scope>-->
389397
<!-- </dependency>-->
390398
<!-- &lt;!&ndash; 1_9_R1 - 1.9.2 &ndash;&gt;-->
391399
<!-- <dependency>-->
392-
<!-- <groupId>org.spigotmc...............</groupId>-->
400+
<!-- <groupId>org.spigotmc................</groupId>-->
393401
<!-- <artifactId>spigot</artifactId>-->
394402
<!-- <version>1.9.2-R0.1-SNAPSHOT</version>-->
395403
<!-- <scope>provided</scope>-->
396404
<!-- </dependency>-->
397405
<!-- &lt;!&ndash; 1_8_R3 - 1.8.8 &ndash;&gt;-->
398406
<!-- <dependency>-->
399-
<!-- <groupId>org.spigotmc................</groupId>-->
407+
<!-- <groupId>org.spigotmc.................</groupId>-->
400408
<!-- <artifactId>spigot</artifactId>-->
401409
<!-- <version>1.8.8-R0.1-SNAPSHOT</version>-->
402410
<!-- <scope>provided</scope>-->
403411
<!-- </dependency>-->
404412
<!-- &lt;!&ndash; 1_8_R2 - 1.8.3 &ndash;&gt;-->
405413
<!-- <dependency>-->
406-
<!-- <groupId>org.spigotmc.................</groupId>-->
414+
<!-- <groupId>org.spigotmc..................</groupId>-->
407415
<!-- <artifactId>spigot</artifactId>-->
408416
<!-- <version>1.8.3-R0.1-SNAPSHOT</version>-->
409417
<!-- <scope>provided</scope>-->
410418
<!-- </dependency>-->
411419
<!-- &lt;!&ndash; 1_8_R1 - 1.8 &ndash;&gt;-->
412420
<!-- <dependency>-->
413-
<!-- <groupId>org.spigotmc..................</groupId>-->
421+
<!-- <groupId>org.spigotmc...................</groupId>-->
414422
<!-- <artifactId>spigot</artifactId>-->
415423
<!-- <version>1.8-R0.1-SNAPSHOT</version>-->
416424
<!-- <scope>provided</scope>-->

‎src/main/java/com/firecontroller1847/truediscordlink/VersionHelper.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ protected VersionHelper(TrueDiscordLink discordlink) {
3838
advancementHelper = new AdvancementHelper$1_18_R1();
3939
} else if (version.equals("v1_18_R2")) {
4040
advancementHelper = new AdvancementHelper$1_18_R2();
41-
} else {
41+
} else if (version.equals("v1_19_R1")) {
42+
advancementHelper = new AdvancementHelper$1_19_R1();
43+
} else {
4244
advancementHelper = new AdvancementHelper$UNSUPPORTED();
4345
}
4446
}

‎src/main/java/com/firecontroller1847/truediscordlink/nms/advancement/AdvancementHelper$1_19_R1.java‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package com.firecontroller1847.truediscordlink.nms.advancement;
2+
3+
import org.bukkit.advancement.Advancement;
4+
import org.bukkit.craftbukkit.v1_19_R1.advancement.CraftAdvancement;
5+
6+
import java.util.Objects;
7+
8+
public class AdvancementHelper$1_19_R1 implements IAdvancementHelper {
9+
10+
@Override
11+
public String getName(Advancement bukkitAdvancement) {
12+
try {
13+
CraftAdvancement advancement = (CraftAdvancement) bukkitAdvancement;
14+
return Objects.requireNonNull(advancement.getHandle().getDisplay()).getTitle().getString();
15+
} catch (Exception e) {
16+
e.printStackTrace();
17+
return null;
18+
}
19+
}
20+
21+
@Override
22+
public String getDescription(Advancement bukkitAdvancement) {
23+
try {
24+
CraftAdvancement advancement = (CraftAdvancement) bukkitAdvancement;
25+
return Objects.requireNonNull(advancement.getHandle().getDisplay()).getDescription().getString();
26+
} catch (Exception e) {
27+
e.printStackTrace();
28+
return null;
29+
}
30+
}
31+
32+
}

0 commit comments

Comments
 (0)