feat: initial support for NetEase 1.21.90 and drop older protocol versions

smartcmd · smartcmd · commit 966d792c06fd · 2026-04-01T22:24:27.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,11 +15,16 @@ Unless otherwise specified, any version comparison below is the comparison of th
 ### Added
 
 - (API) Added DDUI support for Bedrock 1.26.10+ (protocol v944+), including `DDUI`, `DDUIViewer`, `DDUIScreenSession`, `CustomFormScreen`, `MessageBoxScreen`, `Observable`, `Property`, and the custom-form element set (`Label`, `Header`, `Spacer`, `Divider`, `TextField`, `Toggle`, `Slider`, `Dropdown`, `Button`, `CloseButton`).
+- Added support for NetEase 1.21.90.
 
 ### Changed
 
 - (API) Merged `org.allaymc.server.bossbar.AllayBossBar` into the concrete `org.allaymc.api.bossbar.BossBar` class, so boss bars no longer use separate API interface and server implementation types.
 
+### Removed
+
+- Removed support for bedrock (NetEase) 1.21.50 and 1.21.80.
+
 # 0.12.0 (API 0.27.0) - 2026/3/29
 
 <small>[Compare with 0.11.1](https://github.com/AllayMC/Allay/compare/0.11.1...0.12.0)</small>
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@ The next-generation Minecraft: Bedrock Edition server software aims to be reliab
 <a href="https://app.codacy.com/gh/AllayMC/Allay/dashboard"><img src="https://app.codacy.com/project/badge/Grade/30e264923da2425a8b777a84b4028334"></a>
 <a href="https://discord.gg/ngkkE4hPTU"><img src="https://img.shields.io/discord/1147136608290750526?label=discord&color=7289DA&logo=discord" alt="Discord" /></a>
 [![qq](https://img.shields.io/badge/QQ-1072132791-purple)](https://qm.qq.com/q/peseHA0xN0)
-<a href="https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs"><img src="https://img.shields.io/badge/minecraft-1.21.50(NetEase) ~ 1.26.10%20(Bedrock)-green" /></a>
+<a href="https://feedback.minecraft.net/hc/en-us/sections/360001186971-Release-Changelogs"><img src="https://img.shields.io/badge/minecraft-1.21.90(NetEase) ~ 1.26.10%20(Bedrock)-green" /></a>
 [![GitHub License](https://img.shields.io/github/license/allaymc/allay)](LICENSE)
 [![Ko-Fi](https://img.shields.io/badge/Buy_Me_a_Coffee-f37574?logo=kofi&logoColor=white)](https://ko-fi.com/AllayMC)
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,16 +4,13 @@ commons-rng = "1.6"
 fastutil = "8.5.15"
 leveldb = "1.1.0"
 netty = "4.2.12.Final"
-protocol = "3.0.0.Beta12-20260324.161234-12"
 
 [libraries]
 # NBT
 nbt = { group = "org.allaymc", name = "nbt", version = "3.0.12" }
 # Protocol
-protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-connection", version.ref = "protocol" }
-protocol-common = { group = "org.cloudburstmc.protocol", name = "common", version.ref = "protocol" }
-protocol-codec = { group = "org.cloudburstmc.protocol", name = "bedrock-codec", version.ref = "protocol" }
-protocol-extension = {group = "org.allaymc", name = "protocol-extension", version = "0.1.7" }
+protocol-connection = { group = "org.allaymc.protocol", name = "bedrock-connection", version = "1.26.10-R1" }
+protocol-extension = {group = "org.allaymc", name = "protocol-extension", version = "0.2.1" }
 # State Updater
 updater-common = { group = "org.allaymc.stateupdater", name = "common", version = "0.1.1" }
 item-updater = { group = "org.allaymc.stateupdater", name = "item-updater", version = "1.21.110-R1" }
@@ -101,7 +98,7 @@ bstats = { group = "org.bstats", name = "bstats-base", version = "3.2.1" }
 lz4-java = { group = "at.yawk.lz4", name = "lz4-java", version = "1.10.4" }
 
 [bundles]
-protocol = ["protocol-connection", "protocol-common", "protocol-codec", "protocol-extension"]
+protocol = ["protocol-connection", "protocol-extension"]
 logging = ["log4j-slf4j2-impl", "log4j-core"]
 junit = ["junit-jupiter", "mockito-junit-jupiter"]
 fastutil = [
diff --git a/server/src/main/java/org/allaymc/server/network/AllayNetworkInterface.java b/server/src/main/java/org/allaymc/server/network/AllayNetworkInterface.java
@@ -110,6 +110,11 @@ protected void initPlayerSession(BedrockServerSession session) {
             return;
         }
 
+        // Enable detailed packet logging if debug mode is enabled
+        if (AllayServer.getSettings().genericSettings().debug()) {
+            session.setLogging(true);
+        }
+
         var player = new AllayPlayer(session, this);
         session.getPeer().getChannel().attr(NettyPipelineInitEvent.PLAYER_ATTRIBUTE_KEY).set(player);
         var event = new PlayerConnectEvent(player, "disconnect.disconnected");
diff --git a/server/src/main/java/org/allaymc/server/network/AllayRakNetInterface.java b/server/src/main/java/org/allaymc/server/network/AllayRakNetInterface.java
@@ -203,7 +203,7 @@ protected void updatePong() {
     private class AllayServerInitializer extends BedrockServerInitializer {
 
         @Override
-        @MultiVersion(version = "1.21.50-NetEase", details = "NetEase clients need NOOP compression initially for uncompressed RequestNetworkSettingsPacket")
+        @MultiVersion(version = "*-NetEase", details = "NetEase clients need NOOP compression initially for uncompressed RequestNetworkSettingsPacket")
         protected void preInitChannel(Channel channel) throws Exception {
             super.preInitChannel(channel);
             new NettyPipelineInitEvent(channel).call();
@@ -224,7 +224,7 @@ protected void preInitChannel(Channel channel) throws Exception {
         }
 
         @Override
-        @MultiVersion(version = "1.21.50-NetEase", details = "NetEase clients use RakNet version 8 but require v3 packet codec format")
+        @MultiVersion(version = "*-NetEase", details = "NetEase clients use RakNet version 8 but require v3 packet codec format")
         protected void initPacketCodec(Channel channel) throws Exception {
             // NetEase clients use rakVersion 8, but their packet format is the same as
             // international clients (v3), not the old v2 format that Protocol library
diff --git a/server/src/main/java/org/allaymc/server/network/NetworkData.java b/server/src/main/java/org/allaymc/server/network/NetworkData.java
@@ -309,13 +309,13 @@ public static ResourcePacksInfoPacket encodeResourcePacksInfoPacket() {
             var info = switch (pack.getType()) {
                 case RESOURCES -> new ResourcePacksInfoPacket.Entry(
                         pack.getId(), pack.getStringVersion(), pack.getSize(), pack.getContentKey(), "", pack.getId().toString(), scripting,
-                        pack.getManifest().getCapabilities().contains(PackManifest.Capability.RAYTRACED), false, null
+                        pack.getManifest().getCapabilities().contains(PackManifest.Capability.RAYTRACED), null, false
                 );
                 case DATA -> {
                     packet.setHasAddonPacks(true);
                     yield new ResourcePacksInfoPacket.Entry(
                             pack.getId(), pack.getStringVersion(), pack.getSize(), pack.getContentKey(), "", pack.getId().toString(), scripting,
-                            pack.getManifest().getCapabilities().contains(PackManifest.Capability.RAYTRACED), true, null
+                            pack.getManifest().getCapabilities().contains(PackManifest.Capability.RAYTRACED), null, true
                     );
                 }
                 case null, default -> null;
diff --git a/server/src/main/java/org/allaymc/server/network/ProtocolInfo.java b/server/src/main/java/org/allaymc/server/network/ProtocolInfo.java
@@ -7,8 +7,6 @@
 import org.allaymc.updater.item.ItemStateUpdater;
 import org.allaymc.updater.item.ItemStateUpdater_1_21_110;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.cloudburstmc.protocol.bedrock.codec.v766.Bedrock_v766;
-import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
 import org.cloudburstmc.protocol.bedrock.codec.v818.Bedrock_v818;
 import org.cloudburstmc.protocol.bedrock.codec.v819.Bedrock_v819;
 import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
@@ -42,9 +40,7 @@ public final class ProtocolInfo {
             Bedrock_v844.CODEC,
             Bedrock_v827.CODEC,
             Bedrock_v819.CODEC,
-            Bedrock_v818.CODEC,
-            Bedrock_v800.CODEC,
-            Bedrock_v766.CODEC
+            Bedrock_v818.CODEC
     );
 
     /**
diff --git a/server/src/main/java/org/allaymc/server/network/multiversion/MultiVersionHelper.java b/server/src/main/java/org/allaymc/server/network/multiversion/MultiVersionHelper.java
@@ -1,169 +1,26 @@
 package org.allaymc.server.network.multiversion;
 
 import org.allaymc.api.player.Player;
-import org.allaymc.api.utils.identifier.Identifier;
 import org.allaymc.server.player.AllayPlayer;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtType;
 import org.cloudburstmc.protocol.bedrock.codec.BedrockCodec;
-import org.cloudburstmc.protocol.bedrock.codec.v766.Bedrock_v766;
-import org.cloudburstmc.protocol.bedrock.codec.v800.Bedrock_v800;
 import org.cloudburstmc.protocol.bedrock.codec.v827.Bedrock_v827;
 import org.cloudburstmc.protocol.bedrock.codec.v844.Bedrock_v844;
 import org.cloudburstmc.protocol.bedrock.codec.v898.Bedrock_v898;
 import org.cloudburstmc.protocol.bedrock.data.BlockPropertyData;
 import org.cloudburstmc.protocol.bedrock.data.ExperimentData;
-import org.cloudburstmc.protocol.bedrock.data.definitions.ItemDefinition;
-import org.cloudburstmc.protocol.bedrock.data.inventory.ItemData;
-import org.cloudburstmc.protocol.bedrock.data.inventory.crafting.recipe.*;
-import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.DefaultDescriptor;
-import org.cloudburstmc.protocol.bedrock.data.inventory.descriptor.ItemDescriptorWithCount;
-import org.cloudburstmc.protocol.bedrock.packet.BiomeDefinitionListPacket;
-import org.cloudburstmc.protocol.bedrock.packet.CraftingDataPacket;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.stream.Stream;
 
 /**
  * @author daoge_cmd
  */
 @MultiVersion(version = "*")
 public final class MultiVersionHelper {
 
-    public static CraftingDataPacket adaptCraftingDataPacket(Player player, CraftingDataPacket packet) {
-        if (!is1_21_50(player)) {
-            return packet;
-        }
-
-        // Remove recipes that contain items not available in 1.21.50
-        packet.getCraftingData().removeIf(MultiVersionHelper::containsUnsupportedItem);
-        return packet;
-    }
-
-    private static boolean containsUnsupportedItem(RecipeData recipe) {
-        return switch (recipe) {
-            case ShapedRecipeData shaped ->
-                containsUnsupportedIngredient(shaped.getIngredients()) ||
-                containsUnsupportedOutput(shaped.getResults());
-            case ShapelessRecipeData shapeless ->
-                containsUnsupportedIngredient(shapeless.getIngredients()) ||
-                containsUnsupportedOutput(shapeless.getResults());
-            case SmithingTransformRecipeData smithing ->
-                isUnsupportedIngredient(smithing.getTemplate()) ||
-                isUnsupportedIngredient(smithing.getBase()) ||
-                isUnsupportedIngredient(smithing.getAddition()) ||
-                isUnsupportedOutput(smithing.getResult());
-            case SmithingTrimRecipeData trim ->
-                isUnsupportedIngredient(trim.getTemplate()) ||
-                isUnsupportedIngredient(trim.getBase()) ||
-                isUnsupportedIngredient(trim.getAddition());
-            case FurnaceRecipeData furnace ->
-                isUnsupportedOutput(furnace.getResult());
-            default -> false;
-        };
-    }
-
-    private static boolean containsUnsupportedIngredient(List<ItemDescriptorWithCount> ingredients) {
-        return ingredients.stream().anyMatch(MultiVersionHelper::isUnsupportedIngredient);
-    }
-
-    private static boolean isUnsupportedIngredient(ItemDescriptorWithCount ingredient) {
-        if (ingredient.getDescriptor() instanceof DefaultDescriptor descriptor) {
-            return isItemNotAvailableIn1_21_50(descriptor.getItemId().getIdentifier());
-        }
-        return false;
-    }
-
-    private static boolean containsUnsupportedOutput(List<ItemData> outputs) {
-        return outputs.stream().anyMatch(MultiVersionHelper::isUnsupportedOutput);
-    }
-
-    private static boolean isUnsupportedOutput(ItemData output) {
-        return isItemNotAvailableIn1_21_50(output.getDefinition().getIdentifier());
-    }
-
-    public static BiomeDefinitionListPacket adaptBiomeDefinitionListPacket(Player player, BiomeDefinitionListPacket packet) {
-        if (!is1_21_50(player)) {
-            return packet;
-        }
-
-        var builder = NbtMap.builder();
-        for (var entry : packet.getBiomes().getDefinitions().entrySet()) {
-            var identifier = entry.getKey();
-            var definition = entry.getValue();
-
-            builder.putCompound(identifier, NbtMap.builder()
-                    .putFloat("ash", definition.getAshDensity())
-                    .putFloat("blue_spores", definition.getBlueSporeDensity())
-                    .putFloat("depth", definition.getDepth())
-                    .putFloat("downfall", definition.getDownfall())
-                    .putFloat("height", definition.getScale())
-                    .putBoolean("rain", definition.isRain())
-                    .putFloat("red_spores", definition.getRedSporeDensity())
-                    .putList("tags", NbtType.STRING, definition.getTags())
-                    .putFloat("temperature", definition.getTemperature())
-                    .putFloat("waterColorA", definition.getMapWaterColor().getAlpha() / 256f)
-                    .putFloat("waterColorB", definition.getMapWaterColor().getBlue() / 256f)
-                    .putFloat("waterColorG", definition.getMapWaterColor().getGreen() / 256f)
-                    .putFloat("waterColorR", definition.getMapWaterColor().getRed() / 256f)
-                    .putFloat("white_ash", definition.getWhiteAshDensity())
-                    .build()
-            );
-        }
-
-        packet.setDefinitions(builder.build());
-        return packet;
-    }
-
-    public static void adaptItemDefinitions(Player player, List<ItemDefinition> definitions) {
-        if (!is1_21_50(player)) {
-            return;
-        }
-
-        // Remove the items that do not exist in 1.21.50
-        definitions.removeIf(def -> isItemNotAvailableIn1_21_50(def.getIdentifier()));
-    }
-
-    private static boolean isItemNotAvailableIn1_21_50(String identifier) {
-        if (!identifier.startsWith(Identifier.DEFAULT_NAMESPACE)) {
-            // Skip custom items
-            return false;
-        }
-
-        if (identifier.contains("lightning_rod") &&
-            !identifier.equals("minecraft:lightning_rod")) {
-            return true;
-        }
-
-        if (Stream.of("minecraft:bush", "minecraft:firefly_bush").anyMatch(identifier::equals)) {
-            return true;
-        }
-
-        // TODO: find out why exclude "wildflowers", "cactus_flower" will crash the client
-        return Stream.of(
-                // Copper
-                "copper_bars", "copper_golem", "copper_lantern", "copper_chain",
-                "copper_helmet", "copper_chestplate", "copper_leggings", "copper_boots",
-                "copper_sword", "copper_axe", "copper_pickaxe", "copper_shovel", "copper_hoe",
-                "copper_horse_armor", "copper_torch", "copper_chest", "copper_nugget",
-                // Misc
-                "happy_ghast", "dried_ghast", "netherite_horse_armor", "harness", "nautilus_armor",
-                "nautilus_spawn_egg", "dry_grass", "spear", "_shelf", "iron_chain", "leaf_litter",
-                "brown_egg", "blue_egg", "camel_husk_spawn_egg", "parched_spawn_egg", "music_disc_tears",
-                "music_disc_lava_chicken"
-        ).anyMatch(identifier::contains);
-    }
-
     public static void adaptExperimentData(Player player, List<ExperimentData> experiments) {
-        if (is1_21_80(player)) {
-            // Enables 2025 Content Drop 2 features
-            experiments.add(new ExperimentData("y_2025_drop_2", true));
-            // Enables the locator bar for 1.21.80 clients
-            experiments.add(new ExperimentData("locator_bar", true));
-            // Allows Vibrant Visuals to appear in the settings menu
-            experiments.add(new ExperimentData("experimental_graphics", true));
-        }
         if (is1_21_100(player)) {
             experiments.add(new ExperimentData("y_2025_drop_3", true));
         }
@@ -282,10 +139,6 @@ private static NbtMap adaptMaterialInstances(NbtMap materialInstances) {
                 .build();
     }
 
-    public static boolean is1_21_50(Player player) {
-        return getCodec(player).getProtocolVersion() == Bedrock_v766.CODEC.getProtocolVersion();
-    }
-
     private static boolean is1_21_130orHigher(Player player) {
         return getCodec(player).getProtocolVersion() >= Bedrock_v898.CODEC.getProtocolVersion();
     }
@@ -298,10 +151,6 @@ private static boolean is1_21_100(Player player) {
         return getCodec(player) == Bedrock_v827.CODEC;
     }
 
-    private static boolean is1_21_80(Player player) {
-        return getCodec(player) == Bedrock_v800.CODEC;
-    }
-
     private static BedrockCodec getCodec(Player player) {
         return ((AllayPlayer) player).getSession().getCodec();
     }
diff --git a/server/src/main/java/org/allaymc/server/network/processor/login/RequestNetworkSettingsPacketProcessor.java b/server/src/main/java/org/allaymc/server/network/processor/login/RequestNetworkSettingsPacketProcessor.java
@@ -5,6 +5,7 @@
 import org.allaymc.api.player.Player;
 import org.allaymc.protocol.extension.NetEaseCompression;
 import org.allaymc.protocol.extension.codec.v766.Bedrock_v766_NetEase;
+import org.allaymc.protocol.extension.codec.v819.Bedrock_v819_NetEase;
 import org.allaymc.server.AllayServer;
 import org.allaymc.server.network.ProtocolInfo;
 import org.allaymc.server.network.multiversion.MultiVersion;
@@ -26,8 +27,8 @@
 public class RequestNetworkSettingsPacketProcessor extends ILoginPacketProcessor<RequestNetworkSettingsPacket> {
 
     @Override
-    @MultiVersion(version = "1.21.50-NetEase", details = "NetEase clients are detected via RakNet protocol version 8 and use raw deflate compression")
-    @MultiVersion(version = "1.21.50-NetEase", details = "Packet codec is replaced for NetEase clients")
+    @MultiVersion(version = "*-NetEase", details = "NetEase clients are detected via RakNet protocol version 8 and use raw deflate compression")
+    @MultiVersion(version = "*-NetEase", details = "Packet codec is replaced for NetEase clients")
     public void handle(Player player, RequestNetworkSettingsPacket packet) {
         var allayPlayer = (AllayPlayer) player;
         var protocolVersion = packet.getProtocolVersion();
@@ -117,10 +118,10 @@ boolean isNetEaseClient(AllayPlayer allayPlayer) {
      * @return the NetEase codec, or {@code null} if not found
      */
     private static BedrockCodec findNetEaseCodec(int protocolVersion) {
-        if (protocolVersion == Bedrock_v766_NetEase.CODEC.getProtocolVersion()) {
-            return Bedrock_v766_NetEase.CODEC;
-        }
-
-        return null;
+        return switch (protocolVersion) {
+            case 766 -> Bedrock_v766_NetEase.CODEC;
+            case 819 -> Bedrock_v819_NetEase.CODEC;
+            default -> null;
+        };
     }
 }
diff --git a/server/src/main/java/org/allaymc/server/player/AllayLoginData.java b/server/src/main/java/org/allaymc/server/player/AllayLoginData.java
@@ -48,7 +48,7 @@ public class AllayLoginData implements LoginData {
      * @param isNetEaseClient whether the client is a NetEase client
      * @return the decoded login data, or {@code null} if decoding failed
      */
-    @MultiVersion(version = "1.21.50-NetEase", details = "NetEase clients use a different public key for login chain validation instead of Mojang's key")
+    @MultiVersion(version = "*-NetEase", details = "NetEase clients use a different public key for login chain validation instead of Mojang's key")
     public static AllayLoginData decode(LoginPacket loginPacket, boolean isNetEaseClient) {
         var loginData = new AllayLoginData();
         try {
@@ -214,7 +214,7 @@ private void decodeSkinData(String skinData, boolean isNetEaseClient) {
         this.skin = skinBuilder.build();
     }
 
-    @MultiVersion(version = "1.21.50-NetEase", details = "NetEase clients use URL-safe Base64 encoding for skin data")
+    @MultiVersion(version = "*-NetEase", details = "NetEase clients use URL-safe Base64 encoding for skin data")
     private JsonObject decodeToken(String token, boolean isNetEaseClient) {
         String[] tokenSplit = token.split("\\.");
         if (tokenSplit.length < 2) {
diff --git a/server/src/main/java/org/allaymc/server/player/AllayPlayer.java b/server/src/main/java/org/allaymc/server/player/AllayPlayer.java
