From 4adfd49d3f0ea5017a3e6d36395ca866930b8cca Mon Sep 17 00:00:00 2001 From: jhqwqmc <2110242767@qq.com> Date: Thu, 26 Jun 2025 17:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B91.21.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bukkit/item/factory/BukkitItemFactory.java | 2 +- .../craftengine/bukkit/plugin/BukkitCraftEngine.java | 2 +- .../craftengine/core/util/MinecraftVersion.java | 1 + .../craftengine/core/util/MinecraftVersions.java | 1 + .../momirealms/craftengine/core/util/VersionHelper.java | 8 +++++++- gradle.properties | 6 +++--- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java index e95f7f779..964891e42 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/item/factory/BukkitItemFactory.java @@ -40,7 +40,7 @@ public abstract class BukkitItemFactory> extend case "1.21.4" -> { return new ComponentItemFactory1_21_4(plugin); } - case "1.21.5", "1.21.6", "1.22", "1.22.1" -> { + case "1.21.5", "1.21.6", "1.21.7", "1.22", "1.22.1" -> { return new ComponentItemFactory1_21_5(plugin); } default -> throw new IllegalStateException("Unsupported server version: " + plugin.serverVersion()); diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java index ec551415d..e7017d8d9 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/BukkitCraftEngine.java @@ -276,7 +276,7 @@ public class BukkitCraftEngine extends CraftEngine { @Override public String serverVersion() { - return Bukkit.getServer().getBukkitVersion().split("-")[0]; + return VersionHelper.MINECRAFT_VERSION.versionString(); } @Override diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersion.java b/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersion.java index 31e7beeef..09c4392a6 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersion.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersion.java @@ -20,6 +20,7 @@ public final class MinecraftVersion implements Comparable { PACK_FORMATS.put(1_21_04, 46); PACK_FORMATS.put(1_21_05, 55); PACK_FORMATS.put(1_21_06, 63); + PACK_FORMATS.put(1_21_07, 63); PACK_FORMATS.put(1_99_99, 1000); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersions.java b/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersions.java index dd66400dc..a368a809a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersions.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/MinecraftVersions.java @@ -17,5 +17,6 @@ public final class MinecraftVersions { public static final MinecraftVersion V1_21_4 = new MinecraftVersion("1.21.4"); public static final MinecraftVersion V1_21_5 = new MinecraftVersion("1.21.5"); public static final MinecraftVersion V1_21_6 = new MinecraftVersion("1.21.6"); + public static final MinecraftVersion V1_21_7 = new MinecraftVersion("1.21.7"); public static final MinecraftVersion FUTURE = new MinecraftVersion("1.99.99"); } diff --git a/core/src/main/java/net/momirealms/craftengine/core/util/VersionHelper.java b/core/src/main/java/net/momirealms/craftengine/core/util/VersionHelper.java index 91a1d6617..f4ce0c24a 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/util/VersionHelper.java +++ b/core/src/main/java/net/momirealms/craftengine/core/util/VersionHelper.java @@ -29,6 +29,7 @@ public class VersionHelper { private static final boolean v1_21_4; private static final boolean v1_21_5; private static final boolean v1_21_6; + private static final boolean v1_21_7; static { try (InputStream inputStream = Class.forName("net.minecraft.obfuscate.DontObfuscate").getResourceAsStream("/version.json")) { @@ -38,7 +39,7 @@ public class VersionHelper { JsonObject json = GsonHelper.parseJsonToJsonObject(new String(inputStream.readAllBytes(), StandardCharsets.UTF_8)); String versionString = json.getAsJsonPrimitive("id").getAsString(); - MINECRAFT_VERSION = new MinecraftVersion(versionString); + MINECRAFT_VERSION = new MinecraftVersion(versionString.split("-", 2)[0]); // 确保去掉-rc1 String[] split = versionString.split("\\."); int major = Integer.parseInt(split[1]); @@ -62,6 +63,7 @@ public class VersionHelper { v1_21_4 = version >= 12104; v1_21_5 = version >= 12105; v1_21_6 = version >= 12106; + v1_21_7 = version >= 12107; majorVersion = major; minorVersion = minor; @@ -209,4 +211,8 @@ public class VersionHelper { public static boolean isOrAbove1_21_6() { return v1_21_6; } + + public static boolean isOrAbove1_21_7() { + return v1_21_7; + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index f1865ed56..219c92d89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ project_version=0.0.58.3.2 config_version=39 lang_version=20 project_group=net.momirealms -latest_supported_version=1.21.6 +latest_supported_version=1.21.7 # Supported languages supported_languages=en,zh_cn,zh_tw,es,tr @@ -41,7 +41,7 @@ commons_io_version=2.18.0 commons_imaging_version=1.0.0-alpha6 commons_lang3_version=3.17.0 sparrow_nbt_version=0.9.1 -sparrow_util_version=0.50.3 +sparrow_util_version=0.50.6 fastutil_version=8.5.15 netty_version=4.1.121.Final joml_version=1.10.8 @@ -51,7 +51,7 @@ byte_buddy_version=1.17.5 ahocorasick_version=0.6.3 snake_yaml_version=2.4 anti_grief_version=0.17 -nms_helper_version=0.67.37 +nms_helper_version=0.67.38 evalex_version=3.5.0 reactive_streams_version=1.0.4 amazon_awssdk_version=2.31.23