From eec4db43b2a398e6c6c66d67b1bf102203586a7c Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Thu, 12 Dec 2024 12:40:33 +0000 Subject: [PATCH 1/2] Added support for 1.21.4 --- buildSrc/src/main/kotlin/Versions.kt | 4 ++-- .../src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 1f1552512..d92d9c9aa 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -55,8 +55,8 @@ object Versions { // } object Bukkit { - const val minecraft = "1.21.3" - const val paperBuild = "$minecraft-R0.1-20241101.150401-13" + const val minecraft = "1.21.4" + const val paperBuild = "$minecraft-R0.1-20241211.212446-17" const val paper = paperBuild const val paperLib = "1.0.8" const val reflectionRemapper = "0.1.1" diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index 6e241d3d6..e1cfc63bb 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -54,6 +54,9 @@ static BukkitAddon nmsAddon(PlatformImpl platform) { private static Initializer constructInitializer() { try { String packageVersion = NMS; + if (NMS.equals("v_1_21_4")) { + packageVersion = "v1_21_3"; + } Class initializerClass = Class.forName(TERRA_PACKAGE + "." + packageVersion + ".NMSInitializer"); try { From 82a9ecf736ed482391c47420d78c0f4e119277cf Mon Sep 17 00:00:00 2001 From: OakLoaf Date: Thu, 12 Dec 2024 15:24:38 +0000 Subject: [PATCH 2/2] Fixed typo --- .../src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java index e1cfc63bb..b3452714d 100644 --- a/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java +++ b/platforms/bukkit/common/src/main/java/com/dfsek/terra/bukkit/nms/Initializer.java @@ -54,7 +54,7 @@ static BukkitAddon nmsAddon(PlatformImpl platform) { private static Initializer constructInitializer() { try { String packageVersion = NMS; - if (NMS.equals("v_1_21_4")) { + if (NMS.equals("v1_21_4")) { packageVersion = "v1_21_3"; }