From 45fa6a411980f52f3b27aa98a6153ea14281cc39 Mon Sep 17 00:00:00 2001 From: Teije Date: Thu, 7 Nov 2024 14:34:15 +0100 Subject: [PATCH 1/3] Add 1.21.3 support --- helper/pom.xml | 2 +- .../helper/reflect/MinecraftVersion.java | 4 ++-- .../helper/reflect/MinecraftVersions.java | 4 ++++ .../me/lucko/helper/reflect/NmsVersion.java | 23 +++++++++++++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) diff --git a/helper/pom.xml b/helper/pom.xml index ae8e9001..c962e0b1 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -163,7 +163,7 @@ me.lucko shadow-bukkit - 1.20.1 + 1.21.3 compile diff --git a/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java b/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java index cbf041e5..3bda5422 100644 --- a/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java +++ b/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersion.java @@ -50,12 +50,12 @@ public final class MinecraftVersion implements Comparable { /** * The newest known version of Minecraft */ - private static final String NEWEST_MINECRAFT_VERSION = "1.20.1"; + private static final String NEWEST_MINECRAFT_VERSION = "1.21.3"; /** * The date (with ISO 8601 or YYYY-MM-DD) when the most recent version was released. */ - private static final String MINECRAFT_LAST_RELEASE_DATE = "2023-06-07"; + private static final String MINECRAFT_LAST_RELEASE_DATE = "2024-10-23"; /** * Gets the {@link MinecraftVersion} of the runtime server. diff --git a/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersions.java b/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersions.java index 76191a45..85933d28 100644 --- a/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersions.java +++ b/helper/src/main/java/me/lucko/helper/reflect/MinecraftVersions.java @@ -37,6 +37,10 @@ */ public final class MinecraftVersions { + /** + * Version 1.21 - the tricky trials update + */ + public static final MinecraftVersion v1_21 = MinecraftVersion.parse("1.21"); /** * Version 1.20 - the trails and tails update */ diff --git a/helper/src/main/java/me/lucko/helper/reflect/NmsVersion.java b/helper/src/main/java/me/lucko/helper/reflect/NmsVersion.java index 07a51bd1..46042da3 100644 --- a/helper/src/main/java/me/lucko/helper/reflect/NmsVersion.java +++ b/helper/src/main/java/me/lucko/helper/reflect/NmsVersion.java @@ -125,6 +125,29 @@ protected String getPackageComponent() { MinecraftVersion.of(1, 19, 0), MinecraftVersion.of(1, 19, 1), MinecraftVersion.of(1, 19, 2) + ), + v1_20_R1( + MinecraftVersion.of(1, 20, 0), + MinecraftVersion.of(1, 20, 1) + ), + v1_20_R2( + MinecraftVersion.of(1, 20, 2) + ), + v1_20_R3( + MinecraftVersion.of(1, 20, 3), + MinecraftVersion.of(1, 20, 4) + ), + v1_20_R4( + MinecraftVersion.of(1, 20, 5), + MinecraftVersion.of(1, 20, 6) + ), + v1_21_R1( + MinecraftVersion.of(1, 21, 0), + MinecraftVersion.of(1, 21, 1) + ), + v1_21_R2( + MinecraftVersion.of(1, 21, 2), + MinecraftVersion.of(1, 21, 3) ); private final Set minecraftVersions; From f69acfbfb1b7753be5af57224f58705a3c616a5c Mon Sep 17 00:00:00 2001 From: Teije Date: Thu, 7 Nov 2024 14:34:34 +0100 Subject: [PATCH 2/3] Bump version --- helper/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/pom.xml b/helper/pom.xml index c962e0b1..30fd3cb8 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -12,7 +12,7 @@ helper jar - 5.6.14 + 5.6.15 helper A utility to reduce boilerplate code in Bukkit plugins. From 3b106fb5cbe95f5da78f8f0b40a62fb285baaf56 Mon Sep 17 00:00:00 2001 From: Teije Date: Fri, 15 Nov 2024 23:51:35 +0100 Subject: [PATCH 3/3] Bump version (for shadow update) --- helper/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helper/pom.xml b/helper/pom.xml index 30fd3cb8..862cff9b 100644 --- a/helper/pom.xml +++ b/helper/pom.xml @@ -12,7 +12,7 @@ helper jar - 5.6.15 + 5.6.16 helper A utility to reduce boilerplate code in Bukkit plugins.