26.2-snapshot-7 and implement network tags

Author: basaigh

example/src/main/java/org/geysermc/mcprotocollib/protocol/example/MinecraftProtocolTest.java

@@ -102,6 +102,7 @@ public static void main(String[] args) {
                                     100,
                                     5
                             ),
+                            true,
                             true
                     ))
             );
@@ -149,8 +150,8 @@ public void sessionRemoved(SessionRemovedEvent event) {
             server.bind();
         }
 
-        status();
-        login();
+//        status();
+//        login();
     }
 
     private static void status() {

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/MinecraftProtocol.java

@@ -41,6 +41,13 @@ public class MinecraftProtocol extends PacketProtocol {
      */
     @Nullable
     private static NbtMap DEFAULT_NETWORK_CODEC;
+    /**
+     * The tags sent from the server to the client during {@link ProtocolState#CONFIGURATION}.
+     * Lazily loaded once when {@link #newServerSession(Server, Session)} is invoked,
+     * if {@link #isUseDefaultListeners()} is true.
+     */
+    @Nullable
+    private static NbtMap DEFAULT_NETWORK_TAGS;
 
     /**
      * The codec used for the Minecraft protocol.
@@ -173,7 +180,11 @@ public void newServerSession(Server server, Session session) {
                 DEFAULT_NETWORK_CODEC = loadNetworkCodec();
             }
 
-            session.addListener(new ServerListener(DEFAULT_NETWORK_CODEC));
+            if (DEFAULT_NETWORK_TAGS == null) {
+                DEFAULT_NETWORK_TAGS = loadNetworkTags();
+            }
+
+            session.addListener(new ServerListener(DEFAULT_NETWORK_CODEC, DEFAULT_NETWORK_TAGS));
         }
     }
 
@@ -242,4 +253,12 @@ public static NbtMap loadNetworkCodec() {
             throw new AssertionError("Unable to load network codec.", e);
         }
     }
+
+    public static NbtMap loadNetworkTags() {
+        try (InputStream inputStream = Objects.requireNonNull(MinecraftProtocol.class.getClassLoader().getResourceAsStream("networkTags.nbt"))) {
+            return (NbtMap) NbtUtils.createGZIPReader(inputStream).readTag(512);
+        } catch (Exception e) {
+            throw new AssertionError("Unable to load network tags.", e);
+        }
+    }
 }

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/ServerListener.java

@@ -22,6 +22,7 @@
 import org.geysermc.mcprotocollib.protocol.data.status.handler.ServerInfoBuilder;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundDisconnectPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundKeepAlivePacket;
+import org.geysermc.mcprotocollib.protocol.packet.common.clientbound.ClientboundUpdateTagsPacket;
 import org.geysermc.mcprotocollib.protocol.packet.common.serverbound.ServerboundKeepAlivePacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundFinishConfigurationPacket;
 import org.geysermc.mcprotocollib.protocol.packet.configuration.clientbound.ClientboundRegistryDataPacket;
@@ -48,6 +49,7 @@
 import java.security.PrivateKey;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -76,6 +78,7 @@ public class ServerListener extends SessionAdapter {
     }
 
     private final NbtMap networkCodec;
+    private final NbtMap networkTags;
 
     private final byte[] challenge = new byte[4];
     private String username = "";
@@ -84,8 +87,9 @@ public class ServerListener extends SessionAdapter {
     @Getter
     private boolean isTransfer = false;
 
-    public ServerListener(NbtMap networkCodec) {
+    public ServerListener(NbtMap networkCodec, NbtMap networkTags) {
         this.networkCodec = networkCodec;
+        this.networkTags = networkTags;
         new Random().nextBytes(this.challenge);
     }
 
@@ -167,6 +171,25 @@ private void handleLoginPacket(Session session, MinecraftProtocol protocol, Pack
                 session.send(new ClientboundRegistryDataPacket(typeTag, entries));
             }
 
+            Map<Key, Map<Key, int[]>> tags = new HashMap<>();
+            for (Map.Entry<String, Object> entry : networkTags.entrySet()) {
+                @SuppressWarnings("PatternValidation")
+                Key registryKey = Key.key(entry.getKey());
+                NbtMap registry = (NbtMap) entry.getValue();
+
+                Map<Key, int[]> registryTags = new HashMap<>();
+                for (String tag : registry.keySet()) {
+                    @SuppressWarnings("PatternValidation")
+                    Key tagKey = Key.key(tag);
+                    int[] tagData = registry.getIntArray(tag);
+
+                    registryTags.put(tagKey, tagData);
+                }
+
+                tags.put(registryKey, registryTags);
+            }
+            session.send(new ClientboundUpdateTagsPacket(tags));
+
             session.send(new ClientboundFinishConfigurationPacket());
         }
     }

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java

@@ -216,7 +216,7 @@
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerActionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundPlayerCommandPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSetCarriedItemPacket;
-import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSpectateEntityPacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSpectatorActionPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundSwingPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemOnPacket;
 import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.ServerboundUseItemPacket;
@@ -236,8 +236,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 312)
-            .minecraftVersion("26.2 Snapshot 6")
+            .protocolVersion((1 << 30) | 313)
+            .minecraftVersion("26.2 Snapshot 7")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )
@@ -493,7 +493,7 @@ public class MinecraftCodec {
                     .registerServerboundPacket(ServerboundSetStructureBlockPacket.class, ServerboundSetStructureBlockPacket::new)
                     .registerServerboundPacket(ServerboundSetTestBlockPacket.class, ServerboundSetTestBlockPacket::new)
                     .registerServerboundPacket(ServerboundSignUpdatePacket.class, ServerboundSignUpdatePacket::new)
-                    .registerServerboundPacket(ServerboundSpectateEntityPacket.class, ServerboundSpectateEntityPacket::new)
+                    .registerServerboundPacket(ServerboundSpectatorActionPacket.class, ServerboundSpectatorActionPacket::new)
                     .registerServerboundPacket(ServerboundSwingPacket.class, ServerboundSwingPacket::new)
                     .registerServerboundPacket(ServerboundTeleportToEntityPacket.class, ServerboundTeleportToEntityPacket::new)
                     .registerServerboundPacket(ServerboundTestInstanceBlockActionPacket.class, ServerboundTestInstanceBlockActionPacket::new)

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java

@@ -1040,6 +1040,7 @@ public enum BuiltinSound implements Sound {
     MUSIC_DISC_11("music_disc.11"),
     MUSIC_DISC_13("music_disc.13"),
     MUSIC_DISC_BLOCKS("music_disc.blocks"),
+    MUSIC_DISC_BOUNCE("music_disc.bounce"),
     MUSIC_DISC_CAT("music_disc.cat"),
     MUSIC_DISC_CHIRP("music_disc.chirp"),
     MUSIC_DISC_FAR("music_disc.far"),
@@ -1085,6 +1086,7 @@ public enum BuiltinSound implements Sound {
     MUSIC_OVERWORLD_JUNGLE("music.overworld.jungle"),
     MUSIC_OVERWORLD_SPARSE_JUNGLE("music.overworld.sparse_jungle"),
     MUSIC_OVERWORLD_BAMBOO_JUNGLE("music.overworld.bamboo_jungle"),
+    MUSIC_OVERWORLD_SULFUR_CAVES("music.overworld.sulfur_caves"),
     MUSIC_UNDER_WATER("music.under_water"),
     ENTITY_NAUTILUS_AMBIENT("entity.nautilus.ambient"),
     ENTITY_NAUTILUS_AMBIENT_LAND("entity.nautilus.ambient_land"),
@@ -1929,6 +1931,8 @@ public enum BuiltinSound implements Sound {
     BLOCK_POTENT_SULFUR_FALL("block.potent_sulfur.fall"),
     BLOCK_POTENT_SULFUR_GEYSER_ERUPTION("block.potent_sulfur.geyser_eruption"),
     BLOCK_POTENT_SULFUR_GEYSER_ERUPTION_ACTIVE("block.potent_sulfur.geyser_eruption_active"),
+    BLOCK_POTENT_SULFUR_GEYSER_CONTINUOUS_ERUPTION("block.potent_sulfur.geyser_continuous_eruption"),
+    BLOCK_POTENT_SULFUR_GEYSER_CONTINUOUS_ERUPTION_ACTIVE("block.potent_sulfur.geyser_continuous_eruption_active"),
     BLOCK_CINNABAR_BREAK("block.cinnabar.break"),
     BLOCK_CINNABAR_STEP("block.cinnabar.step"),
     BLOCK_CINNABAR_PLACE("block.cinnabar.place"),

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/common/clientbound/ClientboundUpdateTagsPacket.java

@@ -16,9 +16,11 @@
 @With
 @AllArgsConstructor
 public class ClientboundUpdateTagsPacket implements MinecraftPacket {
-    private final @NonNull Map<Key, Map<Key, int[]>> tags = new HashMap<>();
+    private final Map<Key, Map<Key, int[]>> tags;
 
     public ClientboundUpdateTagsPacket(ByteBuf in) {
+        this.tags = new HashMap<>();
+
         int totalTagCount = MinecraftTypes.readVarInt(in);
         for (int i = 0; i < totalTagCount; i++) {
             Map<Key, int[]> tag = new HashMap<>();

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/ClientboundLoginPacket.java

@@ -24,6 +24,7 @@ public class ClientboundLoginPacket implements MinecraftPacket {
     private final boolean enableRespawnScreen;
     private final boolean doLimitedCrafting;
     private final PlayerSpawnInfo commonPlayerSpawnInfo;
+    private final boolean onlineMode;
     private final boolean enforcesSecureChat;
 
     public ClientboundLoginPacket(ByteBuf in) {
@@ -41,6 +42,7 @@ public ClientboundLoginPacket(ByteBuf in) {
         this.enableRespawnScreen = in.readBoolean();
         this.doLimitedCrafting = in.readBoolean();
         this.commonPlayerSpawnInfo = MinecraftTypes.readPlayerSpawnInfo(in);
+        this.onlineMode = in.readBoolean();
         this.enforcesSecureChat = in.readBoolean();
     }
 
@@ -59,6 +61,7 @@ public void serialize(ByteBuf out) {
         out.writeBoolean(this.enableRespawnScreen);
         out.writeBoolean(this.doLimitedCrafting);
         MinecraftTypes.writePlayerSpawnInfo(out, this.commonPlayerSpawnInfo);
+        out.writeBoolean(this.onlineMode);
         out.writeBoolean(this.enforcesSecureChat);
     }
 

protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/serverbound/player/ServerboundSpectateEntityPacket.java

@@ -0,0 +1,40 @@
+package org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player;
+
+import io.netty.buffer.ByteBuf;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.With;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftPacket;
+import org.geysermc.mcprotocollib.protocol.codec.MinecraftTypes;
+
+import java.util.OptionalInt;
+
+@Data
+@With
+@AllArgsConstructor
+public class ServerboundSpectatorActionPacket implements MinecraftPacket {
+    private final OptionalInt entityId;
+
+    public ServerboundSpectatorActionPacket(ByteBuf in) {
+        if (in.readBoolean()) {
+            this.entityId = OptionalInt.of(MinecraftTypes.readVarInt(in));
+        } else {
+            this.entityId = OptionalInt.empty();
+        }
+    }
+
+    @Override
+    public void serialize(ByteBuf out) {
+        if (this.entityId.isPresent()) {
+            out.writeBoolean(true);
+            MinecraftTypes.writeVarInt(out, this.entityId.getAsInt());
+        } else {
+            out.writeBoolean(false);
+        }
+    }
+
+    @Override
+    public boolean shouldRunOnGameThread() {
+        return true;
+    }
+}