26.2-snapshot-5

basaigh · basaigh · commit 561c6714a2cf · 2026-05-31T14:11:48.000+01:00
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftCodec.java
@@ -236,8 +236,8 @@
 
 public class MinecraftCodec {
     public static final PacketCodec CODEC = PacketCodec.builder()
-            .protocolVersion((1 << 30) | 310)
-            .minecraftVersion("26.2 Snapshot 4")
+            .protocolVersion((1 << 30) | 311)
+            .minecraftVersion("26.2 Snapshot 5")
             .state(ProtocolState.HANDSHAKE, MinecraftPacketRegistry.builder()
                     .registerServerboundPacket(ClientIntentionPacket.class, ClientIntentionPacket::new)
             )
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/codec/MinecraftTypes.java
@@ -77,6 +77,8 @@
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustColorTransitionParticleData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.DustParticleData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ColorParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.GeyserBaseParticleData;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.GeyserParticleData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ItemParticleData;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.Particle;
 import org.geysermc.mcprotocollib.protocol.data.game.level.particle.ParticleData;
@@ -1015,6 +1017,8 @@ public static void writeParticle(ByteBuf buf, Particle particle) {
     public static ParticleData readParticleData(ByteBuf buf, ParticleType type) {
         return switch (type) {
             case BLOCK, BLOCK_MARKER, FALLING_DUST, DUST_PILLAR, BLOCK_CRUMBLE -> new BlockParticleData(MinecraftTypes.readVarInt(buf));
+            case GEYSER, GEYSER_PLUME -> new GeyserParticleData(buf.readInt());
+            case GEYSER_BASE, GEYSER_POOF -> new GeyserBaseParticleData(buf.readInt(), buf.readFloat());
             case DRAGON_BREATH -> new PowerParticleData(buf.readFloat());
             case DUST -> {
                 int color = buf.readInt();
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/command/CommandParser.java
@@ -17,7 +17,7 @@ public enum CommandParser {
     BLOCK_PREDICATE,
     ITEM_STACK,
     ITEM_PREDICATE,
-    COLOR,
+    TEAM_COLOR,
     HEX_COLOR,
     COMPONENT,
     STYLE,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/entity/attribute/AttributeType.java
@@ -59,7 +59,7 @@ enum Builtin implements AttributeType {
         MINING_EFFICIENCY("minecraft:mining_efficiency", 0, 0, 1024),
         MOVEMENT_EFFICIENCY("minecraft:movement_efficiency", 0, 0, 1),
         MOVEMENT_SPEED("minecraft:movement_speed", 0.7, 0, 1024),
-        NAMEPLATE_DISTANCE("minecraft:nameplate_distance", 64, 0, 512),
+        NAME_TAG_DISTANCE("minecraft:name_tag_distance", 64, 0, 512),
         OXYGEN_BONUS("minecraft:oxygen_bonus", 0, 0, 1024),
         SAFE_FALL_DISTANCE("minecraft:safe_fall_distance", 3, -1024, 1024),
         SCALE("minecraft:scale", 1, 0.0625, 16),
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/event/LevelEventType.java
@@ -48,6 +48,7 @@ public enum LevelEventType implements LevelEvent {
     SOUND_CRAFTER_CRAFT(1049),
     SOUND_CRAFTER_FAIL(1050),
     SOUND_WIND_CHARGE_SHOOT(1051),
+    SOUND_SULFUR_SPIKE_LAND(1052),
 
     COMPOSTER_FILL(1500),
     LAVA_FIZZ(1501),
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/GeyserBaseParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/GeyserBaseParticleData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
+
+public record GeyserBaseParticleData(int waterBlocks, float burstImpulseBase) implements ParticleData {
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/GeyserParticleData.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/GeyserParticleData.java
@@ -0,0 +1,4 @@
+package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
+
+public record GeyserParticleData(int waterBlocks) implements ParticleData {
+}
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleType.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/particle/ParticleType.java
@@ -8,6 +8,10 @@ public enum ParticleType {
     SULFUR_BUBBLES,
     NOXIOUS_GAS,
     NOXIOUS_GAS_CLOUD,
+    GEYSER,
+    GEYSER_BASE,
+    GEYSER_POOF,
+    GEYSER_PLUME,
     CLOUD,
     COPPER_FIRE_FLAME,
     CRIT,
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/level/sound/BuiltinSound.java
@@ -1614,6 +1614,12 @@ public enum BuiltinSound implements Sound {
     ENTITY_STRAY_DEATH("entity.stray.death"),
     ENTITY_STRAY_HURT("entity.stray.hurt"),
     ENTITY_STRAY_STEP("entity.stray.step"),
+    BLOCK_SULFUR_SPIKE_BREAK("block.sulfur_spike.break"),
+    BLOCK_SULFUR_SPIKE_STEP("block.sulfur_spike.step"),
+    BLOCK_SULFUR_SPIKE_PLACE("block.sulfur_spike.place"),
+    BLOCK_SULFUR_SPIKE_HIT("block.sulfur_spike.hit"),
+    BLOCK_SULFUR_SPIKE_FALL("block.sulfur_spike.fall"),
+    BLOCK_SULFUR_SPIKE_LAND("block.sulfur_spike.land"),
     BLOCK_SWEET_BERRY_BUSH_BREAK("block.sweet_berry_bush.break"),
     BLOCK_SWEET_BERRY_BUSH_PLACE("block.sweet_berry_bush.place"),
     BLOCK_SWEET_BERRY_BUSH_PICK_BERRIES("block.sweet_berry_bush.pick_berries"),
@@ -1921,6 +1927,8 @@ public enum BuiltinSound implements Sound {
     BLOCK_POTENT_SULFUR_PLACE("block.potent_sulfur.place"),
     BLOCK_POTENT_SULFUR_HIT("block.potent_sulfur.hit"),
     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_CINNABAR_BREAK("block.cinnabar.break"),
     BLOCK_CINNABAR_STEP("block.cinnabar.step"),
     BLOCK_CINNABAR_PLACE("block.cinnabar.place"),
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamColor.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/data/game/scoreboard/TeamColor.java
@@ -16,13 +16,11 @@ public enum TeamColor {
     RED,
     LIGHT_PURPLE,
     YELLOW,
-    WHITE,
-    OBFUSCATED,
-    BOLD,
-    STRIKETHROUGH,
-    UNDERLINED,
-    ITALIC,
-    RESET;
+    WHITE;
 
-    public static final TeamColor[] VALUES = values();
+    private static final TeamColor[] VALUES = values();
+
+    public static TeamColor from(int id) {
+        return id >= 0 && id < VALUES.length ? VALUES[id] : VALUES[0];
+    }
 }
diff --git a/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java b/protocol/src/main/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/scoreboard/ClientboundSetPlayerTeamPacket.java
@@ -25,13 +25,13 @@ public class ClientboundSetPlayerTeamPacket implements MinecraftPacket {
     private final @NonNull TeamAction action;
 
     private final Component displayName;
-    private final Component prefix;
-    private final Component suffix;
-    private final boolean friendlyFire;
-    private final boolean seeFriendlyInvisibles;
+    private final Component playerPrefix;
+    private final Component playerSuffix;
     private final @Nullable NameTagVisibility nameTagVisibility;
     private final @Nullable CollisionRule collisionRule;
-    private final TeamColor color;
+    private final @Nullable TeamColor color;
+    private final boolean friendlyFire;
+    private final boolean seeFriendlyInvisibles;
 
     private final String[] players;
 
@@ -40,8 +40,8 @@ public ClientboundSetPlayerTeamPacket(@NonNull String teamName) {
         this.action = TeamAction.REMOVE;
 
         this.displayName = null;
-        this.prefix = null;
-        this.suffix = null;
+        this.playerPrefix = null;
+        this.playerSuffix = null;
         this.friendlyFire = false;
         this.seeFriendlyInvisibles = false;
         this.nameTagVisibility = null;
@@ -51,15 +51,15 @@ public ClientboundSetPlayerTeamPacket(@NonNull String teamName) {
         this.players = null;
     }
 
-    public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull Component displayName, @NonNull Component prefix, @NonNull Component suffix,
+    public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull Component displayName, @NonNull Component playerPrefix, @NonNull Component playerSuffix,
                                           boolean friendlyFire, boolean seeFriendlyInvisibles, @NonNull NameTagVisibility nameTagVisibility,
                                           @NonNull CollisionRule collisionRule, @NonNull TeamColor color) {
         this.teamName = teamName;
         this.action = TeamAction.UPDATE;
 
         this.displayName = displayName;
-        this.prefix = prefix;
-        this.suffix = suffix;
+        this.playerPrefix = playerPrefix;
+        this.playerSuffix = playerSuffix;
         this.friendlyFire = friendlyFire;
         this.seeFriendlyInvisibles = seeFriendlyInvisibles;
         this.nameTagVisibility = nameTagVisibility;
@@ -78,8 +78,8 @@ public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull TeamAct
         this.action = action;
 
         this.displayName = null;
-        this.prefix = null;
-        this.suffix = null;
+        this.playerPrefix = null;
+        this.playerSuffix = null;
         this.friendlyFire = false;
         this.seeFriendlyInvisibles = false;
         this.nameTagVisibility = null;
@@ -89,15 +89,15 @@ public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull TeamAct
         this.players = Arrays.copyOf(players, players.length);
     }
 
-    public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull Component displayName, @NonNull Component prefix, @NonNull Component suffix,
+    public ClientboundSetPlayerTeamPacket(@NonNull String teamName, @NonNull Component displayName, @NonNull Component playerPrefix, @NonNull Component playerSuffix,
                                           boolean friendlyFire, boolean seeFriendlyInvisibles, @NonNull NameTagVisibility nameTagVisibility,
                                           @NonNull CollisionRule collisionRule, @NonNull TeamColor color, @NonNull String[] players) {
         this.teamName = teamName;
         this.action = TeamAction.CREATE;
 
         this.displayName = displayName;
-        this.prefix = prefix;
-        this.suffix = suffix;
+        this.playerPrefix = playerPrefix;
+        this.playerSuffix = playerSuffix;
         this.friendlyFire = friendlyFire;
         this.seeFriendlyInvisibles = seeFriendlyInvisibles;
         this.nameTagVisibility = nameTagVisibility;
@@ -112,20 +112,24 @@ public ClientboundSetPlayerTeamPacket(ByteBuf in) {
         this.action = TeamAction.from(in.readByte());
         if (this.action == TeamAction.CREATE || this.action == TeamAction.UPDATE) {
             this.displayName = MinecraftTypes.readComponent(in);
-            byte flags = in.readByte();
-            this.friendlyFire = (flags & 0x1) != 0;
-            this.seeFriendlyInvisibles = (flags & 0x2) != 0;
+            this.playerPrefix = MinecraftTypes.readComponent(in);
+            this.playerSuffix = MinecraftTypes.readComponent(in);
             this.nameTagVisibility = NameTagVisibility.from(MinecraftTypes.readVarInt(in));
             this.collisionRule = CollisionRule.from(MinecraftTypes.readVarInt(in));
 
-            this.color = TeamColor.VALUES[MinecraftTypes.readVarInt(in)];
+            if (in.readBoolean()) {
+                this.color = TeamColor.from(MinecraftTypes.readVarInt(in));
+            } else {
+                this.color = null;
+            }
 
-            this.prefix = MinecraftTypes.readComponent(in);
-            this.suffix = MinecraftTypes.readComponent(in);
+            byte flags = in.readByte();
+            this.friendlyFire = (flags & 0x1) != 0;
+            this.seeFriendlyInvisibles = (flags & 0x2) != 0;
         } else {
             this.displayName = null;
-            this.prefix = null;
-            this.suffix = null;
+            this.playerPrefix = null;
+            this.playerSuffix = null;
             this.friendlyFire = false;
             this.seeFriendlyInvisibles = false;
             this.nameTagVisibility = null;
@@ -149,12 +153,18 @@ public void serialize(ByteBuf out) {
         out.writeByte(this.action.ordinal());
         if (this.action == TeamAction.CREATE || this.action == TeamAction.UPDATE) {
             MinecraftTypes.writeComponent(out, this.displayName);
-            out.writeByte((this.friendlyFire ? 0x1 : 0x0) | (this.seeFriendlyInvisibles ? 0x2 : 0x0));
+            MinecraftTypes.writeComponent(out, this.playerPrefix);
+            MinecraftTypes.writeComponent(out, this.playerSuffix);
             MinecraftTypes.writeVarInt(out, this.nameTagVisibility.ordinal());
             MinecraftTypes.writeVarInt(out, this.collisionRule.ordinal());
-            MinecraftTypes.writeVarInt(out, this.color.ordinal());
-            MinecraftTypes.writeComponent(out, this.prefix);
-            MinecraftTypes.writeComponent(out, this.suffix);
+            if (this.color != null) {
+                out.writeBoolean(true);
+                MinecraftTypes.writeVarInt(out, this.color.ordinal());
+            } else {
+                out.writeBoolean(false);
+            }
+
+            out.writeByte((this.friendlyFire ? 0x1 : 0x0) | (this.seeFriendlyInvisibles ? 0x2 : 0x0));
         }
 
         if (this.action == TeamAction.CREATE || this.action == TeamAction.ADD_PLAYER || this.action == TeamAction.REMOVE_PLAYER) {
diff --git a/protocol/src/main/resources/networkCodec.nbt b/protocol/src/main/resources/networkCodec.nbt
diff --git a/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java b/protocol/src/test/java/org/geysermc/mcprotocollib/protocol/packet/ingame/clientbound/level/ClientboundSetPlayerTeamPacketTest.java
@@ -15,7 +15,7 @@ public void setup() {
         // Test nameTagVisibility and collisionRule encoding/decoding
         this.setPackets(
                 new ClientboundSetPlayerTeamPacket("dummy", Component.empty(), Component.empty(), Component.empty(),
-                        true, false, NameTagVisibility.NEVER, CollisionRule.PUSH_OWN_TEAM, TeamColor.RESET),
+                        true, false, NameTagVisibility.NEVER, CollisionRule.PUSH_OWN_TEAM, TeamColor.WHITE),
                 new ClientboundSetPlayerTeamPacket("dummy", Component.empty(), Component.empty(), Component.empty(),
                         false, true, NameTagVisibility.HIDE_FOR_OTHER_TEAMS, CollisionRule.PUSH_OTHER_TEAMS, TeamColor.RED)
         );

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package org.geysermc.mcprotocollib.protocol.data.game.level.particle;
++
 +public record GeyserBaseParticleData(int waterBlocks, float burstImpulseBase) implements ParticleData {
 +}