From 755657617936f7cab8eae49ae1d037d04b4dda90 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Fri, 18 Jul 2025 04:03:19 +0800 Subject: [PATCH] 1.21.8 --- .../bukkit/item/factory/BukkitItemFactory.java | 2 +- .../bukkit/plugin/command/feature/GiveItemCommand.java | 1 - .../craftengine/core/util/MinecraftVersion.java | 3 ++- .../craftengine/core/util/MinecraftVersions.java | 1 + .../momirealms/craftengine/core/util/VersionHelper.java | 6 ++++++ gradle.properties | 8 ++++---- 6 files changed, 14 insertions(+), 7 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 42447daec..0c5ee3b3c 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 @@ -49,7 +49,7 @@ public abstract class BukkitItemFactory> extend case "1.21.4" -> { return new ComponentItemFactory1_21_4(plugin); } - case "1.21.5", "1.21.6", "1.21.7", "1.22", "1.22.1" -> { + case "1.21.5", "1.21.6", "1.21.7", "1.21.8" -> { 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/command/feature/GiveItemCommand.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/GiveItemCommand.java index c79161a19..f258b70f4 100644 --- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/GiveItemCommand.java +++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/command/feature/GiveItemCommand.java @@ -2,7 +2,6 @@ package net.momirealms.craftengine.bukkit.plugin.command.feature; import net.kyori.adventure.text.Component; import net.momirealms.craftengine.bukkit.item.BukkitItemManager; -import net.momirealms.craftengine.bukkit.plugin.BukkitCraftEngine; import net.momirealms.craftengine.bukkit.plugin.command.BukkitCommandFeature; import net.momirealms.craftengine.bukkit.util.PlayerUtils; import net.momirealms.craftengine.core.item.CustomItem; 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 75c383dd7..2e20c0a66 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,7 +20,8 @@ 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, 64); // TODO 1.21.7-rc2 + PACK_FORMATS.put(1_21_07, 64); + PACK_FORMATS.put(1_21_08, 64); 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 a368a809a..2f28c73ad 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 @@ -18,5 +18,6 @@ public final class MinecraftVersions { 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 V1_21_8 = new MinecraftVersion("1.21.8"); 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 f88a0f19d..12e001c79 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 @@ -30,6 +30,7 @@ public class VersionHelper { private static final boolean v1_21_5; private static final boolean v1_21_6; private static final boolean v1_21_7; + private static final boolean v1_21_8; static { try (InputStream inputStream = Class.forName("net.minecraft.obfuscate.DontObfuscate").getResourceAsStream("/version.json")) { @@ -64,6 +65,7 @@ public class VersionHelper { v1_21_5 = version >= 12105; v1_21_6 = version >= 12106; v1_21_7 = version >= 12107; + v1_21_8 = version >= 12108; majorVersion = major; minorVersion = minor; @@ -215,4 +217,8 @@ public class VersionHelper { public static boolean isOrAbove1_21_7() { return v1_21_7; } + + public static boolean isOrAbove1_21_8() { + return v1_21_8; + } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index af7ef18be..649a773b0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx1G # Project settings # Rule: [major update].[feature update].[bug fix] -project_version=0.0.60.2 +project_version=0.0.60.3 config_version=42 lang_version=22 project_group=net.momirealms -latest_supported_version=1.21.7 +latest_supported_version=1.21.8 # Supported languages supported_languages=en,zh_cn,zh_tw,es,tr,de,ru_ru # Dependency settings -paper_version=1.21.7 +paper_version=1.21.8 jetbrains_annotations_version=26.0.2 slf4j_version=2.0.17 log4j_version=2.24.3 @@ -50,7 +50,7 @@ byte_buddy_version=1.17.5 ahocorasick_version=0.6.3 snake_yaml_version=2.4 anti_grief_version=0.18 -nms_helper_version=1.0.35 +nms_helper_version=1.0.36 evalex_version=3.5.0 reactive_streams_version=1.0.4 amazon_awssdk_version=2.31.23