From bd0244ceb87e417b2f16a5a997fd3925b6d44577 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Sat, 28 Jun 2025 00:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=88=B7=E7=AB=AFpr?=
 =?UTF-8?q?otocol=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../minecraft/MBuiltInRegistries.java         |  2 +-
 .../bukkit/util/BlockStateUtils.java          | 28 -------------------
 .../core/plugin/network/ProtocolVersion.java  |  3 +-
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MBuiltInRegistries.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MBuiltInRegistries.java
index 9f0148c1d..b7d660248 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MBuiltInRegistries.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/plugin/reflection/minecraft/MBuiltInRegistries.java
@@ -47,7 +47,7 @@ public final class MBuiltInRegistries {
                             registries$EntityType = field.get(null);
                         } else if (rawType == CoreReflections.clazz$RecipeType) {
                             registries$RecipeType = field.get(null);
-                        } else if (rawType == CoreReflections.clazz$DataComponentType) {
+                        } else if (rawType == CoreReflections.clazz$DataComponentType && registries$DataComponentType == null) {
                             registries$DataComponentType = field.get(null);
                         }
                     } else {
diff --git a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java
index e0a95c1a2..434a1dd74 100644
--- a/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java
+++ b/bukkit/src/main/java/net/momirealms/craftengine/bukkit/util/BlockStateUtils.java
@@ -65,34 +65,6 @@ public class BlockStateUtils {
         return true;
     }
 
-    public static List<Object> getAllBlockStates(String blockState) {
-        int index = blockState.indexOf('[');
-        if (index == -1) {
-            return getAllBlockStates(Key.of(blockState));
-        } else {
-            String blockTypeString = blockState.substring(0, index);
-            Key block = Key.of(blockTypeString);
-            Optional<CustomBlock> optionalCustomBlock = BukkitBlockManager.instance().blockById(block);
-            if (optionalCustomBlock.isPresent()) {
-                ImmutableBlockState state = BlockStateParser.deserialize(blockState);
-                if (state == null) {
-                    return List.of();
-                } else {
-                    return List.of(state.customBlockState().handle());
-                }
-            } else {
-                BlockData blockData = Bukkit.createBlockData(blockState);
-                return List.of(blockDataToBlockState(blockData));
-            }
-        }
-    }
-
-    public static List<Object> getAllBlockStates(Key block) {
-        Optional<CustomBlock> optionalCustomBlock = BukkitBlockManager.instance().blockById(block);
-        return optionalCustomBlock.map(customBlock -> customBlock.variantProvider().states().stream().map(it -> it.customBlockState().handle()).toList())
-                .orElseGet(() -> getAllVanillaBlockStates(block));
-    }
-
     @SuppressWarnings("unchecked")
     public static List<Object> getAllVanillaBlockStates(Key block) {
         try {
diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/ProtocolVersion.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/ProtocolVersion.java
index f9e3c4b05..79e04f318 100644
--- a/core/src/main/java/net/momirealms/craftengine/core/plugin/network/ProtocolVersion.java
+++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/network/ProtocolVersion.java
@@ -14,7 +14,8 @@ public enum ProtocolVersion {
     V1_21_2(768, "1.21.2"),
     V1_21_3(768, "1.21.3"),
     V1_21_4(769, "1.21.4"),
-    V1_21_5(770, "1.21.5");
+    V1_21_5(770, "1.21.5"),
+    V1_21_6(771, "1.21.6");
 
     private final int id;
     private final String name;